Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r2388 - in genpatches-2.6/trunk: 3.0 3.4
Date: Sat, 25 May 2013 21:14:34
Message-Id: 20130525211428.3387B2171D@flycatcher.gentoo.org
1 Author: tomwij
2 Date: 2013-05-25 21:14:27 +0000 (Sat, 25 May 2013)
3 New Revision: 2388
4
5 Added:
6 genpatches-2.6/trunk/3.0/1079_linux-3.0.80.patch
7 genpatches-2.6/trunk/3.4/1046_linux-3.4.47.patch
8 Modified:
9 genpatches-2.6/trunk/3.0/0000_README
10 genpatches-2.6/trunk/3.4/0000_README
11 Log:
12 Linux patches 3.0.80 and 3.4.47.
13
14 Modified: genpatches-2.6/trunk/3.0/0000_README
15 ===================================================================
16 --- genpatches-2.6/trunk/3.0/0000_README 2013-05-25 21:11:39 UTC (rev 2387)
17 +++ genpatches-2.6/trunk/3.0/0000_README 2013-05-25 21:14:27 UTC (rev 2388)
18 @@ -351,6 +351,10 @@
19 From: http://www.kernel.org
20 Desc: Linux 3.0.79
21
22 +Patch: 1079_linux-3.0.80.patch
23 +From: http://www.kernel.org
24 +Desc: Linux 3.0.80
25 +
26 Patch: 1500_XATTR_USER_PREFIX.patch
27 From: https://bugs.gentoo.org/show_bug.cgi?id=470644
28 Desc: Support for namespace user.pax.* on tmpfs.
29
30 Added: genpatches-2.6/trunk/3.0/1079_linux-3.0.80.patch
31 ===================================================================
32 --- genpatches-2.6/trunk/3.0/1079_linux-3.0.80.patch (rev 0)
33 +++ genpatches-2.6/trunk/3.0/1079_linux-3.0.80.patch 2013-05-25 21:14:27 UTC (rev 2388)
34 @@ -0,0 +1,86 @@
35 +diff --git a/Makefile b/Makefile
36 +index f8ade05..dad194f 100644
37 +--- a/Makefile
38 ++++ b/Makefile
39 +@@ -1,6 +1,6 @@
40 + VERSION = 3
41 + PATCHLEVEL = 0
42 +-SUBLEVEL = 79
43 ++SUBLEVEL = 80
44 + EXTRAVERSION =
45 + NAME = Sneaky Weasel
46 +
47 +diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
48 +index 65a35cf..61ab615 100644
49 +--- a/drivers/hwmon/abituguru.c
50 ++++ b/drivers/hwmon/abituguru.c
51 +@@ -1280,14 +1280,18 @@ static int __devinit abituguru_probe(struct platform_device *pdev)
52 + pr_info("found Abit uGuru\n");
53 +
54 + /* Register sysfs hooks */
55 +- for (i = 0; i < sysfs_attr_i; i++)
56 +- if (device_create_file(&pdev->dev,
57 +- &data->sysfs_attr[i].dev_attr))
58 ++ for (i = 0; i < sysfs_attr_i; i++) {
59 ++ res = device_create_file(&pdev->dev,
60 ++ &data->sysfs_attr[i].dev_attr);
61 ++ if (res)
62 + goto abituguru_probe_error;
63 +- for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
64 +- if (device_create_file(&pdev->dev,
65 +- &abituguru_sysfs_attr[i].dev_attr))
66 ++ }
67 ++ for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) {
68 ++ res = device_create_file(&pdev->dev,
69 ++ &abituguru_sysfs_attr[i].dev_attr);
70 ++ if (res)
71 + goto abituguru_probe_error;
72 ++ }
73 +
74 + data->hwmon_dev = hwmon_device_register(&pdev->dev);
75 + if (!IS_ERR(data->hwmon_dev))
76 +diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
77 +index e5180e4..5d15c6b 100644
78 +--- a/drivers/media/dvb/mantis/mantis_dvb.c
79 ++++ b/drivers/media/dvb/mantis/mantis_dvb.c
80 +@@ -248,8 +248,10 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
81 + err5:
82 + tasklet_kill(&mantis->tasklet);
83 + dvb_net_release(&mantis->dvbnet);
84 +- dvb_unregister_frontend(mantis->fe);
85 +- dvb_frontend_detach(mantis->fe);
86 ++ if (mantis->fe) {
87 ++ dvb_unregister_frontend(mantis->fe);
88 ++ dvb_frontend_detach(mantis->fe);
89 ++ }
90 + err4:
91 + mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);
92 +
93 +diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
94 +index a3c4751..a205027 100644
95 +--- a/fs/btrfs/ioctl.c
96 ++++ b/fs/btrfs/ioctl.c
97 +@@ -1539,7 +1539,11 @@ static noinline int copy_to_sk(struct btrfs_root *root,
98 + item_off = btrfs_item_ptr_offset(leaf, i);
99 + item_len = btrfs_item_size_nr(leaf, i);
100 +
101 +- if (item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
102 ++ btrfs_item_key_to_cpu(leaf, key, i);
103 ++ if (!key_in_sk(key, sk))
104 ++ continue;
105 ++
106 ++ if (sizeof(sh) + item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
107 + item_len = 0;
108 +
109 + if (sizeof(sh) + item_len + *sk_offset >
110 +@@ -1548,10 +1552,6 @@ static noinline int copy_to_sk(struct btrfs_root *root,
111 + goto overflow;
112 + }
113 +
114 +- btrfs_item_key_to_cpu(leaf, key, i);
115 +- if (!key_in_sk(key, sk))
116 +- continue;
117 +-
118 + sh.objectid = key->objectid;
119 + sh.offset = key->offset;
120 + sh.type = key->type;
121
122 Modified: genpatches-2.6/trunk/3.4/0000_README
123 ===================================================================
124 --- genpatches-2.6/trunk/3.4/0000_README 2013-05-25 21:11:39 UTC (rev 2387)
125 +++ genpatches-2.6/trunk/3.4/0000_README 2013-05-25 21:14:27 UTC (rev 2388)
126 @@ -223,6 +223,10 @@
127 From: http://www.kernel.org
128 Desc: Linux 3.4.46
129
130 +Patch: 1046_linux-3.4.47.patch
131 +From: http://www.kernel.org
132 +Desc: Linux 3.4.47
133 +
134 Patch: 1500_XATTR_USER_PREFIX.patch
135 From: https://bugs.gentoo.org/show_bug.cgi?id=470644
136 Desc: Support for namespace user.pax.* on tmpfs.
137
138 Added: genpatches-2.6/trunk/3.4/1046_linux-3.4.47.patch
139 ===================================================================
140 --- genpatches-2.6/trunk/3.4/1046_linux-3.4.47.patch (rev 0)
141 +++ genpatches-2.6/trunk/3.4/1046_linux-3.4.47.patch 2013-05-25 21:14:27 UTC (rev 2388)
142 @@ -0,0 +1,143 @@
143 +diff --git a/Makefile b/Makefile
144 +index 3d88eb8..a85d4eb 100644
145 +--- a/Makefile
146 ++++ b/Makefile
147 +@@ -1,6 +1,6 @@
148 + VERSION = 3
149 + PATCHLEVEL = 4
150 +-SUBLEVEL = 46
151 ++SUBLEVEL = 47
152 + EXTRAVERSION =
153 + NAME = Saber-toothed Squirrel
154 +
155 +diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
156 +index e458acb..6a8776e 100644
157 +--- a/drivers/gpu/drm/radeon/evergreen.c
158 ++++ b/drivers/gpu/drm/radeon/evergreen.c
159 +@@ -2443,8 +2443,8 @@ int evergreen_mc_init(struct radeon_device *rdev)
160 + rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
161 + } else {
162 + /* size in MB on evergreen/cayman/tn */
163 +- rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
164 +- rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
165 ++ rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;
166 ++ rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;
167 + }
168 + rdev->mc.visible_vram_size = rdev->mc.aper_size;
169 + r700_vram_gtt_location(rdev, &rdev->mc);
170 +diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
171 +index f493c64..49b55ed 100644
172 +--- a/drivers/gpu/drm/radeon/radeon_ttm.c
173 ++++ b/drivers/gpu/drm/radeon/radeon_ttm.c
174 +@@ -744,7 +744,7 @@ int radeon_ttm_init(struct radeon_device *rdev)
175 + return r;
176 + }
177 + DRM_INFO("radeon: %uM of VRAM memory ready\n",
178 +- (unsigned)rdev->mc.real_vram_size / (1024 * 1024));
179 ++ (unsigned) (rdev->mc.real_vram_size / (1024 * 1024)));
180 + r = ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT,
181 + rdev->mc.gtt_size >> PAGE_SHIFT);
182 + if (r) {
183 +diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
184 +index 5508ad7..2dbd585 100644
185 +--- a/drivers/gpu/drm/radeon/si.c
186 ++++ b/drivers/gpu/drm/radeon/si.c
187 +@@ -2464,8 +2464,8 @@ static int si_mc_init(struct radeon_device *rdev)
188 + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
189 + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
190 + /* size in MB on si */
191 +- rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
192 +- rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
193 ++ rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;
194 ++ rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;
195 + rdev->mc.visible_vram_size = rdev->mc.aper_size;
196 + si_vram_gtt_location(rdev, &rdev->mc);
197 + radeon_update_bandwidth_info(rdev);
198 +diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
199 +index a72bf25..56b178a 100644
200 +--- a/drivers/hwmon/abituguru.c
201 ++++ b/drivers/hwmon/abituguru.c
202 +@@ -1410,14 +1410,18 @@ static int __devinit abituguru_probe(struct platform_device *pdev)
203 + pr_info("found Abit uGuru\n");
204 +
205 + /* Register sysfs hooks */
206 +- for (i = 0; i < sysfs_attr_i; i++)
207 +- if (device_create_file(&pdev->dev,
208 +- &data->sysfs_attr[i].dev_attr))
209 ++ for (i = 0; i < sysfs_attr_i; i++) {
210 ++ res = device_create_file(&pdev->dev,
211 ++ &data->sysfs_attr[i].dev_attr);
212 ++ if (res)
213 + goto abituguru_probe_error;
214 +- for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
215 +- if (device_create_file(&pdev->dev,
216 +- &abituguru_sysfs_attr[i].dev_attr))
217 ++ }
218 ++ for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) {
219 ++ res = device_create_file(&pdev->dev,
220 ++ &abituguru_sysfs_attr[i].dev_attr);
221 ++ if (res)
222 + goto abituguru_probe_error;
223 ++ }
224 +
225 + data->hwmon_dev = hwmon_device_register(&pdev->dev);
226 + if (!IS_ERR(data->hwmon_dev))
227 +diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
228 +index 6193349..3c2812f 100644
229 +--- a/drivers/i2c/busses/i2c-designware-core.c
230 ++++ b/drivers/i2c/busses/i2c-designware-core.c
231 +@@ -349,7 +349,8 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
232 + /* Enable the adapter */
233 + dw_writel(dev, 1, DW_IC_ENABLE);
234 +
235 +- /* Enable interrupts */
236 ++ /* Clear and enable interrupts */
237 ++ i2c_dw_clear_int(dev);
238 + dw_writel(dev, DW_IC_INTR_DEFAULT_MASK, DW_IC_INTR_MASK);
239 + }
240 +
241 +diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
242 +index e5180e4..5d15c6b 100644
243 +--- a/drivers/media/dvb/mantis/mantis_dvb.c
244 ++++ b/drivers/media/dvb/mantis/mantis_dvb.c
245 +@@ -248,8 +248,10 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
246 + err5:
247 + tasklet_kill(&mantis->tasklet);
248 + dvb_net_release(&mantis->dvbnet);
249 +- dvb_unregister_frontend(mantis->fe);
250 +- dvb_frontend_detach(mantis->fe);
251 ++ if (mantis->fe) {
252 ++ dvb_unregister_frontend(mantis->fe);
253 ++ dvb_frontend_detach(mantis->fe);
254 ++ }
255 + err4:
256 + mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);
257 +
258 +diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
259 +index 14f8e1f..3a65f43 100644
260 +--- a/fs/btrfs/ioctl.c
261 ++++ b/fs/btrfs/ioctl.c
262 +@@ -1653,7 +1653,11 @@ static noinline int copy_to_sk(struct btrfs_root *root,
263 + item_off = btrfs_item_ptr_offset(leaf, i);
264 + item_len = btrfs_item_size_nr(leaf, i);
265 +
266 +- if (item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
267 ++ btrfs_item_key_to_cpu(leaf, key, i);
268 ++ if (!key_in_sk(key, sk))
269 ++ continue;
270 ++
271 ++ if (sizeof(sh) + item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
272 + item_len = 0;
273 +
274 + if (sizeof(sh) + item_len + *sk_offset >
275 +@@ -1662,10 +1666,6 @@ static noinline int copy_to_sk(struct btrfs_root *root,
276 + goto overflow;
277 + }
278 +
279 +- btrfs_item_key_to_cpu(leaf, key, i);
280 +- if (!key_in_sk(key, sk))
281 +- continue;
282 +-
283 + sh.objectid = key->objectid;
284 + sh.offset = key->offset;
285 + sh.type = key->type;
Report Message
Find on MARC Find on Google Groups