1 |
xmw 14/03/20 22:58:28 |
2 |
|
3 |
Added: phc-intel-pack-rev12-trailing-space-r1.patch |
4 |
Removed: phc-intel-pack-rev12-trailing-space.patch |
5 |
phc-intel-pack-rev11-trailing-space.patch |
6 |
Log: |
7 |
fix patch file. |
8 |
|
9 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 sys-power/phc-intel/files/phc-intel-pack-rev12-trailing-space-r1.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/phc-intel/files/phc-intel-pack-rev12-trailing-space-r1.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/phc-intel/files/phc-intel-pack-rev12-trailing-space-r1.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: phc-intel-pack-rev12-trailing-space-r1.patch |
18 |
=================================================================== |
19 |
Remove trailing white spaces from /proc output. |
20 |
|
21 |
Signed-off-by: Michael Weber <xmw@g.o> |
22 |
--- phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch |
23 |
+++ phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch |
24 |
@@ -73,7 +73,7 @@ |
25 |
|
26 |
return 0; |
27 |
} |
28 |
-@@ -757,12 +769,477 @@ |
29 |
+@@ -757,12 +769,482 @@ |
30 |
data->resume = 1; |
31 |
|
32 |
return 0; |
33 |
@@ -156,6 +156,7 @@ |
34 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
35 |
+ count += sprintf(&buf[count], "%u ", vid); |
36 |
+ } |
37 |
++ if (count) count--; |
38 |
+ count += sprintf(&buf[count], "\n"); |
39 |
+ |
40 |
+ return count; |
41 |
@@ -185,6 +186,7 @@ |
42 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
43 |
+ count += sprintf(&buf[count], "%u ", vid); |
44 |
+ } |
45 |
++ if (count) count--; |
46 |
+ count += sprintf(&buf[count], "\n"); |
47 |
+ |
48 |
+ return count; |
49 |
@@ -211,6 +213,7 @@ |
50 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
51 |
+ count += sprintf(&buf[count], "%u ", fid); |
52 |
+ } |
53 |
++ if (count) count--; |
54 |
+ count += sprintf(&buf[count], "\n"); |
55 |
+ |
56 |
+ return count; |
57 |
@@ -239,6 +242,7 @@ |
58 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
59 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
60 |
+ } |
61 |
++ if (count) count--; |
62 |
+ count += sprintf(&buf[count], "\n"); |
63 |
+ |
64 |
+ return count; |
65 |
@@ -270,6 +274,7 @@ |
66 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
67 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
68 |
+ } |
69 |
++ if (count) count--; |
70 |
+ count += sprintf(&buf[count], "\n"); |
71 |
+ |
72 |
+ return count; |
73 |
--- phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch |
74 |
+++ phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch |
75 |
@@ -74,7 +74,7 @@ |
76 |
|
77 |
return 0; |
78 |
} |
79 |
-@@ -758,12 +770,477 @@ |
80 |
+@@ -758,12 +770,482 @@ |
81 |
data->resume = 1; |
82 |
|
83 |
return 0; |
84 |
@@ -157,6 +157,7 @@ |
85 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
86 |
+ count += sprintf(&buf[count], "%u ", vid); |
87 |
+ } |
88 |
++ if (count) count--; |
89 |
+ count += sprintf(&buf[count], "\n"); |
90 |
+ |
91 |
+ return count; |
92 |
@@ -186,6 +187,7 @@ |
93 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
94 |
+ count += sprintf(&buf[count], "%u ", vid); |
95 |
+ } |
96 |
++ if (count) count--; |
97 |
+ count += sprintf(&buf[count], "\n"); |
98 |
+ |
99 |
+ return count; |
100 |
@@ -212,6 +214,7 @@ |
101 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
102 |
+ count += sprintf(&buf[count], "%u ", fid); |
103 |
+ } |
104 |
++ if (count) count--; |
105 |
+ count += sprintf(&buf[count], "\n"); |
106 |
+ |
107 |
+ return count; |
108 |
@@ -240,6 +243,7 @@ |
109 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
110 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
111 |
+ } |
112 |
++ if (count) count--; |
113 |
+ count += sprintf(&buf[count], "\n"); |
114 |
+ |
115 |
+ return count; |
116 |
@@ -271,6 +275,7 @@ |
117 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
118 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
119 |
+ } |
120 |
++ if (count) count--; |
121 |
+ count += sprintf(&buf[count], "\n"); |
122 |
+ |
123 |
+ return count; |
124 |
--- phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch |
125 |
+++ phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch |
126 |
@@ -73,7 +73,7 @@ |
127 |
|
128 |
return 0; |
129 |
} |
130 |
-@@ -758,12 +770,477 @@ |
131 |
+@@ -758,12 +770,482 @@ |
132 |
data->resume = 1; |
133 |
|
134 |
return 0; |
135 |
@@ -156,6 +156,7 @@ |
136 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
137 |
+ count += sprintf(&buf[count], "%u ", vid); |
138 |
+ } |
139 |
++ if (count) count--; |
140 |
+ count += sprintf(&buf[count], "\n"); |
141 |
+ |
142 |
+ return count; |
143 |
@@ -185,6 +186,7 @@ |
144 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
145 |
+ count += sprintf(&buf[count], "%u ", vid); |
146 |
+ } |
147 |
++ if (count) count--; |
148 |
+ count += sprintf(&buf[count], "\n"); |
149 |
+ |
150 |
+ return count; |
151 |
@@ -211,6 +213,7 @@ |
152 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
153 |
+ count += sprintf(&buf[count], "%u ", fid); |
154 |
+ } |
155 |
++ if (count) count--; |
156 |
+ count += sprintf(&buf[count], "\n"); |
157 |
+ |
158 |
+ return count; |
159 |
@@ -239,6 +242,7 @@ |
160 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
161 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
162 |
+ } |
163 |
++ if (count) count--; |
164 |
+ count += sprintf(&buf[count], "\n"); |
165 |
+ |
166 |
+ return count; |
167 |
@@ -270,6 +274,7 @@ |
168 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
169 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
170 |
+ } |
171 |
++ if (count) count--; |
172 |
+ count += sprintf(&buf[count], "\n"); |
173 |
+ |
174 |
+ return count; |
175 |
--- phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch |
176 |
+++ phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch |
177 |
@@ -73,7 +73,7 @@ |
178 |
|
179 |
return 0; |
180 |
} |
181 |
-@@ -778,12 +790,477 @@ |
182 |
+@@ -778,12 +790,482 @@ |
183 |
data->resume = 1; |
184 |
|
185 |
return 0; |
186 |
@@ -156,6 +156,7 @@ |
187 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
188 |
+ count += sprintf(&buf[count], "%u ", vid); |
189 |
+ } |
190 |
++ if (count) count--; |
191 |
+ count += sprintf(&buf[count], "\n"); |
192 |
+ |
193 |
+ return count; |
194 |
@@ -185,6 +186,7 @@ |
195 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
196 |
+ count += sprintf(&buf[count], "%u ", vid); |
197 |
+ } |
198 |
++ if (count) count--; |
199 |
+ count += sprintf(&buf[count], "\n"); |
200 |
+ |
201 |
+ return count; |
202 |
@@ -211,6 +213,7 @@ |
203 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
204 |
+ count += sprintf(&buf[count], "%u ", fid); |
205 |
+ } |
206 |
++ if (count) count--; |
207 |
+ count += sprintf(&buf[count], "\n"); |
208 |
+ |
209 |
+ return count; |
210 |
@@ -239,6 +242,7 @@ |
211 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
212 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
213 |
+ } |
214 |
++ if (count) count--; |
215 |
+ count += sprintf(&buf[count], "\n"); |
216 |
+ |
217 |
+ return count; |
218 |
@@ -270,6 +274,7 @@ |
219 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
220 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
221 |
+ } |
222 |
++ if (count) count--; |
223 |
+ count += sprintf(&buf[count], "\n"); |
224 |
+ |
225 |
+ return count; |
226 |
--- phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch |
227 |
+++ phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch |
228 |
@@ -73,7 +73,7 @@ |
229 |
|
230 |
return 0; |
231 |
} |
232 |
-@@ -790,12 +802,477 @@ |
233 |
+@@ -790,12 +802,482 @@ |
234 |
data->resume = 1; |
235 |
|
236 |
return 0; |
237 |
@@ -156,6 +156,7 @@ |
238 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
239 |
+ count += sprintf(&buf[count], "%u ", vid); |
240 |
+ } |
241 |
++ if (count) count--; |
242 |
+ count += sprintf(&buf[count], "\n"); |
243 |
+ |
244 |
+ return count; |
245 |
@@ -185,6 +186,7 @@ |
246 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
247 |
+ count += sprintf(&buf[count], "%u ", vid); |
248 |
+ } |
249 |
++ if (count) count--; |
250 |
+ count += sprintf(&buf[count], "\n"); |
251 |
+ |
252 |
+ return count; |
253 |
@@ -211,6 +213,7 @@ |
254 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
255 |
+ count += sprintf(&buf[count], "%u ", fid); |
256 |
+ } |
257 |
++ if (count) count--; |
258 |
+ count += sprintf(&buf[count], "\n"); |
259 |
+ |
260 |
+ return count; |
261 |
@@ -239,6 +242,7 @@ |
262 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
263 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
264 |
+ } |
265 |
++ if (count) count--; |
266 |
+ count += sprintf(&buf[count], "\n"); |
267 |
+ |
268 |
+ return count; |
269 |
@@ -270,6 +274,7 @@ |
270 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
271 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
272 |
+ } |
273 |
++ if (count) count--; |
274 |
+ count += sprintf(&buf[count], "\n"); |
275 |
+ |
276 |
+ return count; |
277 |
--- phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch |
278 |
+++ phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch |
279 |
@@ -72,7 +72,7 @@ |
280 |
|
281 |
return 0; |
282 |
} |
283 |
-@@ -797,12 +809,474 @@ |
284 |
+@@ -797,12 +809,479 @@ |
285 |
data->resume = 1; |
286 |
|
287 |
return 0; |
288 |
@@ -152,6 +152,7 @@ |
289 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
290 |
+ count += sprintf(&buf[count], "%u ", vid); |
291 |
+ } |
292 |
++ if (count) count--; |
293 |
+ count += sprintf(&buf[count], "\n"); |
294 |
+ |
295 |
+ return count; |
296 |
@@ -181,6 +182,7 @@ |
297 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
298 |
+ count += sprintf(&buf[count], "%u ", vid); |
299 |
+ } |
300 |
++ if (count) count--; |
301 |
+ count += sprintf(&buf[count], "\n"); |
302 |
+ |
303 |
+ return count; |
304 |
@@ -207,6 +209,7 @@ |
305 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
306 |
+ count += sprintf(&buf[count], "%u ", fid); |
307 |
+ } |
308 |
++ if (count) count--; |
309 |
+ count += sprintf(&buf[count], "\n"); |
310 |
+ |
311 |
+ return count; |
312 |
@@ -235,6 +238,7 @@ |
313 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
314 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
315 |
+ } |
316 |
++ if (count) count--; |
317 |
+ count += sprintf(&buf[count], "\n"); |
318 |
+ |
319 |
+ return count; |
320 |
@@ -266,6 +270,7 @@ |
321 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
322 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
323 |
+ } |
324 |
++ if (count) count--; |
325 |
+ count += sprintf(&buf[count], "\n"); |
326 |
+ |
327 |
+ return count; |
328 |
--- phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch |
329 |
+++ phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch |
330 |
@@ -73,7 +73,7 @@ |
331 |
|
332 |
return 0; |
333 |
} |
334 |
-@@ -793,12 +805,474 @@ |
335 |
+@@ -793,12 +805,479 @@ |
336 |
data->resume = 1; |
337 |
|
338 |
return 0; |
339 |
@@ -153,6 +153,7 @@ |
340 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
341 |
+ count += sprintf(&buf[count], "%u ", vid); |
342 |
+ } |
343 |
++ if (count) count--; |
344 |
+ count += sprintf(&buf[count], "\n"); |
345 |
+ |
346 |
+ return count; |
347 |
@@ -182,6 +183,7 @@ |
348 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
349 |
+ count += sprintf(&buf[count], "%u ", vid); |
350 |
+ } |
351 |
++ if (count) count--; |
352 |
+ count += sprintf(&buf[count], "\n"); |
353 |
+ |
354 |
+ return count; |
355 |
@@ -208,6 +210,7 @@ |
356 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
357 |
+ count += sprintf(&buf[count], "%u ", fid); |
358 |
+ } |
359 |
++ if (count) count--; |
360 |
+ count += sprintf(&buf[count], "\n"); |
361 |
+ |
362 |
+ return count; |
363 |
@@ -236,6 +239,7 @@ |
364 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
365 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
366 |
+ } |
367 |
++ if (count) count--; |
368 |
+ count += sprintf(&buf[count], "\n"); |
369 |
+ |
370 |
+ return count; |
371 |
@@ -267,6 +271,7 @@ |
372 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
373 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
374 |
+ } |
375 |
++ if (count) count--; |
376 |
+ count += sprintf(&buf[count], "\n"); |
377 |
+ |
378 |
+ return count; |
379 |
--- phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch |
380 |
+++ phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch |
381 |
@@ -72,7 +72,7 @@ |
382 |
|
383 |
return 0; |
384 |
} |
385 |
-@@ -756,12 +768,474 @@ |
386 |
+@@ -756,12 +768,479 @@ |
387 |
data->resume = 1; |
388 |
|
389 |
return 0; |
390 |
@@ -153,6 +153,7 @@ |
391 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
392 |
+ count += sprintf(&buf[count], "%u ", vid); |
393 |
+ } |
394 |
++ if (count) count--; |
395 |
+ count += sprintf(&buf[count], "\n"); |
396 |
+ |
397 |
+ return count; |
398 |
@@ -182,6 +183,7 @@ |
399 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
400 |
+ count += sprintf(&buf[count], "%u ", vid); |
401 |
+ } |
402 |
++ if (count) count--; |
403 |
+ count += sprintf(&buf[count], "\n"); |
404 |
+ |
405 |
+ return count; |
406 |
@@ -208,6 +210,7 @@ |
407 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
408 |
+ count += sprintf(&buf[count], "%u ", fid); |
409 |
+ } |
410 |
++ if (count) count--; |
411 |
+ count += sprintf(&buf[count], "\n"); |
412 |
+ |
413 |
+ return count; |
414 |
@@ -236,6 +239,7 @@ |
415 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
416 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
417 |
+ } |
418 |
++ if (count) count--; |
419 |
+ count += sprintf(&buf[count], "\n"); |
420 |
+ |
421 |
+ return count; |
422 |
@@ -267,6 +271,7 @@ |
423 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
424 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
425 |
+ } |
426 |
++ if (count) count--; |
427 |
+ count += sprintf(&buf[count], "\n"); |
428 |
+ |
429 |
+ return count; |
430 |
--- phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch |
431 |
+++ phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch |
432 |
@@ -73,7 +73,7 @@ |
433 |
|
434 |
return 0; |
435 |
} |
436 |
-@@ -757,12 +769,474 @@ |
437 |
+@@ -757,12 +769,479 @@ |
438 |
data->resume = 1; |
439 |
|
440 |
return 0; |
441 |
@@ -154,6 +154,7 @@ |
442 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
443 |
+ count += sprintf(&buf[count], "%u ", vid); |
444 |
+ } |
445 |
++ if (count) count--; |
446 |
+ count += sprintf(&buf[count], "\n"); |
447 |
+ |
448 |
+ return count; |
449 |
@@ -183,6 +184,7 @@ |
450 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
451 |
+ count += sprintf(&buf[count], "%u ", vid); |
452 |
+ } |
453 |
++ if (count) count--; |
454 |
+ count += sprintf(&buf[count], "\n"); |
455 |
+ |
456 |
+ return count; |
457 |
@@ -209,6 +211,7 @@ |
458 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
459 |
+ count += sprintf(&buf[count], "%u ", fid); |
460 |
+ } |
461 |
++ if (count) count--; |
462 |
+ count += sprintf(&buf[count], "\n"); |
463 |
+ |
464 |
+ return count; |
465 |
@@ -237,6 +240,7 @@ |
466 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
467 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
468 |
+ } |
469 |
++ if (count) count--; |
470 |
+ count += sprintf(&buf[count], "\n"); |
471 |
+ |
472 |
+ return count; |
473 |
@@ -268,6 +272,7 @@ |
474 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
475 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
476 |
+ } |
477 |
++ if (count) count--; |
478 |
+ count += sprintf(&buf[count], "\n"); |
479 |
+ |
480 |
+ return count; |
481 |
--- phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch |
482 |
+++ phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch |
483 |
@@ -72,7 +72,7 @@ |
484 |
|
485 |
return 0; |
486 |
} |
487 |
-@@ -758,12 +770,474 @@ |
488 |
+@@ -758,12 +770,479 @@ |
489 |
data->resume = 1; |
490 |
|
491 |
return 0; |
492 |
@@ -153,6 +153,7 @@ |
493 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
494 |
+ count += sprintf(&buf[count], "%u ", vid); |
495 |
+ } |
496 |
++ if (count) count--; |
497 |
+ count += sprintf(&buf[count], "\n"); |
498 |
+ |
499 |
+ return count; |
500 |
@@ -182,6 +183,7 @@ |
501 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
502 |
+ count += sprintf(&buf[count], "%u ", vid); |
503 |
+ } |
504 |
++ if (count) count--; |
505 |
+ count += sprintf(&buf[count], "\n"); |
506 |
+ |
507 |
+ return count; |
508 |
@@ -208,6 +210,7 @@ |
509 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
510 |
+ count += sprintf(&buf[count], "%u ", fid); |
511 |
+ } |
512 |
++ if (count) count--; |
513 |
+ count += sprintf(&buf[count], "\n"); |
514 |
+ |
515 |
+ return count; |
516 |
@@ -236,6 +239,7 @@ |
517 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
518 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
519 |
+ } |
520 |
++ if (count) count--; |
521 |
+ count += sprintf(&buf[count], "\n"); |
522 |
+ |
523 |
+ return count; |
524 |
@@ -267,6 +271,7 @@ |
525 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
526 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
527 |
+ } |
528 |
++ if (count) count--; |
529 |
+ count += sprintf(&buf[count], "\n"); |
530 |
+ |
531 |
+ return count; |
532 |
--- phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch |
533 |
+++ phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch |
534 |
@@ -73,7 +73,7 @@ |
535 |
|
536 |
return 0; |
537 |
} |
538 |
-@@ -759,12 +771,474 @@ |
539 |
+@@ -759,12 +771,479 @@ |
540 |
data->resume = 1; |
541 |
|
542 |
return 0; |
543 |
@@ -154,6 +154,7 @@ |
544 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
545 |
+ count += sprintf(&buf[count], "%u ", vid); |
546 |
+ } |
547 |
++ if (count) count--; |
548 |
+ count += sprintf(&buf[count], "\n"); |
549 |
+ |
550 |
+ return count; |
551 |
@@ -183,6 +184,7 @@ |
552 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
553 |
+ count += sprintf(&buf[count], "%u ", vid); |
554 |
+ } |
555 |
++ if (count) count--; |
556 |
+ count += sprintf(&buf[count], "\n"); |
557 |
+ |
558 |
+ return count; |
559 |
@@ -209,6 +211,7 @@ |
560 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
561 |
+ count += sprintf(&buf[count], "%u ", fid); |
562 |
+ } |
563 |
++ if (count) count--; |
564 |
+ count += sprintf(&buf[count], "\n"); |
565 |
+ |
566 |
+ return count; |
567 |
@@ -237,6 +240,7 @@ |
568 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
569 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
570 |
+ } |
571 |
++ if (count) count--; |
572 |
+ count += sprintf(&buf[count], "\n"); |
573 |
+ |
574 |
+ return count; |
575 |
@@ -268,6 +272,7 @@ |
576 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
577 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
578 |
+ } |
579 |
++ if (count) count--; |
580 |
+ count += sprintf(&buf[count], "\n"); |
581 |
+ |
582 |
+ return count; |
583 |
--- phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch |
584 |
+++ phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch |
585 |
@@ -72,7 +72,7 @@ |
586 |
|
587 |
return 0; |
588 |
} |
589 |
-@@ -759,12 +771,474 @@ |
590 |
+@@ -759,12 +771,479 @@ |
591 |
data->resume = 1; |
592 |
|
593 |
return 0; |
594 |
@@ -153,6 +153,7 @@ |
595 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
596 |
+ count += sprintf(&buf[count], "%u ", vid); |
597 |
+ } |
598 |
++ if (count) count--; |
599 |
+ count += sprintf(&buf[count], "\n"); |
600 |
+ |
601 |
+ return count; |
602 |
@@ -182,6 +183,7 @@ |
603 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
604 |
+ count += sprintf(&buf[count], "%u ", vid); |
605 |
+ } |
606 |
++ if (count) count--; |
607 |
+ count += sprintf(&buf[count], "\n"); |
608 |
+ |
609 |
+ return count; |
610 |
@@ -208,6 +210,7 @@ |
611 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
612 |
+ count += sprintf(&buf[count], "%u ", fid); |
613 |
+ } |
614 |
++ if (count) count--; |
615 |
+ count += sprintf(&buf[count], "\n"); |
616 |
+ |
617 |
+ return count; |
618 |
@@ -236,6 +239,7 @@ |
619 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
620 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
621 |
+ } |
622 |
++ if (count) count--; |
623 |
+ count += sprintf(&buf[count], "\n"); |
624 |
+ |
625 |
+ return count; |
626 |
@@ -267,6 +271,7 @@ |
627 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
628 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
629 |
+ } |
630 |
++ if (count) count--; |
631 |
+ count += sprintf(&buf[count], "\n"); |
632 |
+ |
633 |
+ return count; |
634 |
--- phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch |
635 |
+++ phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch |
636 |
@@ -73,7 +73,7 @@ |
637 |
|
638 |
return 0; |
639 |
} |
640 |
-@@ -760,12 +772,474 @@ |
641 |
+@@ -760,12 +772,479 @@ |
642 |
data->resume = 1; |
643 |
|
644 |
return 0; |
645 |
@@ -154,6 +154,7 @@ |
646 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
647 |
+ count += sprintf(&buf[count], "%u ", vid); |
648 |
+ } |
649 |
++ if (count) count--; |
650 |
+ count += sprintf(&buf[count], "\n"); |
651 |
+ |
652 |
+ return count; |
653 |
@@ -183,6 +184,7 @@ |
654 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
655 |
+ count += sprintf(&buf[count], "%u ", vid); |
656 |
+ } |
657 |
++ if (count) count--; |
658 |
+ count += sprintf(&buf[count], "\n"); |
659 |
+ |
660 |
+ return count; |
661 |
@@ -209,6 +211,7 @@ |
662 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
663 |
+ count += sprintf(&buf[count], "%u ", fid); |
664 |
+ } |
665 |
++ if (count) count--; |
666 |
+ count += sprintf(&buf[count], "\n"); |
667 |
+ |
668 |
+ return count; |
669 |
@@ -237,6 +240,7 @@ |
670 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
671 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
672 |
+ } |
673 |
++ if (count) count--; |
674 |
+ count += sprintf(&buf[count], "\n"); |
675 |
+ |
676 |
+ return count; |
677 |
@@ -268,6 +272,7 @@ |
678 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
679 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
680 |
+ } |
681 |
++ if (count) count--; |
682 |
+ count += sprintf(&buf[count], "\n"); |
683 |
+ |
684 |
+ return count; |
685 |
--- phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch |
686 |
+++ phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch |
687 |
@@ -72,7 +72,7 @@ |
688 |
|
689 |
return 0; |
690 |
} |
691 |
-@@ -719,12 +731,474 @@ |
692 |
+@@ -719,12 +731,479 @@ |
693 |
data->resume = 1; |
694 |
|
695 |
return 0; |
696 |
@@ -153,6 +153,7 @@ |
697 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
698 |
+ count += sprintf(&buf[count], "%u ", vid); |
699 |
+ } |
700 |
++ if (count) count--; |
701 |
+ count += sprintf(&buf[count], "\n"); |
702 |
+ |
703 |
+ return count; |
704 |
@@ -182,6 +183,7 @@ |
705 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
706 |
+ count += sprintf(&buf[count], "%u ", vid); |
707 |
+ } |
708 |
++ if (count) count--; |
709 |
+ count += sprintf(&buf[count], "\n"); |
710 |
+ |
711 |
+ return count; |
712 |
@@ -208,6 +210,7 @@ |
713 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
714 |
+ count += sprintf(&buf[count], "%u ", fid); |
715 |
+ } |
716 |
++ if (count) count--; |
717 |
+ count += sprintf(&buf[count], "\n"); |
718 |
+ |
719 |
+ return count; |
720 |
@@ -236,6 +239,7 @@ |
721 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
722 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
723 |
+ } |
724 |
++ if (count) count--; |
725 |
+ count += sprintf(&buf[count], "\n"); |
726 |
+ |
727 |
+ return count; |
728 |
@@ -267,6 +271,7 @@ |
729 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
730 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
731 |
+ } |
732 |
++ if (count) count--; |
733 |
+ count += sprintf(&buf[count], "\n"); |
734 |
+ |
735 |
+ return count; |
736 |
--- phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch |
737 |
+++ phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch |
738 |
@@ -73,7 +73,7 @@ |
739 |
|
740 |
return 0; |
741 |
} |
742 |
-@@ -720,12 +732,474 @@ |
743 |
+@@ -720,12 +732,479 @@ |
744 |
data->resume = 1; |
745 |
|
746 |
return 0; |
747 |
@@ -154,6 +154,7 @@ |
748 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
749 |
+ count += sprintf(&buf[count], "%u ", vid); |
750 |
+ } |
751 |
++ if (count) count--; |
752 |
+ count += sprintf(&buf[count], "\n"); |
753 |
+ |
754 |
+ return count; |
755 |
@@ -183,6 +184,7 @@ |
756 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
757 |
+ count += sprintf(&buf[count], "%u ", vid); |
758 |
+ } |
759 |
++ if (count) count--; |
760 |
+ count += sprintf(&buf[count], "\n"); |
761 |
+ |
762 |
+ return count; |
763 |
@@ -209,6 +211,7 @@ |
764 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
765 |
+ count += sprintf(&buf[count], "%u ", fid); |
766 |
+ } |
767 |
++ if (count) count--; |
768 |
+ count += sprintf(&buf[count], "\n"); |
769 |
+ |
770 |
+ return count; |
771 |
@@ -237,6 +240,7 @@ |
772 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
773 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
774 |
+ } |
775 |
++ if (count) count--; |
776 |
+ count += sprintf(&buf[count], "\n"); |
777 |
+ |
778 |
+ return count; |
779 |
@@ -268,6 +272,7 @@ |
780 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
781 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
782 |
+ } |
783 |
++ if (count) count--; |
784 |
+ count += sprintf(&buf[count], "\n"); |
785 |
+ |
786 |
+ return count; |
787 |
--- phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch |
788 |
+++ phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch |
789 |
@@ -72,7 +72,7 @@ |
790 |
|
791 |
return 0; |
792 |
} |
793 |
-@@ -716,12 +728,474 @@ |
794 |
+@@ -716,12 +728,479 @@ |
795 |
data->resume = 1; |
796 |
|
797 |
return 0; |
798 |
@@ -153,6 +153,7 @@ |
799 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
800 |
+ count += sprintf(&buf[count], "%u ", vid); |
801 |
+ } |
802 |
++ if (count) count--; |
803 |
+ count += sprintf(&buf[count], "\n"); |
804 |
+ |
805 |
+ return count; |
806 |
@@ -182,6 +183,7 @@ |
807 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
808 |
+ count += sprintf(&buf[count], "%u ", vid); |
809 |
+ } |
810 |
++ if (count) count--; |
811 |
+ count += sprintf(&buf[count], "\n"); |
812 |
+ |
813 |
+ return count; |
814 |
@@ -208,6 +210,7 @@ |
815 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
816 |
+ count += sprintf(&buf[count], "%u ", fid); |
817 |
+ } |
818 |
++ if (count) count--; |
819 |
+ count += sprintf(&buf[count], "\n"); |
820 |
+ |
821 |
+ return count; |
822 |
@@ -236,6 +239,7 @@ |
823 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
824 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
825 |
+ } |
826 |
++ if (count) count--; |
827 |
+ count += sprintf(&buf[count], "\n"); |
828 |
+ |
829 |
+ return count; |
830 |
@@ -267,6 +271,7 @@ |
831 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
832 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
833 |
+ } |
834 |
++ if (count) count--; |
835 |
+ count += sprintf(&buf[count], "\n"); |
836 |
+ |
837 |
+ return count; |
838 |
--- phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch |
839 |
+++ phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch |
840 |
@@ -73,7 +73,7 @@ |
841 |
|
842 |
return 0; |
843 |
} |
844 |
-@@ -717,12 +729,474 @@ |
845 |
+@@ -717,12 +729,479 @@ |
846 |
data->resume = 1; |
847 |
|
848 |
return 0; |
849 |
@@ -154,6 +154,7 @@ |
850 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
851 |
+ count += sprintf(&buf[count], "%u ", vid); |
852 |
+ } |
853 |
++ if (count) count--; |
854 |
+ count += sprintf(&buf[count], "\n"); |
855 |
+ |
856 |
+ return count; |
857 |
@@ -183,6 +184,7 @@ |
858 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
859 |
+ count += sprintf(&buf[count], "%u ", vid); |
860 |
+ } |
861 |
++ if (count) count--; |
862 |
+ count += sprintf(&buf[count], "\n"); |
863 |
+ |
864 |
+ return count; |
865 |
@@ -209,6 +211,7 @@ |
866 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
867 |
+ count += sprintf(&buf[count], "%u ", fid); |
868 |
+ } |
869 |
++ if (count) count--; |
870 |
+ count += sprintf(&buf[count], "\n"); |
871 |
+ |
872 |
+ return count; |
873 |
@@ -237,6 +240,7 @@ |
874 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
875 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
876 |
+ } |
877 |
++ if (count) count--; |
878 |
+ count += sprintf(&buf[count], "\n"); |
879 |
+ |
880 |
+ return count; |
881 |
@@ -268,6 +272,7 @@ |
882 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
883 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
884 |
+ } |
885 |
++ if (count) count--; |
886 |
+ count += sprintf(&buf[count], "\n"); |
887 |
+ |
888 |
+ return count; |
889 |
--- phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch |
890 |
+++ phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch |
891 |
@@ -71,7 +71,7 @@ |
892 |
} |
893 |
|
894 |
return 0; |
895 |
-@@ -717,12 +729,474 @@ |
896 |
+@@ -717,12 +729,479 @@ |
897 |
data->resume = 1; |
898 |
|
899 |
return 0; |
900 |
@@ -152,6 +152,7 @@ |
901 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
902 |
+ count += sprintf(&buf[count], "%u ", vid); |
903 |
+ } |
904 |
++ if (count) count--; |
905 |
+ count += sprintf(&buf[count], "\n"); |
906 |
+ |
907 |
+ return count; |
908 |
@@ -181,6 +182,7 @@ |
909 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
910 |
+ count += sprintf(&buf[count], "%u ", vid); |
911 |
+ } |
912 |
++ if (count) count--; |
913 |
+ count += sprintf(&buf[count], "\n"); |
914 |
+ |
915 |
+ return count; |
916 |
@@ -207,6 +209,7 @@ |
917 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
918 |
+ count += sprintf(&buf[count], "%u ", fid); |
919 |
+ } |
920 |
++ if (count) count--; |
921 |
+ count += sprintf(&buf[count], "\n"); |
922 |
+ |
923 |
+ return count; |
924 |
@@ -235,6 +238,7 @@ |
925 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
926 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
927 |
+ } |
928 |
++ if (count) count--; |
929 |
+ count += sprintf(&buf[count], "\n"); |
930 |
+ |
931 |
+ return count; |
932 |
@@ -266,6 +270,7 @@ |
933 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
934 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
935 |
+ } |
936 |
++ if (count) count--; |
937 |
+ count += sprintf(&buf[count], "\n"); |
938 |
+ |
939 |
+ return count; |
940 |
--- phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch |
941 |
+++ phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch |
942 |
@@ -120,7 +120,7 @@ |
943 |
if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { |
944 |
msrs = msrs_alloc(); |
945 |
|
946 |
-@@ -963,10 +965,484 @@ |
947 |
+@@ -963,10 +965,489 @@ |
948 |
msrs_free(msrs); |
949 |
msrs = NULL; |
950 |
} |
951 |
@@ -198,6 +198,7 @@ |
952 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
953 |
+ count += sprintf(&buf[count], "%u ", vid); |
954 |
+ } |
955 |
++ if (count) count--; |
956 |
+ count += sprintf(&buf[count], "\n"); |
957 |
+ |
958 |
+ return count; |
959 |
@@ -227,6 +228,7 @@ |
960 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
961 |
+ count += sprintf(&buf[count], "%u ", vid); |
962 |
+ } |
963 |
++ if (count) count--; |
964 |
+ count += sprintf(&buf[count], "\n"); |
965 |
+ |
966 |
+ return count; |
967 |
@@ -253,6 +255,7 @@ |
968 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
969 |
+ count += sprintf(&buf[count], "%u ", fid); |
970 |
+ } |
971 |
++ if (count) count--; |
972 |
+ count += sprintf(&buf[count], "\n"); |
973 |
+ |
974 |
+ return count; |
975 |
@@ -281,6 +284,7 @@ |
976 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
977 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
978 |
+ } |
979 |
++ if (count) count--; |
980 |
+ count += sprintf(&buf[count], "\n"); |
981 |
+ |
982 |
+ return count; |
983 |
@@ -312,6 +316,7 @@ |
984 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
985 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
986 |
+ } |
987 |
++ if (count) count--; |
988 |
+ count += sprintf(&buf[count], "\n"); |
989 |
+ |
990 |
+ return count; |
991 |
--- phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch |
992 |
+++ phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch |
993 |
@@ -122,7 +122,7 @@ |
994 |
if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { |
995 |
msrs = msrs_alloc(); |
996 |
|
997 |
-@@ -986,10 +987,485 @@ |
998 |
+@@ -986,10 +987,490 @@ |
999 |
msrs_free(msrs); |
1000 |
msrs = NULL; |
1001 |
} |
1002 |
@@ -200,6 +200,7 @@ |
1003 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); |
1004 |
+ count += sprintf(&buf[count], "%u ", vid); |
1005 |
+ } |
1006 |
++ if (count) count--; |
1007 |
+ count += sprintf(&buf[count], "\n"); |
1008 |
+ |
1009 |
+ return count; |
1010 |
@@ -229,6 +230,7 @@ |
1011 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); |
1012 |
+ count += sprintf(&buf[count], "%u ", vid); |
1013 |
+ } |
1014 |
++ if (count) count--; |
1015 |
+ count += sprintf(&buf[count], "\n"); |
1016 |
+ |
1017 |
+ return count; |
1018 |
@@ -255,6 +257,7 @@ |
1019 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); |
1020 |
+ count += sprintf(&buf[count], "%u ", fid); |
1021 |
+ } |
1022 |
++ if (count) count--; |
1023 |
+ count += sprintf(&buf[count], "\n"); |
1024 |
+ |
1025 |
+ return count; |
1026 |
@@ -283,6 +286,7 @@ |
1027 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); |
1028 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1029 |
+ } |
1030 |
++ if (count) count--; |
1031 |
+ count += sprintf(&buf[count], "\n"); |
1032 |
+ |
1033 |
+ return count; |
1034 |
@@ -314,6 +318,7 @@ |
1035 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); |
1036 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1037 |
+ } |
1038 |
++ if (count) count--; |
1039 |
+ count += sprintf(&buf[count], "\n"); |
1040 |
+ |
1041 |
+ return count; |
1042 |
--- phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch |
1043 |
+++ phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch |
1044 |
@@ -71,7 +71,7 @@ |
1045 |
} |
1046 |
|
1047 |
return 0; |
1048 |
-@@ -714,12 +726,474 @@ |
1049 |
+@@ -714,12 +726,479 @@ |
1050 |
data->resume = 1; |
1051 |
|
1052 |
return 0; |
1053 |
@@ -152,6 +152,7 @@ |
1054 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
1055 |
+ count += sprintf(&buf[count], "%u ", vid); |
1056 |
+ } |
1057 |
++ if (count) count--; |
1058 |
+ count += sprintf(&buf[count], "\n"); |
1059 |
+ |
1060 |
+ return count; |
1061 |
@@ -181,6 +182,7 @@ |
1062 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
1063 |
+ count += sprintf(&buf[count], "%u ", vid); |
1064 |
+ } |
1065 |
++ if (count) count--; |
1066 |
+ count += sprintf(&buf[count], "\n"); |
1067 |
+ |
1068 |
+ return count; |
1069 |
@@ -207,6 +209,7 @@ |
1070 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
1071 |
+ count += sprintf(&buf[count], "%u ", fid); |
1072 |
+ } |
1073 |
++ if (count) count--; |
1074 |
+ count += sprintf(&buf[count], "\n"); |
1075 |
+ |
1076 |
+ return count; |
1077 |
@@ -235,6 +238,7 @@ |
1078 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
1079 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1080 |
+ } |
1081 |
++ if (count) count--; |
1082 |
+ count += sprintf(&buf[count], "\n"); |
1083 |
+ |
1084 |
+ return count; |
1085 |
@@ -266,6 +270,7 @@ |
1086 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
1087 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1088 |
+ } |
1089 |
++ if (count) count--; |
1090 |
+ count += sprintf(&buf[count], "\n"); |
1091 |
+ |
1092 |
+ return count; |
1093 |
--- phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch |
1094 |
+++ phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch |
1095 |
@@ -120,7 +120,7 @@ |
1096 |
if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { |
1097 |
msrs = msrs_alloc(); |
1098 |
|
1099 |
-@@ -966,10 +968,484 @@ |
1100 |
+@@ -966,10 +968,489 @@ |
1101 |
msrs_free(msrs); |
1102 |
msrs = NULL; |
1103 |
} |
1104 |
@@ -198,6 +198,7 @@ |
1105 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
1106 |
+ count += sprintf(&buf[count], "%u ", vid); |
1107 |
+ } |
1108 |
++ if (count) count--; |
1109 |
+ count += sprintf(&buf[count], "\n"); |
1110 |
+ |
1111 |
+ return count; |
1112 |
@@ -227,6 +228,7 @@ |
1113 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
1114 |
+ count += sprintf(&buf[count], "%u ", vid); |
1115 |
+ } |
1116 |
++ if (count) count--; |
1117 |
+ count += sprintf(&buf[count], "\n"); |
1118 |
+ |
1119 |
+ return count; |
1120 |
@@ -253,6 +255,7 @@ |
1121 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
1122 |
+ count += sprintf(&buf[count], "%u ", fid); |
1123 |
+ } |
1124 |
++ if (count) count--; |
1125 |
+ count += sprintf(&buf[count], "\n"); |
1126 |
+ |
1127 |
+ return count; |
1128 |
@@ -281,6 +284,7 @@ |
1129 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
1130 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1131 |
+ } |
1132 |
++ if (count) count--; |
1133 |
+ count += sprintf(&buf[count], "\n"); |
1134 |
+ |
1135 |
+ return count; |
1136 |
@@ -312,6 +316,7 @@ |
1137 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
1138 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1139 |
+ } |
1140 |
++ if (count) count--; |
1141 |
+ count += sprintf(&buf[count], "\n"); |
1142 |
+ |
1143 |
+ return count; |
1144 |
--- phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch |
1145 |
+++ phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch |
1146 |
@@ -120,7 +120,7 @@ |
1147 |
if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { |
1148 |
msrs = msrs_alloc(); |
1149 |
|
1150 |
-@@ -970,10 +972,484 @@ |
1151 |
+@@ -970,10 +972,489 @@ |
1152 |
msrs_free(msrs); |
1153 |
msrs = NULL; |
1154 |
} |
1155 |
@@ -198,6 +198,7 @@ |
1156 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
1157 |
+ count += sprintf(&buf[count], "%u ", vid); |
1158 |
+ } |
1159 |
++ if (count) count--; |
1160 |
+ count += sprintf(&buf[count], "\n"); |
1161 |
+ |
1162 |
+ return count; |
1163 |
@@ -227,6 +228,7 @@ |
1164 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
1165 |
+ count += sprintf(&buf[count], "%u ", vid); |
1166 |
+ } |
1167 |
++ if (count) count--; |
1168 |
+ count += sprintf(&buf[count], "\n"); |
1169 |
+ |
1170 |
+ return count; |
1171 |
@@ -253,6 +255,7 @@ |
1172 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); |
1173 |
+ count += sprintf(&buf[count], "%u ", fid); |
1174 |
+ } |
1175 |
++ if (count) count--; |
1176 |
+ count += sprintf(&buf[count], "\n"); |
1177 |
+ |
1178 |
+ return count; |
1179 |
@@ -281,6 +284,7 @@ |
1180 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); |
1181 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1182 |
+ } |
1183 |
++ if (count) count--; |
1184 |
+ count += sprintf(&buf[count], "\n"); |
1185 |
+ |
1186 |
+ return count; |
1187 |
@@ -312,6 +316,7 @@ |
1188 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); |
1189 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1190 |
+ } |
1191 |
++ if (count) count--; |
1192 |
+ count += sprintf(&buf[count], "\n"); |
1193 |
+ |
1194 |
+ return count; |
1195 |
Remove trailing white spaces from /proc output. |
1196 |
|
1197 |
Signed-off-by: Michael Weber <xmw@g.o> |
1198 |
--- phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch |
1199 |
+++ phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch |
1200 |
@@ -97,7 +97,7 @@ |
1201 |
static void __init acpi_cpufreq_boost_init(void) |
1202 |
{ |
1203 |
if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { |
1204 |
-@@ -982,6 +983,480 @@ |
1205 |
+@@ -982,6 +983,485 @@ |
1206 |
} |
1207 |
} |
1208 |
|
1209 |
@@ -173,6 +173,7 @@ |
1210 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); |
1211 |
+ count += sprintf(&buf[count], "%u ", vid); |
1212 |
+ } |
1213 |
++ if (count) count--; |
1214 |
+ count += sprintf(&buf[count], "\n"); |
1215 |
+ |
1216 |
+ return count; |
1217 |
@@ -202,6 +203,7 @@ |
1218 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); |
1219 |
+ count += sprintf(&buf[count], "%u ", vid); |
1220 |
+ } |
1221 |
++ if (count) count--; |
1222 |
+ count += sprintf(&buf[count], "\n"); |
1223 |
+ |
1224 |
+ return count; |
1225 |
@@ -228,6 +230,7 @@ |
1226 |
+ fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); |
1227 |
+ count += sprintf(&buf[count], "%u ", fid); |
1228 |
+ } |
1229 |
++ if (count) count--; |
1230 |
+ count += sprintf(&buf[count], "\n"); |
1231 |
+ |
1232 |
+ return count; |
1233 |
@@ -256,6 +259,7 @@ |
1234 |
+ vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); |
1235 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1236 |
+ } |
1237 |
++ if (count) count--; |
1238 |
+ count += sprintf(&buf[count], "\n"); |
1239 |
+ |
1240 |
+ return count; |
1241 |
@@ -287,6 +291,7 @@ |
1242 |
+ vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); |
1243 |
+ count += sprintf(&buf[count], "%u:%u ", fid, vid); |
1244 |
+ } |
1245 |
++ if (count) count--; |
1246 |
+ count += sprintf(&buf[count], "\n"); |
1247 |
+ |
1248 |
+ return count; |