1 |
commit: ac2c5915928d32b7b691261cead4f51c7856d572 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 28 13:48:14 2011 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 28 13:48:14 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=ac2c5915 |
7 |
|
8 |
Update Grsec/PaX |
9 |
2.2.2-2.6.32.39-201104232142 |
10 |
2.2.2-2.6.38.4-201104232142.patch |
11 |
|
12 |
--- |
13 |
2.6.32/0000_README | 6 +- |
14 |
2.6.32/1038_linux-2.6.32.39.patch | 792 ++ |
15 |
..._grsecurity-2.2.2-2.6.32.39-201104232142.patch} |10112 ++++++++------------ |
16 |
2.6.32/4422_grsec-mute-warnings.patch | 15 +- |
17 |
2.6.38/0000_README | 2 +- |
18 |
...0_grsecurity-2.2.2-2.6.38.4-201104232142.patch} | 9442 +++++++----------- |
19 |
2.6.38/4422_grsec-mute-warnings.patch | 17 +- |
20 |
7 files changed, 8384 insertions(+), 12002 deletions(-) |
21 |
|
22 |
diff --git a/2.6.32/0000_README b/2.6.32/0000_README |
23 |
index 70319a3..a39c8e4 100644 |
24 |
--- a/2.6.32/0000_README |
25 |
+++ b/2.6.32/0000_README |
26 |
@@ -11,7 +11,11 @@ Patch: 1037_linux-2.6.32.38.patch |
27 |
From: http://www.kernel.org |
28 |
Desc: Linux 2.6.32.38 |
29 |
|
30 |
-Patch: 4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch |
31 |
+Patch: 1038_linux-2.6.32.39.patch |
32 |
+From: http://www.kernel.org |
33 |
+Desc: Linux 2.6.32.39 |
34 |
+ |
35 |
+Patch: 4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch |
36 |
From: http://www.grsecurity.net |
37 |
Desc: hardened-sources base patch from upstream grsecurity |
38 |
|
39 |
|
40 |
diff --git a/2.6.32/1038_linux-2.6.32.39.patch b/2.6.32/1038_linux-2.6.32.39.patch |
41 |
new file mode 100644 |
42 |
index 0000000..ef1f643 |
43 |
--- /dev/null |
44 |
+++ b/2.6.32/1038_linux-2.6.32.39.patch |
45 |
@@ -0,0 +1,792 @@ |
46 |
+diff --git a/MAINTAINERS b/MAINTAINERS |
47 |
+index b23a092..ea3302f 100644 |
48 |
+--- a/MAINTAINERS |
49 |
++++ b/MAINTAINERS |
50 |
+@@ -5010,7 +5010,6 @@ F: arch/alpha/kernel/srm_env.c |
51 |
+ |
52 |
+ STABLE BRANCH |
53 |
+ M: Greg Kroah-Hartman <greg@×××××.com> |
54 |
+-M: Chris Wright <chrisw@××××××××.org> |
55 |
+ L: stable@××××××.org |
56 |
+ S: Maintained |
57 |
+ |
58 |
+diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c |
59 |
+index 496ac7a..7bfb274 100644 |
60 |
+--- a/arch/ia64/kernel/mca.c |
61 |
++++ b/arch/ia64/kernel/mca.c |
62 |
+@@ -1850,7 +1850,8 @@ ia64_mca_cpu_init(void *cpu_data) |
63 |
+ data = mca_bootmem(); |
64 |
+ first_time = 0; |
65 |
+ } else |
66 |
+- data = __get_free_pages(GFP_KERNEL, get_order(sz)); |
67 |
++ data = (void *)__get_free_pages(GFP_KERNEL, |
68 |
++ get_order(sz)); |
69 |
+ if (!data) |
70 |
+ panic("Could not allocate MCA memory for cpu %d\n", |
71 |
+ cpu); |
72 |
+diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c |
73 |
+index 35b2a27..3b7ba70 100644 |
74 |
+--- a/arch/ia64/sn/pci/tioca_provider.c |
75 |
++++ b/arch/ia64/sn/pci/tioca_provider.c |
76 |
+@@ -517,7 +517,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir) |
77 |
+ * use the GART mapped mode. |
78 |
+ */ |
79 |
+ static u64 |
80 |
+-tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) |
81 |
++tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_count, int dma_flags) |
82 |
+ { |
83 |
+ u64 mapaddr; |
84 |
+ |
85 |
+diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h |
86 |
+index a7e502f..883037b 100644 |
87 |
+--- a/arch/x86/include/asm/msr-index.h |
88 |
++++ b/arch/x86/include/asm/msr-index.h |
89 |
+@@ -81,11 +81,15 @@ |
90 |
+ #define MSR_IA32_MC0_ADDR 0x00000402 |
91 |
+ #define MSR_IA32_MC0_MISC 0x00000403 |
92 |
+ |
93 |
++#define MSR_AMD64_MC0_MASK 0xc0010044 |
94 |
++ |
95 |
+ #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) |
96 |
+ #define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x)) |
97 |
+ #define MSR_IA32_MCx_ADDR(x) (MSR_IA32_MC0_ADDR + 4*(x)) |
98 |
+ #define MSR_IA32_MCx_MISC(x) (MSR_IA32_MC0_MISC + 4*(x)) |
99 |
+ |
100 |
++#define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) |
101 |
++ |
102 |
+ /* These are consecutive and not in the normal 4er MCE bank block */ |
103 |
+ #define MSR_IA32_MC0_CTL2 0x00000280 |
104 |
+ #define MSR_IA32_MCx_CTL2(x) (MSR_IA32_MC0_CTL2 + (x)) |
105 |
+diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h |
106 |
+index 78bb4d7..da35a70 100644 |
107 |
+--- a/arch/x86/include/asm/processor.h |
108 |
++++ b/arch/x86/include/asm/processor.h |
109 |
+@@ -1029,4 +1029,23 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, |
110 |
+ return ratio; |
111 |
+ } |
112 |
+ |
113 |
++/* |
114 |
++ * AMD errata checking |
115 |
++ */ |
116 |
++#ifdef CONFIG_CPU_SUP_AMD |
117 |
++extern const int amd_erratum_400[]; |
118 |
++extern bool cpu_has_amd_erratum(const int *); |
119 |
++ |
120 |
++#define AMD_LEGACY_ERRATUM(...) { -1, __VA_ARGS__, 0 } |
121 |
++#define AMD_OSVW_ERRATUM(osvw_id, ...) { osvw_id, __VA_ARGS__, 0 } |
122 |
++#define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \ |
123 |
++ ((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end)) |
124 |
++#define AMD_MODEL_RANGE_FAMILY(range) (((range) >> 24) & 0xff) |
125 |
++#define AMD_MODEL_RANGE_START(range) (((range) >> 12) & 0xfff) |
126 |
++#define AMD_MODEL_RANGE_END(range) ((range) & 0xfff) |
127 |
++ |
128 |
++#else |
129 |
++#define cpu_has_amd_erratum(x) (false) |
130 |
++#endif /* CONFIG_CPU_SUP_AMD */ |
131 |
++ |
132 |
+ #endif /* _ASM_X86_PROCESSOR_H */ |
133 |
+diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c |
134 |
+index 4d707d3..f893f73 100644 |
135 |
+--- a/arch/x86/kernel/cpu/amd.c |
136 |
++++ b/arch/x86/kernel/cpu/amd.c |
137 |
+@@ -566,6 +566,29 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) |
138 |
+ } |
139 |
+ } |
140 |
+ #endif |
141 |
++ |
142 |
++ /* As a rule processors have APIC timer running in deep C states */ |
143 |
++ if (c->x86 >= 0xf && !cpu_has_amd_erratum(amd_erratum_400)) |
144 |
++ set_cpu_cap(c, X86_FEATURE_ARAT); |
145 |
++ |
146 |
++ /* |
147 |
++ * Disable GART TLB Walk Errors on Fam10h. We do this here |
148 |
++ * because this is always needed when GART is enabled, even in a |
149 |
++ * kernel which has no MCE support built in. |
150 |
++ */ |
151 |
++ if (c->x86 == 0x10) { |
152 |
++ /* |
153 |
++ * BIOS should disable GartTlbWlk Errors themself. If |
154 |
++ * it doesn't do it here as suggested by the BKDG. |
155 |
++ * |
156 |
++ * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33012 |
157 |
++ */ |
158 |
++ u64 mask; |
159 |
++ |
160 |
++ rdmsrl(MSR_AMD64_MCx_MASK(4), mask); |
161 |
++ mask |= (1 << 10); |
162 |
++ wrmsrl(MSR_AMD64_MCx_MASK(4), mask); |
163 |
++ } |
164 |
+ } |
165 |
+ |
166 |
+ #ifdef CONFIG_X86_32 |
167 |
+@@ -610,3 +633,68 @@ static const struct cpu_dev __cpuinitconst amd_cpu_dev = { |
168 |
+ }; |
169 |
+ |
170 |
+ cpu_dev_register(amd_cpu_dev); |
171 |
++ |
172 |
++/* |
173 |
++ * AMD errata checking |
174 |
++ * |
175 |
++ * Errata are defined as arrays of ints using the AMD_LEGACY_ERRATUM() or |
176 |
++ * AMD_OSVW_ERRATUM() macros. The latter is intended for newer errata that |
177 |
++ * have an OSVW id assigned, which it takes as first argument. Both take a |
178 |
++ * variable number of family-specific model-stepping ranges created by |
179 |
++ * AMD_MODEL_RANGE(). Each erratum also has to be declared as extern const |
180 |
++ * int[] in arch/x86/include/asm/processor.h. |
181 |
++ * |
182 |
++ * Example: |
183 |
++ * |
184 |
++ * const int amd_erratum_319[] = |
185 |
++ * AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0x4, 0x2), |
186 |
++ * AMD_MODEL_RANGE(0x10, 0x8, 0x0, 0x8, 0x0), |
187 |
++ * AMD_MODEL_RANGE(0x10, 0x9, 0x0, 0x9, 0x0)); |
188 |
++ */ |
189 |
++ |
190 |
++const int amd_erratum_400[] = |
191 |
++ AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), |
192 |
++ AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); |
193 |
++ |
194 |
++ |
195 |
++bool cpu_has_amd_erratum(const int *erratum) |
196 |
++{ |
197 |
++ struct cpuinfo_x86 *cpu = ¤t_cpu_data; |
198 |
++ int osvw_id = *erratum++; |
199 |
++ u32 range; |
200 |
++ u32 ms; |
201 |
++ |
202 |
++ /* |
203 |
++ * If called early enough that current_cpu_data hasn't been initialized |
204 |
++ * yet, fall back to boot_cpu_data. |
205 |
++ */ |
206 |
++ if (cpu->x86 == 0) |
207 |
++ cpu = &boot_cpu_data; |
208 |
++ |
209 |
++ if (cpu->x86_vendor != X86_VENDOR_AMD) |
210 |
++ return false; |
211 |
++ |
212 |
++ if (osvw_id >= 0 && osvw_id < 65536 && |
213 |
++ cpu_has(cpu, X86_FEATURE_OSVW)) { |
214 |
++ u64 osvw_len; |
215 |
++ |
216 |
++ rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, osvw_len); |
217 |
++ if (osvw_id < osvw_len) { |
218 |
++ u64 osvw_bits; |
219 |
++ |
220 |
++ rdmsrl(MSR_AMD64_OSVW_STATUS + (osvw_id >> 6), |
221 |
++ osvw_bits); |
222 |
++ return osvw_bits & (1ULL << (osvw_id & 0x3f)); |
223 |
++ } |
224 |
++ } |
225 |
++ |
226 |
++ /* OSVW unavailable or ID unknown, match family-model-stepping range */ |
227 |
++ ms = (cpu->x86_model << 4) | cpu->x86_mask; |
228 |
++ while ((range = *erratum++)) |
229 |
++ if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) && |
230 |
++ (ms >= AMD_MODEL_RANGE_START(range)) && |
231 |
++ (ms <= AMD_MODEL_RANGE_END(range))) |
232 |
++ return true; |
233 |
++ |
234 |
++ return false; |
235 |
++} |
236 |
+diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c |
237 |
+index 5fd5b07..fc6c84d 100644 |
238 |
+--- a/arch/x86/kernel/process.c |
239 |
++++ b/arch/x86/kernel/process.c |
240 |
+@@ -438,42 +438,6 @@ static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) |
241 |
+ return (edx & MWAIT_EDX_C1); |
242 |
+ } |
243 |
+ |
244 |
+-/* |
245 |
+- * Check for AMD CPUs, where APIC timer interrupt does not wake up CPU from C1e. |
246 |
+- * For more information see |
247 |
+- * - Erratum #400 for NPT family 0xf and family 0x10 CPUs |
248 |
+- * - Erratum #365 for family 0x11 (not affected because C1e not in use) |
249 |
+- */ |
250 |
+-static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c) |
251 |
+-{ |
252 |
+- u64 val; |
253 |
+- if (c->x86_vendor != X86_VENDOR_AMD) |
254 |
+- goto no_c1e_idle; |
255 |
+- |
256 |
+- /* Family 0x0f models < rev F do not have C1E */ |
257 |
+- if (c->x86 == 0x0F && c->x86_model >= 0x40) |
258 |
+- return 1; |
259 |
+- |
260 |
+- if (c->x86 == 0x10) { |
261 |
+- /* |
262 |
+- * check OSVW bit for CPUs that are not affected |
263 |
+- * by erratum #400 |
264 |
+- */ |
265 |
+- if (cpu_has(c, X86_FEATURE_OSVW)) { |
266 |
+- rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, val); |
267 |
+- if (val >= 2) { |
268 |
+- rdmsrl(MSR_AMD64_OSVW_STATUS, val); |
269 |
+- if (!(val & BIT(1))) |
270 |
+- goto no_c1e_idle; |
271 |
+- } |
272 |
+- } |
273 |
+- return 1; |
274 |
+- } |
275 |
+- |
276 |
+-no_c1e_idle: |
277 |
+- return 0; |
278 |
+-} |
279 |
+- |
280 |
+ static cpumask_var_t c1e_mask; |
281 |
+ static int c1e_detected; |
282 |
+ |
283 |
+@@ -551,7 +515,8 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) |
284 |
+ */ |
285 |
+ printk(KERN_INFO "using mwait in idle threads.\n"); |
286 |
+ pm_idle = mwait_idle; |
287 |
+- } else if (check_c1e_idle(c)) { |
288 |
++ } else if (cpu_has_amd_erratum(amd_erratum_400)) { |
289 |
++ /* E400: APIC timer interrupt does not wake up CPU from C1e */ |
290 |
+ printk(KERN_INFO "using C1E aware idle routine\n"); |
291 |
+ pm_idle = c1e_idle; |
292 |
+ } else |
293 |
+diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S |
294 |
+index 648fe47..f35eec7 100644 |
295 |
+--- a/arch/x86/lib/semaphore_32.S |
296 |
++++ b/arch/x86/lib/semaphore_32.S |
297 |
+@@ -36,7 +36,7 @@ |
298 |
+ */ |
299 |
+ #ifdef CONFIG_SMP |
300 |
+ ENTRY(__write_lock_failed) |
301 |
+- CFI_STARTPROC simple |
302 |
++ CFI_STARTPROC |
303 |
+ FRAME |
304 |
+ 2: LOCK_PREFIX |
305 |
+ addl $ RW_LOCK_BIAS,(%eax) |
306 |
+diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c |
307 |
+index 4a7711c..5844abf 100644 |
308 |
+--- a/drivers/media/video/sn9c102/sn9c102_core.c |
309 |
++++ b/drivers/media/video/sn9c102/sn9c102_core.c |
310 |
+@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR, |
311 |
+ sn9c102_show_i2c_reg, sn9c102_store_i2c_reg); |
312 |
+ static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR, |
313 |
+ sn9c102_show_i2c_val, sn9c102_store_i2c_val); |
314 |
+-static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green); |
315 |
+-static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue); |
316 |
+-static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red); |
317 |
++static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green); |
318 |
++static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue); |
319 |
++static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red); |
320 |
+ static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL); |
321 |
+ |
322 |
+ |
323 |
+diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c |
324 |
+index 33d5c57..605caaa 100644 |
325 |
+--- a/drivers/net/usb/cdc-phonet.c |
326 |
++++ b/drivers/net/usb/cdc-phonet.c |
327 |
+@@ -325,13 +325,13 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id) |
328 |
+ { |
329 |
+ static const char ifname[] = "usbpn%d"; |
330 |
+ const struct usb_cdc_union_desc *union_header = NULL; |
331 |
+- const struct usb_cdc_header_desc *phonet_header = NULL; |
332 |
+ const struct usb_host_interface *data_desc; |
333 |
+ struct usb_interface *data_intf; |
334 |
+ struct usb_device *usbdev = interface_to_usbdev(intf); |
335 |
+ struct net_device *dev; |
336 |
+ struct usbpn_dev *pnd; |
337 |
+ u8 *data; |
338 |
++ int phonet = 0; |
339 |
+ int len, err; |
340 |
+ |
341 |
+ data = intf->altsetting->extra; |
342 |
+@@ -352,10 +352,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id) |
343 |
+ (struct usb_cdc_union_desc *)data; |
344 |
+ break; |
345 |
+ case 0xAB: |
346 |
+- if (phonet_header || dlen < 5) |
347 |
+- break; |
348 |
+- phonet_header = |
349 |
+- (struct usb_cdc_header_desc *)data; |
350 |
++ phonet = 1; |
351 |
+ break; |
352 |
+ } |
353 |
+ } |
354 |
+@@ -363,7 +360,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id) |
355 |
+ len -= dlen; |
356 |
+ } |
357 |
+ |
358 |
+- if (!union_header || !phonet_header) |
359 |
++ if (!union_header || !phonet) |
360 |
+ return -EINVAL; |
361 |
+ |
362 |
+ data_intf = usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0); |
363 |
+diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c |
364 |
+index 355dffc..2ce5963 100644 |
365 |
+--- a/drivers/usb/core/devices.c |
366 |
++++ b/drivers/usb/core/devices.c |
367 |
+@@ -211,7 +211,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end, |
368 |
+ break; |
369 |
+ case USB_ENDPOINT_XFER_INT: |
370 |
+ type = "Int."; |
371 |
+- if (speed == USB_SPEED_HIGH) |
372 |
++ if (speed == USB_SPEED_HIGH || speed == USB_SPEED_SUPER) |
373 |
+ interval = 1 << (desc->bInterval - 1); |
374 |
+ else |
375 |
+ interval = desc->bInterval; |
376 |
+@@ -219,7 +219,8 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end, |
377 |
+ default: /* "can't happen" */ |
378 |
+ return start; |
379 |
+ } |
380 |
+- interval *= (speed == USB_SPEED_HIGH) ? 125 : 1000; |
381 |
++ interval *= (speed == USB_SPEED_HIGH || |
382 |
++ speed == USB_SPEED_SUPER) ? 125 : 1000; |
383 |
+ if (interval % 1000) |
384 |
+ unit = 'u'; |
385 |
+ else { |
386 |
+@@ -529,8 +530,9 @@ static ssize_t usb_device_dump(char __user **buffer, size_t *nbytes, |
387 |
+ if (level == 0) { |
388 |
+ int max; |
389 |
+ |
390 |
+- /* high speed reserves 80%, full/low reserves 90% */ |
391 |
+- if (usbdev->speed == USB_SPEED_HIGH) |
392 |
++ /* super/high speed reserves 80%, full/low reserves 90% */ |
393 |
++ if (usbdev->speed == USB_SPEED_HIGH || |
394 |
++ usbdev->speed == USB_SPEED_SUPER) |
395 |
+ max = 800; |
396 |
+ else |
397 |
+ max = FRAME_TIME_MAX_USECS_ALLOC; |
398 |
+diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c |
399 |
+index d4bd6ef..f51345f 100644 |
400 |
+--- a/drivers/usb/host/ehci-q.c |
401 |
++++ b/drivers/usb/host/ehci-q.c |
402 |
+@@ -1224,24 +1224,27 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh) |
403 |
+ |
404 |
+ static void scan_async (struct ehci_hcd *ehci) |
405 |
+ { |
406 |
++ bool stopped; |
407 |
+ struct ehci_qh *qh; |
408 |
+ enum ehci_timer_action action = TIMER_IO_WATCHDOG; |
409 |
+ |
410 |
+ ehci->stamp = ehci_readl(ehci, &ehci->regs->frame_index); |
411 |
+ timer_action_done (ehci, TIMER_ASYNC_SHRINK); |
412 |
+ rescan: |
413 |
++ stopped = !HC_IS_RUNNING(ehci_to_hcd(ehci)->state); |
414 |
+ qh = ehci->async->qh_next.qh; |
415 |
+ if (likely (qh != NULL)) { |
416 |
+ do { |
417 |
+ /* clean any finished work for this qh */ |
418 |
+- if (!list_empty (&qh->qtd_list) |
419 |
+- && qh->stamp != ehci->stamp) { |
420 |
++ if (!list_empty(&qh->qtd_list) && (stopped || |
421 |
++ qh->stamp != ehci->stamp)) { |
422 |
+ int temp; |
423 |
+ |
424 |
+ /* unlinks could happen here; completion |
425 |
+ * reporting drops the lock. rescan using |
426 |
+ * the latest schedule, but don't rescan |
427 |
+- * qhs we already finished (no looping). |
428 |
++ * qhs we already finished (no looping) |
429 |
++ * unless the controller is stopped. |
430 |
+ */ |
431 |
+ qh = qh_get (qh); |
432 |
+ qh->stamp = ehci->stamp; |
433 |
+@@ -1262,9 +1265,9 @@ rescan: |
434 |
+ */ |
435 |
+ if (list_empty(&qh->qtd_list) |
436 |
+ && qh->qh_state == QH_STATE_LINKED) { |
437 |
+- if (!ehci->reclaim |
438 |
+- && ((ehci->stamp - qh->stamp) & 0x1fff) |
439 |
+- >= (EHCI_SHRINK_FRAMES * 8)) |
440 |
++ if (!ehci->reclaim && (stopped || |
441 |
++ ((ehci->stamp - qh->stamp) & 0x1fff) |
442 |
++ >= EHCI_SHRINK_FRAMES * 8)) |
443 |
+ start_unlink_async(ehci, qh); |
444 |
+ else |
445 |
+ action = TIMER_ASYNC_SHRINK; |
446 |
+diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c |
447 |
+index dd71f02..64cb409 100644 |
448 |
+--- a/drivers/usb/host/xhci-mem.c |
449 |
++++ b/drivers/usb/host/xhci-mem.c |
450 |
+@@ -439,6 +439,47 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud |
451 |
+ return 0; |
452 |
+ } |
453 |
+ |
454 |
++/* |
455 |
++ * Convert interval expressed as 2^(bInterval - 1) == interval into |
456 |
++ * straight exponent value 2^n == interval. |
457 |
++ * |
458 |
++ */ |
459 |
++static unsigned int xhci_parse_exponent_interval(struct usb_device *udev, |
460 |
++ struct usb_host_endpoint *ep) |
461 |
++{ |
462 |
++ unsigned int interval; |
463 |
++ |
464 |
++ interval = clamp_val(ep->desc.bInterval, 1, 16) - 1; |
465 |
++ if (interval != ep->desc.bInterval - 1) |
466 |
++ dev_warn(&udev->dev, |
467 |
++ "ep %#x - rounding interval to %d microframes\n", |
468 |
++ ep->desc.bEndpointAddress, |
469 |
++ 1 << interval); |
470 |
++ |
471 |
++ return interval; |
472 |
++} |
473 |
++ |
474 |
++/* |
475 |
++ * Convert bInterval expressed in frames (in 1-255 range) to exponent of |
476 |
++ * microframes, rounded down to nearest power of 2. |
477 |
++ */ |
478 |
++static unsigned int xhci_parse_frame_interval(struct usb_device *udev, |
479 |
++ struct usb_host_endpoint *ep) |
480 |
++{ |
481 |
++ unsigned int interval; |
482 |
++ |
483 |
++ interval = fls(8 * ep->desc.bInterval) - 1; |
484 |
++ interval = clamp_val(interval, 3, 10); |
485 |
++ if ((1 << interval) != 8 * ep->desc.bInterval) |
486 |
++ dev_warn(&udev->dev, |
487 |
++ "ep %#x - rounding interval to %d microframes, ep desc says %d microframes\n", |
488 |
++ ep->desc.bEndpointAddress, |
489 |
++ 1 << interval, |
490 |
++ 8 * ep->desc.bInterval); |
491 |
++ |
492 |
++ return interval; |
493 |
++} |
494 |
++ |
495 |
+ /* Return the polling or NAK interval. |
496 |
+ * |
497 |
+ * The polling interval is expressed in "microframes". If xHCI's Interval field |
498 |
+@@ -456,40 +497,38 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev, |
499 |
+ case USB_SPEED_HIGH: |
500 |
+ /* Max NAK rate */ |
501 |
+ if (usb_endpoint_xfer_control(&ep->desc) || |
502 |
+- usb_endpoint_xfer_bulk(&ep->desc)) |
503 |
++ usb_endpoint_xfer_bulk(&ep->desc)) { |
504 |
+ interval = ep->desc.bInterval; |
505 |
++ break; |
506 |
++ } |
507 |
+ /* Fall through - SS and HS isoc/int have same decoding */ |
508 |
++ |
509 |
+ case USB_SPEED_SUPER: |
510 |
+ if (usb_endpoint_xfer_int(&ep->desc) || |
511 |
+- usb_endpoint_xfer_isoc(&ep->desc)) { |
512 |
+- if (ep->desc.bInterval == 0) |
513 |
+- interval = 0; |
514 |
+- else |
515 |
+- interval = ep->desc.bInterval - 1; |
516 |
+- if (interval > 15) |
517 |
+- interval = 15; |
518 |
+- if (interval != ep->desc.bInterval + 1) |
519 |
+- dev_warn(&udev->dev, "ep %#x - rounding interval to %d microframes\n", |
520 |
+- ep->desc.bEndpointAddress, 1 << interval); |
521 |
++ usb_endpoint_xfer_isoc(&ep->desc)) { |
522 |
++ interval = xhci_parse_exponent_interval(udev, ep); |
523 |
+ } |
524 |
+ break; |
525 |
+- /* Convert bInterval (in 1-255 frames) to microframes and round down to |
526 |
+- * nearest power of 2. |
527 |
+- */ |
528 |
++ |
529 |
+ case USB_SPEED_FULL: |
530 |
++ if (usb_endpoint_xfer_int(&ep->desc)) { |
531 |
++ interval = xhci_parse_exponent_interval(udev, ep); |
532 |
++ break; |
533 |
++ } |
534 |
++ /* |
535 |
++ * Fall through for isochronous endpoint interval decoding |
536 |
++ * since it uses the same rules as low speed interrupt |
537 |
++ * endpoints. |
538 |
++ */ |
539 |
++ |
540 |
+ case USB_SPEED_LOW: |
541 |
+ if (usb_endpoint_xfer_int(&ep->desc) || |
542 |
+- usb_endpoint_xfer_isoc(&ep->desc)) { |
543 |
+- interval = fls(8*ep->desc.bInterval) - 1; |
544 |
+- if (interval > 10) |
545 |
+- interval = 10; |
546 |
+- if (interval < 3) |
547 |
+- interval = 3; |
548 |
+- if ((1 << interval) != 8*ep->desc.bInterval) |
549 |
+- dev_warn(&udev->dev, "ep %#x - rounding interval to %d microframes\n", |
550 |
+- ep->desc.bEndpointAddress, 1 << interval); |
551 |
++ usb_endpoint_xfer_isoc(&ep->desc)) { |
552 |
++ |
553 |
++ interval = xhci_parse_frame_interval(udev, ep); |
554 |
+ } |
555 |
+ break; |
556 |
++ |
557 |
+ default: |
558 |
+ BUG(); |
559 |
+ } |
560 |
+diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h |
561 |
+index db821e9..a5dc8086 100644 |
562 |
+--- a/drivers/usb/host/xhci.h |
563 |
++++ b/drivers/usb/host/xhci.h |
564 |
+@@ -232,7 +232,7 @@ struct xhci_op_regs { |
565 |
+ * notification type that matches a bit set in this bit field. |
566 |
+ */ |
567 |
+ #define DEV_NOTE_MASK (0xffff) |
568 |
+-#define ENABLE_DEV_NOTE(x) (1 << x) |
569 |
++#define ENABLE_DEV_NOTE(x) (1 << (x)) |
570 |
+ /* Most of the device notification types should only be used for debug. |
571 |
+ * SW does need to pay attention to function wake notifications. |
572 |
+ */ |
573 |
+@@ -579,11 +579,11 @@ struct xhci_ep_ctx { |
574 |
+ #define EP_STATE_STOPPED 3 |
575 |
+ #define EP_STATE_ERROR 4 |
576 |
+ /* Mult - Max number of burtst within an interval, in EP companion desc. */ |
577 |
+-#define EP_MULT(p) ((p & 0x3) << 8) |
578 |
++#define EP_MULT(p) (((p) & 0x3) << 8) |
579 |
+ /* bits 10:14 are Max Primary Streams */ |
580 |
+ /* bit 15 is Linear Stream Array */ |
581 |
+ /* Interval - period between requests to an endpoint - 125u increments. */ |
582 |
+-#define EP_INTERVAL(p) ((p & 0xff) << 16) |
583 |
++#define EP_INTERVAL(p) (((p) & 0xff) << 16) |
584 |
+ #define EP_INTERVAL_TO_UFRAMES(p) (1 << (((p) >> 16) & 0xff)) |
585 |
+ |
586 |
+ /* ep_info2 bitmasks */ |
587 |
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c |
588 |
+index e371888..5171f22 100644 |
589 |
+--- a/drivers/usb/serial/ftdi_sio.c |
590 |
++++ b/drivers/usb/serial/ftdi_sio.c |
591 |
+@@ -155,6 +155,8 @@ static struct ftdi_sio_quirk ftdi_stmclite_quirk = { |
592 |
+ * /sys/bus/usb/ftdi_sio/new_id, then send patch/report! |
593 |
+ */ |
594 |
+ static struct usb_device_id id_table_combined [] = { |
595 |
++ { USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) }, |
596 |
++ { USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) }, |
597 |
+ { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, |
598 |
+ { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, |
599 |
+ { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) }, |
600 |
+@@ -529,6 +531,7 @@ static struct usb_device_id id_table_combined [] = { |
601 |
+ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2803_8_PID) }, |
602 |
+ { USB_DEVICE(IDTECH_VID, IDTECH_IDT1221U_PID) }, |
603 |
+ { USB_DEVICE(OCT_VID, OCT_US101_PID) }, |
604 |
++ { USB_DEVICE(OCT_VID, OCT_DK201_PID) }, |
605 |
+ { USB_DEVICE(FTDI_VID, FTDI_HE_TIRA1_PID), |
606 |
+ .driver_info = (kernel_ulong_t)&ftdi_HE_TIRA1_quirk }, |
607 |
+ { USB_DEVICE(FTDI_VID, FTDI_USB_UIRT_PID), |
608 |
+@@ -790,6 +793,8 @@ static struct usb_device_id id_table_combined [] = { |
609 |
+ { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), |
610 |
+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
611 |
+ { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) }, |
612 |
++ { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) }, |
613 |
++ { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) }, |
614 |
+ { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) }, |
615 |
+ { USB_DEVICE(FTDI_VID, MJSG_GENERIC_PID) }, |
616 |
+ { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) }, |
617 |
+diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h |
618 |
+index c8d0fec..eca754b 100644 |
619 |
+--- a/drivers/usb/serial/ftdi_sio_ids.h |
620 |
++++ b/drivers/usb/serial/ftdi_sio_ids.h |
621 |
+@@ -300,6 +300,8 @@ |
622 |
+ * Hameg HO820 and HO870 interface (using VID 0x0403) |
623 |
+ */ |
624 |
+ #define HAMEG_HO820_PID 0xed74 |
625 |
++#define HAMEG_HO730_PID 0xed73 |
626 |
++#define HAMEG_HO720_PID 0xed72 |
627 |
+ #define HAMEG_HO870_PID 0xed71 |
628 |
+ |
629 |
+ /* |
630 |
+@@ -579,6 +581,7 @@ |
631 |
+ /* Note: OCT US101 is also rebadged as Dick Smith Electronics (NZ) XH6381 */ |
632 |
+ /* Also rebadged as Dick Smith Electronics (Aus) XH6451 */ |
633 |
+ /* Also rebadged as SIIG Inc. model US2308 hardware version 1 */ |
634 |
++#define OCT_DK201_PID 0x0103 /* OCT DK201 USB docking station */ |
635 |
+ #define OCT_US101_PID 0x0421 /* OCT US101 USB to RS-232 */ |
636 |
+ |
637 |
+ /* |
638 |
+@@ -1147,3 +1150,12 @@ |
639 |
+ #define QIHARDWARE_VID 0x20B7 |
640 |
+ #define MILKYMISTONE_JTAGSERIAL_PID 0x0713 |
641 |
+ |
642 |
++/* |
643 |
++ * CTI GmbH RS485 Converter http://www.cti-lean.com/ |
644 |
++ */ |
645 |
++/* USB-485-Mini*/ |
646 |
++#define FTDI_CTI_MINI_PID 0xF608 |
647 |
++/* USB-Nano-485*/ |
648 |
++#define FTDI_CTI_NANO_PID 0xF60B |
649 |
++ |
650 |
++ |
651 |
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c |
652 |
+index cf5ff7d..e605c89 100644 |
653 |
+--- a/drivers/usb/serial/option.c |
654 |
++++ b/drivers/usb/serial/option.c |
655 |
+@@ -388,6 +388,16 @@ static int option_resume(struct usb_serial *serial); |
656 |
+ #define CELOT_VENDOR_ID 0x211f |
657 |
+ #define CELOT_PRODUCT_CT680M 0x6801 |
658 |
+ |
659 |
++/* ONDA Communication vendor id */ |
660 |
++#define ONDA_VENDOR_ID 0x1ee8 |
661 |
++ |
662 |
++/* ONDA MT825UP HSDPA 14.2 modem */ |
663 |
++#define ONDA_MT825UP 0x000b |
664 |
++ |
665 |
++/* Samsung products */ |
666 |
++#define SAMSUNG_VENDOR_ID 0x04e8 |
667 |
++#define SAMSUNG_PRODUCT_GT_B3730 0x6889 |
668 |
++ |
669 |
+ static struct usb_device_id option_ids[] = { |
670 |
+ { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, |
671 |
+ { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, |
672 |
+@@ -917,6 +927,8 @@ static struct usb_device_id option_ids[] = { |
673 |
+ |
674 |
+ { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, |
675 |
+ { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ |
676 |
++ { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */ |
677 |
++ { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730/GT-B3710 LTE USB modem.*/ |
678 |
+ { } /* Terminating entry */ |
679 |
+ }; |
680 |
+ MODULE_DEVICE_TABLE(usb, option_ids); |
681 |
+diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c |
682 |
+index 3bbcaa7..7df5937 100644 |
683 |
+--- a/fs/cifs/connect.c |
684 |
++++ b/fs/cifs/connect.c |
685 |
+@@ -2532,7 +2532,7 @@ try_mount_again: |
686 |
+ |
687 |
+ remote_path_check: |
688 |
+ /* check if a whole path (including prepath) is not remote */ |
689 |
+- if (!rc && cifs_sb->prepathlen && tcon) { |
690 |
++ if (!rc && tcon) { |
691 |
+ /* build_path_to_root works only when we have a valid tcon */ |
692 |
+ full_path = cifs_build_path_to_root(cifs_sb); |
693 |
+ if (full_path == NULL) { |
694 |
+diff --git a/fs/proc/base.c b/fs/proc/base.c |
695 |
+index a1bb0f6..3d09a10 100644 |
696 |
+--- a/fs/proc/base.c |
697 |
++++ b/fs/proc/base.c |
698 |
+@@ -2806,11 +2806,16 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi |
699 |
+ /* for the /proc/ directory itself, after non-process stuff has been done */ |
700 |
+ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) |
701 |
+ { |
702 |
+- unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; |
703 |
+- struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); |
704 |
++ unsigned int nr; |
705 |
++ struct task_struct *reaper; |
706 |
+ struct tgid_iter iter; |
707 |
+ struct pid_namespace *ns; |
708 |
+ |
709 |
++ if (filp->f_pos >= PID_MAX_LIMIT + TGID_OFFSET) |
710 |
++ goto out_no_task; |
711 |
++ nr = filp->f_pos - FIRST_PROCESS_ENTRY; |
712 |
++ |
713 |
++ reaper = get_proc_task(filp->f_path.dentry->d_inode); |
714 |
+ if (!reaper) |
715 |
+ goto out_no_task; |
716 |
+ |
717 |
+diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c |
718 |
+index 32fae40..3c420b2 100644 |
719 |
+--- a/fs/ramfs/file-nommu.c |
720 |
++++ b/fs/ramfs/file-nommu.c |
721 |
+@@ -111,6 +111,7 @@ int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize) |
722 |
+ SetPageDirty(page); |
723 |
+ |
724 |
+ unlock_page(page); |
725 |
++ put_page(page); |
726 |
+ } |
727 |
+ |
728 |
+ return 0; |
729 |
+diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c |
730 |
+index ace4d8d..ceaa1d3 100644 |
731 |
+--- a/fs/ubifs/debug.c |
732 |
++++ b/fs/ubifs/debug.c |
733 |
+@@ -2691,19 +2691,19 @@ int dbg_debugfs_init_fs(struct ubifs_info *c) |
734 |
+ } |
735 |
+ |
736 |
+ fname = "dump_lprops"; |
737 |
+- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
738 |
++ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
739 |
+ if (IS_ERR(dent)) |
740 |
+ goto out_remove; |
741 |
+ d->dfs_dump_lprops = dent; |
742 |
+ |
743 |
+ fname = "dump_budg"; |
744 |
+- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
745 |
++ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
746 |
+ if (IS_ERR(dent)) |
747 |
+ goto out_remove; |
748 |
+ d->dfs_dump_budg = dent; |
749 |
+ |
750 |
+ fname = "dump_tnc"; |
751 |
+- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
752 |
++ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
753 |
+ if (IS_ERR(dent)) |
754 |
+ goto out_remove; |
755 |
+ d->dfs_dump_tnc = dent; |
756 |
+diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c |
757 |
+index 1009adc..e90dd7e 100644 |
758 |
+--- a/fs/ubifs/file.c |
759 |
++++ b/fs/ubifs/file.c |
760 |
+@@ -1311,6 +1311,9 @@ int ubifs_fsync(struct file *file, struct dentry *dentry, int datasync) |
761 |
+ |
762 |
+ dbg_gen("syncing inode %lu", inode->i_ino); |
763 |
+ |
764 |
++ if (inode->i_sb->s_flags & MS_RDONLY) |
765 |
++ return 0; |
766 |
++ |
767 |
+ /* |
768 |
+ * VFS has already synchronized dirty pages for this inode. Synchronize |
769 |
+ * the inode unless this is a 'datasync()' call. |
770 |
+diff --git a/include/linux/pid.h b/include/linux/pid.h |
771 |
+index 49f1c2f..ec9f2df 100644 |
772 |
+--- a/include/linux/pid.h |
773 |
++++ b/include/linux/pid.h |
774 |
+@@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr); |
775 |
+ */ |
776 |
+ extern struct pid *find_get_pid(int nr); |
777 |
+ extern struct pid *find_ge_pid(int nr, struct pid_namespace *); |
778 |
+-int next_pidmap(struct pid_namespace *pid_ns, int last); |
779 |
++int next_pidmap(struct pid_namespace *pid_ns, unsigned int last); |
780 |
+ |
781 |
+ extern struct pid *alloc_pid(struct pid_namespace *ns); |
782 |
+ extern void free_pid(struct pid *pid); |
783 |
+diff --git a/kernel/pid.c b/kernel/pid.c |
784 |
+index d3f722d..fce7198 100644 |
785 |
+--- a/kernel/pid.c |
786 |
++++ b/kernel/pid.c |
787 |
+@@ -182,11 +182,14 @@ static int alloc_pidmap(struct pid_namespace *pid_ns) |
788 |
+ return -1; |
789 |
+ } |
790 |
+ |
791 |
+-int next_pidmap(struct pid_namespace *pid_ns, int last) |
792 |
++int next_pidmap(struct pid_namespace *pid_ns, unsigned int last) |
793 |
+ { |
794 |
+ int offset; |
795 |
+ struct pidmap *map, *end; |
796 |
+ |
797 |
++ if (last >= PID_MAX_LIMIT) |
798 |
++ return -1; |
799 |
++ |
800 |
+ offset = (last + 1) & BITS_PER_PAGE_MASK; |
801 |
+ map = &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE]; |
802 |
+ end = &pid_ns->pidmap[PIDMAP_ENTRIES]; |
803 |
+diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c |
804 |
+index 608a97b..1e9f3e42 100644 |
805 |
+--- a/net/ax25/af_ax25.c |
806 |
++++ b/net/ax25/af_ax25.c |
807 |
+@@ -1391,7 +1391,7 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr, |
808 |
+ ax25_cb *ax25; |
809 |
+ int err = 0; |
810 |
+ |
811 |
+- memset(fsa, 0, sizeof(fsa)); |
812 |
++ memset(fsa, 0, sizeof(*fsa)); |
813 |
+ lock_sock(sk); |
814 |
+ ax25 = ax25_sk(sk); |
815 |
+ |
816 |
+diff --git a/net/rds/rdma.c b/net/rds/rdma.c |
817 |
+index 6b09b94..ff5e3c9 100644 |
818 |
+--- a/net/rds/rdma.c |
819 |
++++ b/net/rds/rdma.c |
820 |
+@@ -473,6 +473,17 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs, |
821 |
+ |
822 |
+ max_pages = max(nr, max_pages); |
823 |
+ nr_pages += nr; |
824 |
++ |
825 |
++ /* |
826 |
++ * nr for one entry in limited to (UINT_MAX>>PAGE_SHIFT)+1 |
827 |
++ * so nr_pages cannot overflow without becoming bigger than |
828 |
++ * INT_MAX first. If nr cannot overflow then max_pages should |
829 |
++ * be ok. |
830 |
++ */ |
831 |
++ if (nr_pages > INT_MAX) { |
832 |
++ ret = -EINVAL; |
833 |
++ goto out; |
834 |
++ } |
835 |
+ } |
836 |
+ |
837 |
+ pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL); |
838 |
|
839 |
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch |
840 |
similarity index 83% |
841 |
rename from 2.6.32/4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch |
842 |
rename to 2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch |
843 |
index a2fb0ed..b39bf4e 100644 |
844 |
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.38-201104191737.patch |
845 |
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104232142.patch |
846 |
@@ -1,6 +1,6 @@ |
847 |
-diff -urNp linux-2.6.32.38/arch/alpha/include/asm/elf.h linux-2.6.32.38/arch/alpha/include/asm/elf.h |
848 |
---- linux-2.6.32.38/arch/alpha/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
849 |
-+++ linux-2.6.32.38/arch/alpha/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
850 |
+diff -urNp linux-2.6.32.39/arch/alpha/include/asm/elf.h linux-2.6.32.39/arch/alpha/include/asm/elf.h |
851 |
+--- linux-2.6.32.39/arch/alpha/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
852 |
++++ linux-2.6.32.39/arch/alpha/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
853 |
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
854 |
|
855 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) |
856 |
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/include/asm/elf.h linux-2.6.32.38/arch/alp |
857 |
/* $0 is set by ld.so to a pointer to a function which might be |
858 |
registered using atexit. This provides a mean for the dynamic |
859 |
linker to call DT_FINI functions for shared libraries that have |
860 |
-diff -urNp linux-2.6.32.38/arch/alpha/include/asm/pgtable.h linux-2.6.32.38/arch/alpha/include/asm/pgtable.h |
861 |
---- linux-2.6.32.38/arch/alpha/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
862 |
-+++ linux-2.6.32.38/arch/alpha/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
863 |
+diff -urNp linux-2.6.32.39/arch/alpha/include/asm/pgtable.h linux-2.6.32.39/arch/alpha/include/asm/pgtable.h |
864 |
+--- linux-2.6.32.39/arch/alpha/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
865 |
++++ linux-2.6.32.39/arch/alpha/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
866 |
@@ -101,6 +101,17 @@ struct vm_area_struct; |
867 |
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) |
868 |
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) |
869 |
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/include/asm/pgtable.h linux-2.6.32.38/arch |
870 |
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) |
871 |
|
872 |
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) |
873 |
-diff -urNp linux-2.6.32.38/arch/alpha/kernel/module.c linux-2.6.32.38/arch/alpha/kernel/module.c |
874 |
---- linux-2.6.32.38/arch/alpha/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
875 |
-+++ linux-2.6.32.38/arch/alpha/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
876 |
+diff -urNp linux-2.6.32.39/arch/alpha/kernel/module.c linux-2.6.32.39/arch/alpha/kernel/module.c |
877 |
+--- linux-2.6.32.39/arch/alpha/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
878 |
++++ linux-2.6.32.39/arch/alpha/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
879 |
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, |
880 |
|
881 |
/* The small sections were sorted to the end of the segment. |
882 |
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/kernel/module.c linux-2.6.32.38/arch/alpha |
883 |
got = sechdrs[me->arch.gotsecindex].sh_addr; |
884 |
|
885 |
for (i = 0; i < n; i++) { |
886 |
-diff -urNp linux-2.6.32.38/arch/alpha/kernel/osf_sys.c linux-2.6.32.38/arch/alpha/kernel/osf_sys.c |
887 |
---- linux-2.6.32.38/arch/alpha/kernel/osf_sys.c 2011-03-27 14:31:47.000000000 -0400 |
888 |
-+++ linux-2.6.32.38/arch/alpha/kernel/osf_sys.c 2011-04-17 15:56:45.000000000 -0400 |
889 |
+diff -urNp linux-2.6.32.39/arch/alpha/kernel/osf_sys.c linux-2.6.32.39/arch/alpha/kernel/osf_sys.c |
890 |
+--- linux-2.6.32.39/arch/alpha/kernel/osf_sys.c 2011-03-27 14:31:47.000000000 -0400 |
891 |
++++ linux-2.6.32.39/arch/alpha/kernel/osf_sys.c 2011-04-17 15:56:45.000000000 -0400 |
892 |
@@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a |
893 |
/* At this point: (!vma || addr < vma->vm_end). */ |
894 |
if (limit - len < addr) |
895 |
@@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/kernel/osf_sys.c linux-2.6.32.38/arch/alph |
896 |
if (addr != (unsigned long) -ENOMEM) |
897 |
return addr; |
898 |
|
899 |
-diff -urNp linux-2.6.32.38/arch/alpha/mm/fault.c linux-2.6.32.38/arch/alpha/mm/fault.c |
900 |
---- linux-2.6.32.38/arch/alpha/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
901 |
-+++ linux-2.6.32.38/arch/alpha/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
902 |
+diff -urNp linux-2.6.32.39/arch/alpha/mm/fault.c linux-2.6.32.39/arch/alpha/mm/fault.c |
903 |
+--- linux-2.6.32.39/arch/alpha/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
904 |
++++ linux-2.6.32.39/arch/alpha/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
905 |
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * |
906 |
__reload_thread(pcb); |
907 |
} |
908 |
@@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.38/arch/alpha/mm/fault.c linux-2.6.32.38/arch/alpha/mm/f |
909 |
} else if (!cause) { |
910 |
/* Allow reads even for write-only mappings */ |
911 |
if (!(vma->vm_flags & (VM_READ | VM_WRITE))) |
912 |
-diff -urNp linux-2.6.32.38/arch/arm/include/asm/elf.h linux-2.6.32.38/arch/arm/include/asm/elf.h |
913 |
---- linux-2.6.32.38/arch/arm/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
914 |
-+++ linux-2.6.32.38/arch/arm/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
915 |
+diff -urNp linux-2.6.32.39/arch/arm/include/asm/elf.h linux-2.6.32.39/arch/arm/include/asm/elf.h |
916 |
+--- linux-2.6.32.39/arch/arm/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
917 |
++++ linux-2.6.32.39/arch/arm/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
918 |
@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t |
919 |
the loader. We need to make sure that it is out of the way of the program |
920 |
that it will "exec", and that there is sufficient room for the brk. */ |
921 |
@@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.38/arch/arm/include/asm/elf.h linux-2.6.32.38/arch/arm/i |
922 |
|
923 |
/* When the program starts, a1 contains a pointer to a function to be |
924 |
registered with atexit, as per the SVR4 ABI. A value of 0 means we |
925 |
-diff -urNp linux-2.6.32.38/arch/arm/include/asm/kmap_types.h linux-2.6.32.38/arch/arm/include/asm/kmap_types.h |
926 |
---- linux-2.6.32.38/arch/arm/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
927 |
-+++ linux-2.6.32.38/arch/arm/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
928 |
+diff -urNp linux-2.6.32.39/arch/arm/include/asm/kmap_types.h linux-2.6.32.39/arch/arm/include/asm/kmap_types.h |
929 |
+--- linux-2.6.32.39/arch/arm/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
930 |
++++ linux-2.6.32.39/arch/arm/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
931 |
@@ -19,6 +19,7 @@ enum km_type { |
932 |
KM_SOFTIRQ0, |
933 |
KM_SOFTIRQ1, |
934 |
@@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.38/arch/arm/include/asm/kmap_types.h linux-2.6.32.38/arc |
935 |
KM_TYPE_NR |
936 |
}; |
937 |
|
938 |
-diff -urNp linux-2.6.32.38/arch/arm/include/asm/uaccess.h linux-2.6.32.38/arch/arm/include/asm/uaccess.h |
939 |
---- linux-2.6.32.38/arch/arm/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
940 |
-+++ linux-2.6.32.38/arch/arm/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
941 |
+diff -urNp linux-2.6.32.39/arch/arm/include/asm/uaccess.h linux-2.6.32.39/arch/arm/include/asm/uaccess.h |
942 |
+--- linux-2.6.32.39/arch/arm/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
943 |
++++ linux-2.6.32.39/arch/arm/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
944 |
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn |
945 |
|
946 |
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) |
947 |
@@ -294,9 +294,9 @@ diff -urNp linux-2.6.32.38/arch/arm/include/asm/uaccess.h linux-2.6.32.38/arch/a |
948 |
if (access_ok(VERIFY_WRITE, to, n)) |
949 |
n = __copy_to_user(to, from, n); |
950 |
return n; |
951 |
-diff -urNp linux-2.6.32.38/arch/arm/kernel/kgdb.c linux-2.6.32.38/arch/arm/kernel/kgdb.c |
952 |
---- linux-2.6.32.38/arch/arm/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
953 |
-+++ linux-2.6.32.38/arch/arm/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
954 |
+diff -urNp linux-2.6.32.39/arch/arm/kernel/kgdb.c linux-2.6.32.39/arch/arm/kernel/kgdb.c |
955 |
+--- linux-2.6.32.39/arch/arm/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
956 |
++++ linux-2.6.32.39/arch/arm/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
957 |
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void) |
958 |
* and we handle the normal undef case within the do_undefinstr |
959 |
* handler. |
960 |
@@ -306,9 +306,9 @@ diff -urNp linux-2.6.32.38/arch/arm/kernel/kgdb.c linux-2.6.32.38/arch/arm/kerne |
961 |
#ifndef __ARMEB__ |
962 |
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} |
963 |
#else /* ! __ARMEB__ */ |
964 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-at91/pm.c linux-2.6.32.38/arch/arm/mach-at91/pm.c |
965 |
---- linux-2.6.32.38/arch/arm/mach-at91/pm.c 2011-03-27 14:31:47.000000000 -0400 |
966 |
-+++ linux-2.6.32.38/arch/arm/mach-at91/pm.c 2011-04-17 15:56:45.000000000 -0400 |
967 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-at91/pm.c linux-2.6.32.39/arch/arm/mach-at91/pm.c |
968 |
+--- linux-2.6.32.39/arch/arm/mach-at91/pm.c 2011-03-27 14:31:47.000000000 -0400 |
969 |
++++ linux-2.6.32.39/arch/arm/mach-at91/pm.c 2011-04-17 15:56:45.000000000 -0400 |
970 |
@@ -348,7 +348,7 @@ static void at91_pm_end(void) |
971 |
} |
972 |
|
973 |
@@ -318,9 +318,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-at91/pm.c linux-2.6.32.38/arch/arm/mach |
974 |
.valid = at91_pm_valid_state, |
975 |
.begin = at91_pm_begin, |
976 |
.enter = at91_pm_enter, |
977 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-omap1/pm.c linux-2.6.32.38/arch/arm/mach-omap1/pm.c |
978 |
---- linux-2.6.32.38/arch/arm/mach-omap1/pm.c 2011-03-27 14:31:47.000000000 -0400 |
979 |
-+++ linux-2.6.32.38/arch/arm/mach-omap1/pm.c 2011-04-17 15:56:45.000000000 -0400 |
980 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-omap1/pm.c linux-2.6.32.39/arch/arm/mach-omap1/pm.c |
981 |
+--- linux-2.6.32.39/arch/arm/mach-omap1/pm.c 2011-03-27 14:31:47.000000000 -0400 |
982 |
++++ linux-2.6.32.39/arch/arm/mach-omap1/pm.c 2011-04-17 15:56:45.000000000 -0400 |
983 |
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq |
984 |
|
985 |
|
986 |
@@ -330,9 +330,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-omap1/pm.c linux-2.6.32.38/arch/arm/mac |
987 |
.prepare = omap_pm_prepare, |
988 |
.enter = omap_pm_enter, |
989 |
.finish = omap_pm_finish, |
990 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c |
991 |
---- linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c 2011-03-27 14:31:47.000000000 -0400 |
992 |
-+++ linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c 2011-04-17 15:56:45.000000000 -0400 |
993 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c |
994 |
+--- linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c 2011-03-27 14:31:47.000000000 -0400 |
995 |
++++ linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c 2011-04-17 15:56:45.000000000 -0400 |
996 |
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void) |
997 |
enable_hlt(); |
998 |
} |
999 |
@@ -342,9 +342,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.38/arch/arm |
1000 |
.prepare = omap2_pm_prepare, |
1001 |
.enter = omap2_pm_enter, |
1002 |
.finish = omap2_pm_finish, |
1003 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c |
1004 |
---- linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c 2011-03-27 14:31:47.000000000 -0400 |
1005 |
-+++ linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c 2011-04-17 15:56:45.000000000 -0400 |
1006 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c |
1007 |
+--- linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c 2011-03-27 14:31:47.000000000 -0400 |
1008 |
++++ linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c 2011-04-17 15:56:45.000000000 -0400 |
1009 |
@@ -401,7 +401,7 @@ static void omap3_pm_end(void) |
1010 |
return; |
1011 |
} |
1012 |
@@ -354,9 +354,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.38/arch/arm |
1013 |
.begin = omap3_pm_begin, |
1014 |
.end = omap3_pm_end, |
1015 |
.prepare = omap3_pm_prepare, |
1016 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c |
1017 |
---- linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1018 |
-+++ linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1019 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c |
1020 |
+--- linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1021 |
++++ linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1022 |
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat |
1023 |
(state == PM_SUSPEND_MEM); |
1024 |
} |
1025 |
@@ -366,9 +366,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-pnx4008/pm.c linux-2.6.32.38/arch/arm/m |
1026 |
.enter = pnx4008_pm_enter, |
1027 |
.valid = pnx4008_pm_valid, |
1028 |
}; |
1029 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/pm.c linux-2.6.32.38/arch/arm/mach-pxa/pm.c |
1030 |
---- linux-2.6.32.38/arch/arm/mach-pxa/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1031 |
-+++ linux-2.6.32.38/arch/arm/mach-pxa/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1032 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/pm.c linux-2.6.32.39/arch/arm/mach-pxa/pm.c |
1033 |
+--- linux-2.6.32.39/arch/arm/mach-pxa/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1034 |
++++ linux-2.6.32.39/arch/arm/mach-pxa/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1035 |
@@ -95,7 +95,7 @@ void pxa_pm_finish(void) |
1036 |
pxa_cpu_pm_fns->finish(); |
1037 |
} |
1038 |
@@ -378,9 +378,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/pm.c linux-2.6.32.38/arch/arm/mach- |
1039 |
.valid = pxa_pm_valid, |
1040 |
.enter = pxa_pm_enter, |
1041 |
.prepare = pxa_pm_prepare, |
1042 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c |
1043 |
---- linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c 2011-03-27 14:31:47.000000000 -0400 |
1044 |
-+++ linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c 2011-04-17 15:56:45.000000000 -0400 |
1045 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c |
1046 |
+--- linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c 2011-03-27 14:31:47.000000000 -0400 |
1047 |
++++ linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c 2011-04-17 15:56:45.000000000 -0400 |
1048 |
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status |
1049 |
} |
1050 |
|
1051 |
@@ -390,9 +390,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.38/arch/a |
1052 |
.prepare = pxa_pm_prepare, |
1053 |
.finish = pxa_pm_finish, |
1054 |
.enter = corgi_pxa_pm_enter, |
1055 |
-diff -urNp linux-2.6.32.38/arch/arm/mach-sa1100/pm.c linux-2.6.32.38/arch/arm/mach-sa1100/pm.c |
1056 |
---- linux-2.6.32.38/arch/arm/mach-sa1100/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1057 |
-+++ linux-2.6.32.38/arch/arm/mach-sa1100/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1058 |
+diff -urNp linux-2.6.32.39/arch/arm/mach-sa1100/pm.c linux-2.6.32.39/arch/arm/mach-sa1100/pm.c |
1059 |
+--- linux-2.6.32.39/arch/arm/mach-sa1100/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1060 |
++++ linux-2.6.32.39/arch/arm/mach-sa1100/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1061 |
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) |
1062 |
return virt_to_phys(sp); |
1063 |
} |
1064 |
@@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mach-sa1100/pm.c linux-2.6.32.38/arch/arm/ma |
1065 |
.enter = sa11x0_pm_enter, |
1066 |
.valid = suspend_valid_only_mem, |
1067 |
}; |
1068 |
-diff -urNp linux-2.6.32.38/arch/arm/mm/fault.c linux-2.6.32.38/arch/arm/mm/fault.c |
1069 |
---- linux-2.6.32.38/arch/arm/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1070 |
-+++ linux-2.6.32.38/arch/arm/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1071 |
+diff -urNp linux-2.6.32.39/arch/arm/mm/fault.c linux-2.6.32.39/arch/arm/mm/fault.c |
1072 |
+--- linux-2.6.32.39/arch/arm/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1073 |
++++ linux-2.6.32.39/arch/arm/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1074 |
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, |
1075 |
} |
1076 |
#endif |
1077 |
@@ -453,9 +453,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mm/fault.c linux-2.6.32.38/arch/arm/mm/fault |
1078 |
/* |
1079 |
* First Level Translation Fault Handler |
1080 |
* |
1081 |
-diff -urNp linux-2.6.32.38/arch/arm/mm/mmap.c linux-2.6.32.38/arch/arm/mm/mmap.c |
1082 |
---- linux-2.6.32.38/arch/arm/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
1083 |
-+++ linux-2.6.32.38/arch/arm/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400 |
1084 |
+diff -urNp linux-2.6.32.39/arch/arm/mm/mmap.c linux-2.6.32.39/arch/arm/mm/mmap.c |
1085 |
+--- linux-2.6.32.39/arch/arm/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
1086 |
++++ linux-2.6.32.39/arch/arm/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400 |
1087 |
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp |
1088 |
if (len > TASK_SIZE) |
1089 |
return -ENOMEM; |
1090 |
@@ -505,9 +505,9 @@ diff -urNp linux-2.6.32.38/arch/arm/mm/mmap.c linux-2.6.32.38/arch/arm/mm/mmap.c |
1091 |
/* |
1092 |
* Remember the place where we stopped the search: |
1093 |
*/ |
1094 |
-diff -urNp linux-2.6.32.38/arch/arm/plat-s3c/pm.c linux-2.6.32.38/arch/arm/plat-s3c/pm.c |
1095 |
---- linux-2.6.32.38/arch/arm/plat-s3c/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1096 |
-+++ linux-2.6.32.38/arch/arm/plat-s3c/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1097 |
+diff -urNp linux-2.6.32.39/arch/arm/plat-s3c/pm.c linux-2.6.32.39/arch/arm/plat-s3c/pm.c |
1098 |
+--- linux-2.6.32.39/arch/arm/plat-s3c/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1099 |
++++ linux-2.6.32.39/arch/arm/plat-s3c/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1100 |
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) |
1101 |
s3c_pm_check_cleanup(); |
1102 |
} |
1103 |
@@ -517,9 +517,9 @@ diff -urNp linux-2.6.32.38/arch/arm/plat-s3c/pm.c linux-2.6.32.38/arch/arm/plat- |
1104 |
.enter = s3c_pm_enter, |
1105 |
.prepare = s3c_pm_prepare, |
1106 |
.finish = s3c_pm_finish, |
1107 |
-diff -urNp linux-2.6.32.38/arch/avr32/include/asm/elf.h linux-2.6.32.38/arch/avr32/include/asm/elf.h |
1108 |
---- linux-2.6.32.38/arch/avr32/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1109 |
-+++ linux-2.6.32.38/arch/avr32/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1110 |
+diff -urNp linux-2.6.32.39/arch/avr32/include/asm/elf.h linux-2.6.32.39/arch/avr32/include/asm/elf.h |
1111 |
+--- linux-2.6.32.39/arch/avr32/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1112 |
++++ linux-2.6.32.39/arch/avr32/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1113 |
@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg |
1114 |
the loader. We need to make sure that it is out of the way of the program |
1115 |
that it will "exec", and that there is sufficient room for the brk. */ |
1116 |
@@ -536,9 +536,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/include/asm/elf.h linux-2.6.32.38/arch/avr |
1117 |
|
1118 |
/* This yields a mask that user programs can use to figure out what |
1119 |
instruction set this CPU supports. This could be done in user space, |
1120 |
-diff -urNp linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h |
1121 |
---- linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
1122 |
-+++ linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
1123 |
+diff -urNp linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h |
1124 |
+--- linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
1125 |
++++ linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
1126 |
@@ -22,7 +22,8 @@ D(10) KM_IRQ0, |
1127 |
D(11) KM_IRQ1, |
1128 |
D(12) KM_SOFTIRQ0, |
1129 |
@@ -549,9 +549,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/include/asm/kmap_types.h linux-2.6.32.38/a |
1130 |
}; |
1131 |
|
1132 |
#undef D |
1133 |
-diff -urNp linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c |
1134 |
---- linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1135 |
-+++ linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1136 |
+diff -urNp linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c |
1137 |
+--- linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1138 |
++++ linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1139 |
@@ -176,7 +176,7 @@ out: |
1140 |
return 0; |
1141 |
} |
1142 |
@@ -561,9 +561,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/mach-at32ap/pm.c linux-2.6.32.38/arch/avr3 |
1143 |
.valid = avr32_pm_valid_state, |
1144 |
.enter = avr32_pm_enter, |
1145 |
}; |
1146 |
-diff -urNp linux-2.6.32.38/arch/avr32/mm/fault.c linux-2.6.32.38/arch/avr32/mm/fault.c |
1147 |
---- linux-2.6.32.38/arch/avr32/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1148 |
-+++ linux-2.6.32.38/arch/avr32/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1149 |
+diff -urNp linux-2.6.32.39/arch/avr32/mm/fault.c linux-2.6.32.39/arch/avr32/mm/fault.c |
1150 |
+--- linux-2.6.32.39/arch/avr32/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1151 |
++++ linux-2.6.32.39/arch/avr32/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1152 |
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru |
1153 |
|
1154 |
int exception_trace = 1; |
1155 |
@@ -605,9 +605,9 @@ diff -urNp linux-2.6.32.38/arch/avr32/mm/fault.c linux-2.6.32.38/arch/avr32/mm/f |
1156 |
if (exception_trace && printk_ratelimit()) |
1157 |
printk("%s%s[%d]: segfault at %08lx pc %08lx " |
1158 |
"sp %08lx ecr %lu\n", |
1159 |
-diff -urNp linux-2.6.32.38/arch/blackfin/kernel/kgdb.c linux-2.6.32.38/arch/blackfin/kernel/kgdb.c |
1160 |
---- linux-2.6.32.38/arch/blackfin/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
1161 |
-+++ linux-2.6.32.38/arch/blackfin/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
1162 |
+diff -urNp linux-2.6.32.39/arch/blackfin/kernel/kgdb.c linux-2.6.32.39/arch/blackfin/kernel/kgdb.c |
1163 |
+--- linux-2.6.32.39/arch/blackfin/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
1164 |
++++ linux-2.6.32.39/arch/blackfin/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
1165 |
@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto |
1166 |
return -1; /* this means that we do not want to exit from the handler */ |
1167 |
} |
1168 |
@@ -617,9 +617,9 @@ diff -urNp linux-2.6.32.38/arch/blackfin/kernel/kgdb.c linux-2.6.32.38/arch/blac |
1169 |
.gdb_bpt_instr = {0xa1}, |
1170 |
#ifdef CONFIG_SMP |
1171 |
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, |
1172 |
-diff -urNp linux-2.6.32.38/arch/blackfin/mach-common/pm.c linux-2.6.32.38/arch/blackfin/mach-common/pm.c |
1173 |
---- linux-2.6.32.38/arch/blackfin/mach-common/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1174 |
-+++ linux-2.6.32.38/arch/blackfin/mach-common/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1175 |
+diff -urNp linux-2.6.32.39/arch/blackfin/mach-common/pm.c linux-2.6.32.39/arch/blackfin/mach-common/pm.c |
1176 |
+--- linux-2.6.32.39/arch/blackfin/mach-common/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1177 |
++++ linux-2.6.32.39/arch/blackfin/mach-common/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1178 |
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t |
1179 |
return 0; |
1180 |
} |
1181 |
@@ -629,9 +629,9 @@ diff -urNp linux-2.6.32.38/arch/blackfin/mach-common/pm.c linux-2.6.32.38/arch/b |
1182 |
.enter = bfin_pm_enter, |
1183 |
.valid = bfin_pm_valid, |
1184 |
}; |
1185 |
-diff -urNp linux-2.6.32.38/arch/frv/include/asm/kmap_types.h linux-2.6.32.38/arch/frv/include/asm/kmap_types.h |
1186 |
---- linux-2.6.32.38/arch/frv/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
1187 |
-+++ linux-2.6.32.38/arch/frv/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
1188 |
+diff -urNp linux-2.6.32.39/arch/frv/include/asm/kmap_types.h linux-2.6.32.39/arch/frv/include/asm/kmap_types.h |
1189 |
+--- linux-2.6.32.39/arch/frv/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
1190 |
++++ linux-2.6.32.39/arch/frv/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
1191 |
@@ -23,6 +23,7 @@ enum km_type { |
1192 |
KM_IRQ1, |
1193 |
KM_SOFTIRQ0, |
1194 |
@@ -640,9 +640,9 @@ diff -urNp linux-2.6.32.38/arch/frv/include/asm/kmap_types.h linux-2.6.32.38/arc |
1195 |
KM_TYPE_NR |
1196 |
}; |
1197 |
|
1198 |
-diff -urNp linux-2.6.32.38/arch/frv/mm/elf-fdpic.c linux-2.6.32.38/arch/frv/mm/elf-fdpic.c |
1199 |
---- linux-2.6.32.38/arch/frv/mm/elf-fdpic.c 2011-03-27 14:31:47.000000000 -0400 |
1200 |
-+++ linux-2.6.32.38/arch/frv/mm/elf-fdpic.c 2011-04-17 15:56:45.000000000 -0400 |
1201 |
+diff -urNp linux-2.6.32.39/arch/frv/mm/elf-fdpic.c linux-2.6.32.39/arch/frv/mm/elf-fdpic.c |
1202 |
+--- linux-2.6.32.39/arch/frv/mm/elf-fdpic.c 2011-03-27 14:31:47.000000000 -0400 |
1203 |
++++ linux-2.6.32.39/arch/frv/mm/elf-fdpic.c 2011-04-17 15:56:45.000000000 -0400 |
1204 |
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str |
1205 |
if (addr) { |
1206 |
addr = PAGE_ALIGN(addr); |
1207 |
@@ -671,9 +671,9 @@ diff -urNp linux-2.6.32.38/arch/frv/mm/elf-fdpic.c linux-2.6.32.38/arch/frv/mm/e |
1208 |
goto success; |
1209 |
addr = vma->vm_end; |
1210 |
} |
1211 |
-diff -urNp linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c |
1212 |
---- linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c 2011-03-27 14:31:47.000000000 -0400 |
1213 |
-+++ linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:56:45.000000000 -0400 |
1214 |
+diff -urNp linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c |
1215 |
+--- linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c 2011-03-27 14:31:47.000000000 -0400 |
1216 |
++++ linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:56:45.000000000 -0400 |
1217 |
@@ -17,7 +17,7 @@ |
1218 |
#include <linux/swiotlb.h> |
1219 |
#include <asm/machvec.h> |
1220 |
@@ -692,9 +692,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.38/arch |
1221 |
{ |
1222 |
if (use_swiotlb(dev)) |
1223 |
return &swiotlb_dma_ops; |
1224 |
-diff -urNp linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c |
1225 |
---- linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c 2011-03-27 14:31:47.000000000 -0400 |
1226 |
-+++ linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:56:45.000000000 -0400 |
1227 |
+diff -urNp linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c |
1228 |
+--- linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c 2011-03-27 14:31:47.000000000 -0400 |
1229 |
++++ linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:56:45.000000000 -0400 |
1230 |
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d |
1231 |
}, |
1232 |
}; |
1233 |
@@ -713,9 +713,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.38/arch/ |
1234 |
.alloc_coherent = sba_alloc_coherent, |
1235 |
.free_coherent = sba_free_coherent, |
1236 |
.map_page = sba_map_page, |
1237 |
-diff -urNp linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c |
1238 |
---- linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c 2011-03-27 14:31:47.000000000 -0400 |
1239 |
-+++ linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c 2011-04-17 15:56:45.000000000 -0400 |
1240 |
+diff -urNp linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c |
1241 |
+--- linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c 2011-03-27 14:31:47.000000000 -0400 |
1242 |
++++ linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c 2011-04-17 15:56:45.000000000 -0400 |
1243 |
@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ |
1244 |
|
1245 |
#define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) |
1246 |
@@ -730,9 +730,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.38/arch/ia |
1247 |
/* Ugly but avoids duplication */ |
1248 |
#include "../../../fs/binfmt_elf.c" |
1249 |
|
1250 |
-diff -urNp linux-2.6.32.38/arch/ia64/ia32/ia32priv.h linux-2.6.32.38/arch/ia64/ia32/ia32priv.h |
1251 |
---- linux-2.6.32.38/arch/ia64/ia32/ia32priv.h 2011-03-27 14:31:47.000000000 -0400 |
1252 |
-+++ linux-2.6.32.38/arch/ia64/ia32/ia32priv.h 2011-04-17 15:56:45.000000000 -0400 |
1253 |
+diff -urNp linux-2.6.32.39/arch/ia64/ia32/ia32priv.h linux-2.6.32.39/arch/ia64/ia32/ia32priv.h |
1254 |
+--- linux-2.6.32.39/arch/ia64/ia32/ia32priv.h 2011-03-27 14:31:47.000000000 -0400 |
1255 |
++++ linux-2.6.32.39/arch/ia64/ia32/ia32priv.h 2011-04-17 15:56:45.000000000 -0400 |
1256 |
@@ -296,7 +296,14 @@ typedef struct compat_siginfo { |
1257 |
#define ELF_DATA ELFDATA2LSB |
1258 |
#define ELF_ARCH EM_386 |
1259 |
@@ -749,9 +749,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/ia32/ia32priv.h linux-2.6.32.38/arch/ia64/i |
1260 |
#define IA32_GATE_OFFSET IA32_PAGE_OFFSET |
1261 |
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE |
1262 |
|
1263 |
-diff -urNp linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h |
1264 |
---- linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
1265 |
-+++ linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400 |
1266 |
+diff -urNp linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h |
1267 |
+--- linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
1268 |
++++ linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400 |
1269 |
@@ -12,7 +12,7 @@ |
1270 |
|
1271 |
#define ARCH_HAS_DMA_GET_REQUIRED_MASK |
1272 |
@@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.38/a |
1273 |
return ops->dma_supported(dev, mask); |
1274 |
} |
1275 |
|
1276 |
-diff -urNp linux-2.6.32.38/arch/ia64/include/asm/elf.h linux-2.6.32.38/arch/ia64/include/asm/elf.h |
1277 |
---- linux-2.6.32.38/arch/ia64/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1278 |
-+++ linux-2.6.32.38/arch/ia64/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1279 |
+diff -urNp linux-2.6.32.39/arch/ia64/include/asm/elf.h linux-2.6.32.39/arch/ia64/include/asm/elf.h |
1280 |
+--- linux-2.6.32.39/arch/ia64/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1281 |
++++ linux-2.6.32.39/arch/ia64/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1282 |
@@ -43,6 +43,13 @@ |
1283 |
*/ |
1284 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) |
1285 |
@@ -812,9 +812,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/elf.h linux-2.6.32.38/arch/ia64 |
1286 |
#define PT_IA_64_UNWIND 0x70000001 |
1287 |
|
1288 |
/* IA-64 relocations: */ |
1289 |
-diff -urNp linux-2.6.32.38/arch/ia64/include/asm/machvec.h linux-2.6.32.38/arch/ia64/include/asm/machvec.h |
1290 |
---- linux-2.6.32.38/arch/ia64/include/asm/machvec.h 2011-03-27 14:31:47.000000000 -0400 |
1291 |
-+++ linux-2.6.32.38/arch/ia64/include/asm/machvec.h 2011-04-17 15:56:45.000000000 -0400 |
1292 |
+diff -urNp linux-2.6.32.39/arch/ia64/include/asm/machvec.h linux-2.6.32.39/arch/ia64/include/asm/machvec.h |
1293 |
+--- linux-2.6.32.39/arch/ia64/include/asm/machvec.h 2011-03-27 14:31:47.000000000 -0400 |
1294 |
++++ linux-2.6.32.39/arch/ia64/include/asm/machvec.h 2011-04-17 15:56:45.000000000 -0400 |
1295 |
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event |
1296 |
/* DMA-mapping interface: */ |
1297 |
typedef void ia64_mv_dma_init (void); |
1298 |
@@ -833,9 +833,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/machvec.h linux-2.6.32.38/arch/ |
1299 |
|
1300 |
/* |
1301 |
* Define default versions so we can extend machvec for new platforms without having |
1302 |
-diff -urNp linux-2.6.32.38/arch/ia64/include/asm/pgtable.h linux-2.6.32.38/arch/ia64/include/asm/pgtable.h |
1303 |
---- linux-2.6.32.38/arch/ia64/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
1304 |
-+++ linux-2.6.32.38/arch/ia64/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
1305 |
+diff -urNp linux-2.6.32.39/arch/ia64/include/asm/pgtable.h linux-2.6.32.39/arch/ia64/include/asm/pgtable.h |
1306 |
+--- linux-2.6.32.39/arch/ia64/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
1307 |
++++ linux-2.6.32.39/arch/ia64/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
1308 |
@@ -12,7 +12,7 @@ |
1309 |
* David Mosberger-Tang <davidm@××××××.com> |
1310 |
*/ |
1311 |
@@ -863,9 +863,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/pgtable.h linux-2.6.32.38/arch/ |
1312 |
#define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) |
1313 |
#define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) |
1314 |
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) |
1315 |
-diff -urNp linux-2.6.32.38/arch/ia64/include/asm/spinlock.h linux-2.6.32.38/arch/ia64/include/asm/spinlock.h |
1316 |
---- linux-2.6.32.38/arch/ia64/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400 |
1317 |
-+++ linux-2.6.32.38/arch/ia64/include/asm/spinlock.h 2011-04-17 15:56:45.000000000 -0400 |
1318 |
+diff -urNp linux-2.6.32.39/arch/ia64/include/asm/spinlock.h linux-2.6.32.39/arch/ia64/include/asm/spinlock.h |
1319 |
+--- linux-2.6.32.39/arch/ia64/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400 |
1320 |
++++ linux-2.6.32.39/arch/ia64/include/asm/spinlock.h 2011-04-17 15:56:45.000000000 -0400 |
1321 |
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi |
1322 |
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp; |
1323 |
|
1324 |
@@ -875,9 +875,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/spinlock.h linux-2.6.32.38/arch |
1325 |
} |
1326 |
|
1327 |
static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock) |
1328 |
-diff -urNp linux-2.6.32.38/arch/ia64/include/asm/uaccess.h linux-2.6.32.38/arch/ia64/include/asm/uaccess.h |
1329 |
---- linux-2.6.32.38/arch/ia64/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
1330 |
-+++ linux-2.6.32.38/arch/ia64/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
1331 |
+diff -urNp linux-2.6.32.39/arch/ia64/include/asm/uaccess.h linux-2.6.32.39/arch/ia64/include/asm/uaccess.h |
1332 |
+--- linux-2.6.32.39/arch/ia64/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
1333 |
++++ linux-2.6.32.39/arch/ia64/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
1334 |
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ |
1335 |
const void *__cu_from = (from); \ |
1336 |
long __cu_len = (n); \ |
1337 |
@@ -896,9 +896,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/include/asm/uaccess.h linux-2.6.32.38/arch/ |
1338 |
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ |
1339 |
__cu_len; \ |
1340 |
}) |
1341 |
-diff -urNp linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c |
1342 |
---- linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c 2011-03-27 14:31:47.000000000 -0400 |
1343 |
-+++ linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:56:45.000000000 -0400 |
1344 |
+diff -urNp linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c |
1345 |
+--- linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c 2011-03-27 14:31:47.000000000 -0400 |
1346 |
++++ linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:56:45.000000000 -0400 |
1347 |
@@ -3,7 +3,7 @@ |
1348 |
/* Set this to 1 if there is a HW IOMMU in the system */ |
1349 |
int iommu_detected __read_mostly; |
1350 |
@@ -917,9 +917,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/dma-mapping.c linux-2.6.32.38/arch/i |
1351 |
{ |
1352 |
return dma_ops; |
1353 |
} |
1354 |
-diff -urNp linux-2.6.32.38/arch/ia64/kernel/module.c linux-2.6.32.38/arch/ia64/kernel/module.c |
1355 |
---- linux-2.6.32.38/arch/ia64/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
1356 |
-+++ linux-2.6.32.38/arch/ia64/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
1357 |
+diff -urNp linux-2.6.32.39/arch/ia64/kernel/module.c linux-2.6.32.39/arch/ia64/kernel/module.c |
1358 |
+--- linux-2.6.32.39/arch/ia64/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
1359 |
++++ linux-2.6.32.39/arch/ia64/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
1360 |
@@ -315,8 +315,7 @@ module_alloc (unsigned long size) |
1361 |
void |
1362 |
module_free (struct module *mod, void *module_region) |
1363 |
@@ -1008,9 +1008,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/module.c linux-2.6.32.38/arch/ia64/k |
1364 |
mod->arch.gp = gp; |
1365 |
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); |
1366 |
} |
1367 |
-diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-dma.c linux-2.6.32.38/arch/ia64/kernel/pci-dma.c |
1368 |
---- linux-2.6.32.38/arch/ia64/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400 |
1369 |
-+++ linux-2.6.32.38/arch/ia64/kernel/pci-dma.c 2011-04-17 15:56:45.000000000 -0400 |
1370 |
+diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-dma.c linux-2.6.32.39/arch/ia64/kernel/pci-dma.c |
1371 |
+--- linux-2.6.32.39/arch/ia64/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400 |
1372 |
++++ linux-2.6.32.39/arch/ia64/kernel/pci-dma.c 2011-04-17 15:56:45.000000000 -0400 |
1373 |
@@ -43,7 +43,7 @@ struct device fallback_dev = { |
1374 |
.dma_mask = &fallback_dev.coherent_dma_mask, |
1375 |
}; |
1376 |
@@ -1062,9 +1062,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-dma.c linux-2.6.32.38/arch/ia64/ |
1377 |
|
1378 |
/* |
1379 |
* The order of these functions is important for |
1380 |
-diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c |
1381 |
---- linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 |
1382 |
-+++ linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:56:45.000000000 -0400 |
1383 |
+diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c |
1384 |
+--- linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 |
1385 |
++++ linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:56:45.000000000 -0400 |
1386 |
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent |
1387 |
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); |
1388 |
} |
1389 |
@@ -1074,9 +1074,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.38/arch/i |
1390 |
.alloc_coherent = ia64_swiotlb_alloc_coherent, |
1391 |
.free_coherent = swiotlb_free_coherent, |
1392 |
.map_page = swiotlb_map_page, |
1393 |
-diff -urNp linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c |
1394 |
---- linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c 2011-03-27 14:31:47.000000000 -0400 |
1395 |
-+++ linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:56:45.000000000 -0400 |
1396 |
+diff -urNp linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c |
1397 |
+--- linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c 2011-03-27 14:31:47.000000000 -0400 |
1398 |
++++ linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:56:45.000000000 -0400 |
1399 |
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil |
1400 |
if (REGION_NUMBER(addr) == RGN_HPAGE) |
1401 |
addr = 0; |
1402 |
@@ -1109,9 +1109,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/sys_ia64.c linux-2.6.32.38/arch/ia64 |
1403 |
/* Remember the address where we stopped this search: */ |
1404 |
mm->free_area_cache = addr + len; |
1405 |
return addr; |
1406 |
-diff -urNp linux-2.6.32.38/arch/ia64/kernel/topology.c linux-2.6.32.38/arch/ia64/kernel/topology.c |
1407 |
---- linux-2.6.32.38/arch/ia64/kernel/topology.c 2011-03-27 14:31:47.000000000 -0400 |
1408 |
-+++ linux-2.6.32.38/arch/ia64/kernel/topology.c 2011-04-17 15:56:45.000000000 -0400 |
1409 |
+diff -urNp linux-2.6.32.39/arch/ia64/kernel/topology.c linux-2.6.32.39/arch/ia64/kernel/topology.c |
1410 |
+--- linux-2.6.32.39/arch/ia64/kernel/topology.c 2011-03-27 14:31:47.000000000 -0400 |
1411 |
++++ linux-2.6.32.39/arch/ia64/kernel/topology.c 2011-04-17 15:56:45.000000000 -0400 |
1412 |
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject |
1413 |
return ret; |
1414 |
} |
1415 |
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/topology.c linux-2.6.32.38/arch/ia64 |
1416 |
.show = cache_show |
1417 |
}; |
1418 |
|
1419 |
-diff -urNp linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S |
1420 |
---- linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400 |
1421 |
-+++ linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:56:45.000000000 -0400 |
1422 |
+diff -urNp linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S |
1423 |
+--- linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400 |
1424 |
++++ linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:56:45.000000000 -0400 |
1425 |
@@ -190,7 +190,7 @@ SECTIONS |
1426 |
/* Per-cpu data: */ |
1427 |
. = ALIGN(PERCPU_PAGE_SIZE); |
1428 |
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.38/arch/i |
1429 |
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits |
1430 |
* into percpu page size |
1431 |
*/ |
1432 |
-diff -urNp linux-2.6.32.38/arch/ia64/mm/fault.c linux-2.6.32.38/arch/ia64/mm/fault.c |
1433 |
---- linux-2.6.32.38/arch/ia64/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1434 |
-+++ linux-2.6.32.38/arch/ia64/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1435 |
+diff -urNp linux-2.6.32.39/arch/ia64/mm/fault.c linux-2.6.32.39/arch/ia64/mm/fault.c |
1436 |
+--- linux-2.6.32.39/arch/ia64/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1437 |
++++ linux-2.6.32.39/arch/ia64/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1438 |
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned |
1439 |
return pte_present(pte); |
1440 |
} |
1441 |
@@ -1185,9 +1185,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/mm/fault.c linux-2.6.32.38/arch/ia64/mm/fau |
1442 |
survive: |
1443 |
/* |
1444 |
* If for any reason at all we couldn't handle the fault, make |
1445 |
-diff -urNp linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c |
1446 |
---- linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 |
1447 |
-+++ linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:56:45.000000000 -0400 |
1448 |
+diff -urNp linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c |
1449 |
+--- linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 |
1450 |
++++ linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:56:45.000000000 -0400 |
1451 |
@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area( |
1452 |
/* At this point: (!vmm || addr < vmm->vm_end). */ |
1453 |
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) |
1454 |
@@ -1197,9 +1197,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/mm/hugetlbpage.c linux-2.6.32.38/arch/ia64/ |
1455 |
return addr; |
1456 |
addr = ALIGN(vmm->vm_end, HPAGE_SIZE); |
1457 |
} |
1458 |
-diff -urNp linux-2.6.32.38/arch/ia64/mm/init.c linux-2.6.32.38/arch/ia64/mm/init.c |
1459 |
---- linux-2.6.32.38/arch/ia64/mm/init.c 2011-03-27 14:31:47.000000000 -0400 |
1460 |
-+++ linux-2.6.32.38/arch/ia64/mm/init.c 2011-04-17 15:56:45.000000000 -0400 |
1461 |
+diff -urNp linux-2.6.32.39/arch/ia64/mm/init.c linux-2.6.32.39/arch/ia64/mm/init.c |
1462 |
+--- linux-2.6.32.39/arch/ia64/mm/init.c 2011-03-27 14:31:47.000000000 -0400 |
1463 |
++++ linux-2.6.32.39/arch/ia64/mm/init.c 2011-04-17 15:56:45.000000000 -0400 |
1464 |
@@ -122,6 +122,19 @@ ia64_init_addr_space (void) |
1465 |
vma->vm_start = current->thread.rbs_bot & PAGE_MASK; |
1466 |
vma->vm_end = vma->vm_start + PAGE_SIZE; |
1467 |
@@ -1220,9 +1220,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/mm/init.c linux-2.6.32.38/arch/ia64/mm/init |
1468 |
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
1469 |
down_write(¤t->mm->mmap_sem); |
1470 |
if (insert_vm_struct(current->mm, vma)) { |
1471 |
-diff -urNp linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c |
1472 |
---- linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c 2011-03-27 14:31:47.000000000 -0400 |
1473 |
-+++ linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:56:45.000000000 -0400 |
1474 |
+diff -urNp linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c |
1475 |
+--- linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c 2011-03-27 14:31:47.000000000 -0400 |
1476 |
++++ linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:56:45.000000000 -0400 |
1477 |
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * |
1478 |
return ret; |
1479 |
} |
1480 |
@@ -1232,9 +1232,9 @@ diff -urNp linux-2.6.32.38/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.38/arch/ia64/ |
1481 |
.alloc_coherent = sn_dma_alloc_coherent, |
1482 |
.free_coherent = sn_dma_free_coherent, |
1483 |
.map_page = sn_dma_map_page, |
1484 |
-diff -urNp linux-2.6.32.38/arch/m32r/lib/usercopy.c linux-2.6.32.38/arch/m32r/lib/usercopy.c |
1485 |
---- linux-2.6.32.38/arch/m32r/lib/usercopy.c 2011-03-27 14:31:47.000000000 -0400 |
1486 |
-+++ linux-2.6.32.38/arch/m32r/lib/usercopy.c 2011-04-17 15:56:45.000000000 -0400 |
1487 |
+diff -urNp linux-2.6.32.39/arch/m32r/lib/usercopy.c linux-2.6.32.39/arch/m32r/lib/usercopy.c |
1488 |
+--- linux-2.6.32.39/arch/m32r/lib/usercopy.c 2011-03-27 14:31:47.000000000 -0400 |
1489 |
++++ linux-2.6.32.39/arch/m32r/lib/usercopy.c 2011-04-17 15:56:45.000000000 -0400 |
1490 |
@@ -14,6 +14,9 @@ |
1491 |
unsigned long |
1492 |
__generic_copy_to_user(void __user *to, const void *from, unsigned long n) |
1493 |
@@ -1255,9 +1255,9 @@ diff -urNp linux-2.6.32.38/arch/m32r/lib/usercopy.c linux-2.6.32.38/arch/m32r/li |
1494 |
prefetchw(to); |
1495 |
if (access_ok(VERIFY_READ, from, n)) |
1496 |
__copy_user_zeroing(to,from,n); |
1497 |
-diff -urNp linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c |
1498 |
---- linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1499 |
-+++ linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1500 |
+diff -urNp linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c |
1501 |
+--- linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c 2011-03-27 14:31:47.000000000 -0400 |
1502 |
++++ linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c 2011-04-17 15:56:45.000000000 -0400 |
1503 |
@@ -78,7 +78,7 @@ static void db1x_pm_end(void) |
1504 |
|
1505 |
} |
1506 |
@@ -1267,9 +1267,9 @@ diff -urNp linux-2.6.32.38/arch/mips/alchemy/devboards/pm.c linux-2.6.32.38/arch |
1507 |
.valid = suspend_valid_only_mem, |
1508 |
.begin = db1x_pm_begin, |
1509 |
.enter = db1x_pm_enter, |
1510 |
-diff -urNp linux-2.6.32.38/arch/mips/include/asm/elf.h linux-2.6.32.38/arch/mips/include/asm/elf.h |
1511 |
---- linux-2.6.32.38/arch/mips/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1512 |
-+++ linux-2.6.32.38/arch/mips/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1513 |
+diff -urNp linux-2.6.32.39/arch/mips/include/asm/elf.h linux-2.6.32.39/arch/mips/include/asm/elf.h |
1514 |
+--- linux-2.6.32.39/arch/mips/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1515 |
++++ linux-2.6.32.39/arch/mips/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1516 |
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str |
1517 |
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) |
1518 |
#endif |
1519 |
@@ -1282,9 +1282,9 @@ diff -urNp linux-2.6.32.38/arch/mips/include/asm/elf.h linux-2.6.32.38/arch/mips |
1520 |
+#endif |
1521 |
+ |
1522 |
#endif /* _ASM_ELF_H */ |
1523 |
-diff -urNp linux-2.6.32.38/arch/mips/include/asm/page.h linux-2.6.32.38/arch/mips/include/asm/page.h |
1524 |
---- linux-2.6.32.38/arch/mips/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 |
1525 |
-+++ linux-2.6.32.38/arch/mips/include/asm/page.h 2011-04-17 15:56:45.000000000 -0400 |
1526 |
+diff -urNp linux-2.6.32.39/arch/mips/include/asm/page.h linux-2.6.32.39/arch/mips/include/asm/page.h |
1527 |
+--- linux-2.6.32.39/arch/mips/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 |
1528 |
++++ linux-2.6.32.39/arch/mips/include/asm/page.h 2011-04-17 15:56:45.000000000 -0400 |
1529 |
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa |
1530 |
#ifdef CONFIG_CPU_MIPS32 |
1531 |
typedef struct { unsigned long pte_low, pte_high; } pte_t; |
1532 |
@@ -1294,9 +1294,9 @@ diff -urNp linux-2.6.32.38/arch/mips/include/asm/page.h linux-2.6.32.38/arch/mip |
1533 |
#else |
1534 |
typedef struct { unsigned long long pte; } pte_t; |
1535 |
#define pte_val(x) ((x).pte) |
1536 |
-diff -urNp linux-2.6.32.38/arch/mips/include/asm/system.h linux-2.6.32.38/arch/mips/include/asm/system.h |
1537 |
---- linux-2.6.32.38/arch/mips/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
1538 |
-+++ linux-2.6.32.38/arch/mips/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 |
1539 |
+diff -urNp linux-2.6.32.39/arch/mips/include/asm/system.h linux-2.6.32.39/arch/mips/include/asm/system.h |
1540 |
+--- linux-2.6.32.39/arch/mips/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
1541 |
++++ linux-2.6.32.39/arch/mips/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 |
1542 |
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); |
1543 |
*/ |
1544 |
#define __ARCH_WANT_UNLOCKED_CTXSW |
1545 |
@@ -1305,9 +1305,9 @@ diff -urNp linux-2.6.32.38/arch/mips/include/asm/system.h linux-2.6.32.38/arch/m |
1546 |
+#define arch_align_stack(x) ((x) & ~0xfUL) |
1547 |
|
1548 |
#endif /* _ASM_SYSTEM_H */ |
1549 |
-diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c |
1550 |
---- linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c 2011-03-27 14:31:47.000000000 -0400 |
1551 |
-+++ linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:56:45.000000000 -0400 |
1552 |
+diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c |
1553 |
+--- linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c 2011-03-27 14:31:47.000000000 -0400 |
1554 |
++++ linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:56:45.000000000 -0400 |
1555 |
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
1556 |
#undef ELF_ET_DYN_BASE |
1557 |
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
1558 |
@@ -1322,9 +1322,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.38/arch |
1559 |
#include <asm/processor.h> |
1560 |
#include <linux/module.h> |
1561 |
#include <linux/elfcore.h> |
1562 |
-diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c |
1563 |
---- linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c 2011-03-27 14:31:47.000000000 -0400 |
1564 |
-+++ linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:56:45.000000000 -0400 |
1565 |
+diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c |
1566 |
+--- linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c 2011-03-27 14:31:47.000000000 -0400 |
1567 |
++++ linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:56:45.000000000 -0400 |
1568 |
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
1569 |
#undef ELF_ET_DYN_BASE |
1570 |
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
1571 |
@@ -1339,9 +1339,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.38/arch |
1572 |
#include <asm/processor.h> |
1573 |
|
1574 |
/* |
1575 |
-diff -urNp linux-2.6.32.38/arch/mips/kernel/kgdb.c linux-2.6.32.38/arch/mips/kernel/kgdb.c |
1576 |
---- linux-2.6.32.38/arch/mips/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
1577 |
-+++ linux-2.6.32.38/arch/mips/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
1578 |
+diff -urNp linux-2.6.32.39/arch/mips/kernel/kgdb.c linux-2.6.32.39/arch/mips/kernel/kgdb.c |
1579 |
+--- linux-2.6.32.39/arch/mips/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
1580 |
++++ linux-2.6.32.39/arch/mips/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
1581 |
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto |
1582 |
return -1; |
1583 |
} |
1584 |
@@ -1350,9 +1350,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/kgdb.c linux-2.6.32.38/arch/mips/ker |
1585 |
struct kgdb_arch arch_kgdb_ops; |
1586 |
|
1587 |
/* |
1588 |
-diff -urNp linux-2.6.32.38/arch/mips/kernel/process.c linux-2.6.32.38/arch/mips/kernel/process.c |
1589 |
---- linux-2.6.32.38/arch/mips/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
1590 |
-+++ linux-2.6.32.38/arch/mips/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 |
1591 |
+diff -urNp linux-2.6.32.39/arch/mips/kernel/process.c linux-2.6.32.39/arch/mips/kernel/process.c |
1592 |
+--- linux-2.6.32.39/arch/mips/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
1593 |
++++ linux-2.6.32.39/arch/mips/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 |
1594 |
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru |
1595 |
out: |
1596 |
return pc; |
1597 |
@@ -1369,9 +1369,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/process.c linux-2.6.32.38/arch/mips/ |
1598 |
- |
1599 |
- return sp & ALMASK; |
1600 |
-} |
1601 |
-diff -urNp linux-2.6.32.38/arch/mips/kernel/syscall.c linux-2.6.32.38/arch/mips/kernel/syscall.c |
1602 |
---- linux-2.6.32.38/arch/mips/kernel/syscall.c 2011-03-27 14:31:47.000000000 -0400 |
1603 |
-+++ linux-2.6.32.38/arch/mips/kernel/syscall.c 2011-04-17 15:56:45.000000000 -0400 |
1604 |
+diff -urNp linux-2.6.32.39/arch/mips/kernel/syscall.c linux-2.6.32.39/arch/mips/kernel/syscall.c |
1605 |
+--- linux-2.6.32.39/arch/mips/kernel/syscall.c 2011-03-27 14:31:47.000000000 -0400 |
1606 |
++++ linux-2.6.32.39/arch/mips/kernel/syscall.c 2011-04-17 15:56:45.000000000 -0400 |
1607 |
@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str |
1608 |
do_color_align = 0; |
1609 |
if (filp || (flags & MAP_SHARED)) |
1610 |
@@ -1406,9 +1406,9 @@ diff -urNp linux-2.6.32.38/arch/mips/kernel/syscall.c linux-2.6.32.38/arch/mips/ |
1611 |
return addr; |
1612 |
addr = vmm->vm_end; |
1613 |
if (do_color_align) |
1614 |
-diff -urNp linux-2.6.32.38/arch/mips/mm/fault.c linux-2.6.32.38/arch/mips/mm/fault.c |
1615 |
---- linux-2.6.32.38/arch/mips/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1616 |
-+++ linux-2.6.32.38/arch/mips/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1617 |
+diff -urNp linux-2.6.32.39/arch/mips/mm/fault.c linux-2.6.32.39/arch/mips/mm/fault.c |
1618 |
+--- linux-2.6.32.39/arch/mips/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1619 |
++++ linux-2.6.32.39/arch/mips/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1620 |
@@ -26,6 +26,23 @@ |
1621 |
#include <asm/ptrace.h> |
1622 |
#include <asm/highmem.h> /* For VMALLOC_END */ |
1623 |
@@ -1433,9 +1433,9 @@ diff -urNp linux-2.6.32.38/arch/mips/mm/fault.c linux-2.6.32.38/arch/mips/mm/fau |
1624 |
/* |
1625 |
* This routine handles page faults. It determines the address, |
1626 |
* and the problem, and then passes it off to one of the appropriate |
1627 |
-diff -urNp linux-2.6.32.38/arch/parisc/include/asm/elf.h linux-2.6.32.38/arch/parisc/include/asm/elf.h |
1628 |
---- linux-2.6.32.38/arch/parisc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1629 |
-+++ linux-2.6.32.38/arch/parisc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1630 |
+diff -urNp linux-2.6.32.39/arch/parisc/include/asm/elf.h linux-2.6.32.39/arch/parisc/include/asm/elf.h |
1631 |
+--- linux-2.6.32.39/arch/parisc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1632 |
++++ linux-2.6.32.39/arch/parisc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1633 |
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. |
1634 |
|
1635 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) |
1636 |
@@ -1450,9 +1450,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/include/asm/elf.h linux-2.6.32.38/arch/pa |
1637 |
/* This yields a mask that user programs can use to figure out what |
1638 |
instruction set this CPU supports. This could be done in user space, |
1639 |
but it's not easy, and we've already done it here. */ |
1640 |
-diff -urNp linux-2.6.32.38/arch/parisc/include/asm/pgtable.h linux-2.6.32.38/arch/parisc/include/asm/pgtable.h |
1641 |
---- linux-2.6.32.38/arch/parisc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
1642 |
-+++ linux-2.6.32.38/arch/parisc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
1643 |
+diff -urNp linux-2.6.32.39/arch/parisc/include/asm/pgtable.h linux-2.6.32.39/arch/parisc/include/asm/pgtable.h |
1644 |
+--- linux-2.6.32.39/arch/parisc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
1645 |
++++ linux-2.6.32.39/arch/parisc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
1646 |
@@ -207,6 +207,17 @@ |
1647 |
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) |
1648 |
#define PAGE_COPY PAGE_EXECREAD |
1649 |
@@ -1471,9 +1471,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/include/asm/pgtable.h linux-2.6.32.38/arc |
1650 |
#define PAGE_KERNEL __pgprot(_PAGE_KERNEL) |
1651 |
#define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) |
1652 |
#define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) |
1653 |
-diff -urNp linux-2.6.32.38/arch/parisc/kernel/module.c linux-2.6.32.38/arch/parisc/kernel/module.c |
1654 |
---- linux-2.6.32.38/arch/parisc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
1655 |
-+++ linux-2.6.32.38/arch/parisc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
1656 |
+diff -urNp linux-2.6.32.39/arch/parisc/kernel/module.c linux-2.6.32.39/arch/parisc/kernel/module.c |
1657 |
+--- linux-2.6.32.39/arch/parisc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
1658 |
++++ linux-2.6.32.39/arch/parisc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
1659 |
@@ -95,16 +95,38 @@ |
1660 |
|
1661 |
/* three functions to determine where in the module core |
1662 |
@@ -1574,9 +1574,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/kernel/module.c linux-2.6.32.38/arch/pari |
1663 |
|
1664 |
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", |
1665 |
me->arch.unwind_section, table, end, gp); |
1666 |
-diff -urNp linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c |
1667 |
---- linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c 2011-03-27 14:31:47.000000000 -0400 |
1668 |
-+++ linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:56:45.000000000 -0400 |
1669 |
+diff -urNp linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c |
1670 |
+--- linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c 2011-03-27 14:31:47.000000000 -0400 |
1671 |
++++ linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:56:45.000000000 -0400 |
1672 |
@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u |
1673 |
/* At this point: (!vma || addr < vma->vm_end). */ |
1674 |
if (TASK_SIZE - len < addr) |
1675 |
@@ -1604,9 +1604,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/kernel/sys_parisc.c linux-2.6.32.38/arch/ |
1676 |
|
1677 |
if (filp) { |
1678 |
addr = get_shared_area(filp->f_mapping, addr, len, pgoff); |
1679 |
-diff -urNp linux-2.6.32.38/arch/parisc/kernel/traps.c linux-2.6.32.38/arch/parisc/kernel/traps.c |
1680 |
---- linux-2.6.32.38/arch/parisc/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 |
1681 |
-+++ linux-2.6.32.38/arch/parisc/kernel/traps.c 2011-04-17 15:56:45.000000000 -0400 |
1682 |
+diff -urNp linux-2.6.32.39/arch/parisc/kernel/traps.c linux-2.6.32.39/arch/parisc/kernel/traps.c |
1683 |
+--- linux-2.6.32.39/arch/parisc/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 |
1684 |
++++ linux-2.6.32.39/arch/parisc/kernel/traps.c 2011-04-17 15:56:45.000000000 -0400 |
1685 |
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod |
1686 |
|
1687 |
down_read(¤t->mm->mmap_sem); |
1688 |
@@ -1618,9 +1618,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/kernel/traps.c linux-2.6.32.38/arch/paris |
1689 |
fault_address = regs->iaoq[0]; |
1690 |
fault_space = regs->iasq[0]; |
1691 |
|
1692 |
-diff -urNp linux-2.6.32.38/arch/parisc/mm/fault.c linux-2.6.32.38/arch/parisc/mm/fault.c |
1693 |
---- linux-2.6.32.38/arch/parisc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1694 |
-+++ linux-2.6.32.38/arch/parisc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1695 |
+diff -urNp linux-2.6.32.39/arch/parisc/mm/fault.c linux-2.6.32.39/arch/parisc/mm/fault.c |
1696 |
+--- linux-2.6.32.39/arch/parisc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
1697 |
++++ linux-2.6.32.39/arch/parisc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
1698 |
@@ -15,6 +15,7 @@ |
1699 |
#include <linux/sched.h> |
1700 |
#include <linux/interrupt.h> |
1701 |
@@ -1790,9 +1790,9 @@ diff -urNp linux-2.6.32.38/arch/parisc/mm/fault.c linux-2.6.32.38/arch/parisc/mm |
1702 |
|
1703 |
/* |
1704 |
* If for any reason at all we couldn't handle the fault, make |
1705 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/device.h linux-2.6.32.38/arch/powerpc/include/asm/device.h |
1706 |
---- linux-2.6.32.38/arch/powerpc/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400 |
1707 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/device.h 2011-04-17 15:56:45.000000000 -0400 |
1708 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/device.h linux-2.6.32.39/arch/powerpc/include/asm/device.h |
1709 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400 |
1710 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/device.h 2011-04-17 15:56:45.000000000 -0400 |
1711 |
@@ -14,7 +14,7 @@ struct dev_archdata { |
1712 |
struct device_node *of_node; |
1713 |
|
1714 |
@@ -1802,9 +1802,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/device.h linux-2.6.32.38/arc |
1715 |
|
1716 |
/* |
1717 |
* When an iommu is in use, dma_data is used as a ptr to the base of the |
1718 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h |
1719 |
---- linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
1720 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400 |
1721 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h |
1722 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
1723 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400 |
1724 |
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma |
1725 |
#ifdef CONFIG_PPC64 |
1726 |
extern struct dma_map_ops dma_iommu_ops; |
1727 |
@@ -1871,9 +1871,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.3 |
1728 |
|
1729 |
if (dma_ops->mapping_error) |
1730 |
return dma_ops->mapping_error(dev, dma_addr); |
1731 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/elf.h linux-2.6.32.38/arch/powerpc/include/asm/elf.h |
1732 |
---- linux-2.6.32.38/arch/powerpc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1733 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1734 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/elf.h linux-2.6.32.39/arch/powerpc/include/asm/elf.h |
1735 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
1736 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
1737 |
@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E |
1738 |
the loader. We need to make sure that it is out of the way of the program |
1739 |
that it will "exec", and that there is sufficient room for the brk. */ |
1740 |
@@ -1906,9 +1906,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/elf.h linux-2.6.32.38/arch/p |
1741 |
#endif /* __KERNEL__ */ |
1742 |
|
1743 |
/* |
1744 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/iommu.h linux-2.6.32.38/arch/powerpc/include/asm/iommu.h |
1745 |
---- linux-2.6.32.38/arch/powerpc/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400 |
1746 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/iommu.h 2011-04-17 15:56:45.000000000 -0400 |
1747 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/iommu.h linux-2.6.32.39/arch/powerpc/include/asm/iommu.h |
1748 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400 |
1749 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/iommu.h 2011-04-17 15:56:45.000000000 -0400 |
1750 |
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi |
1751 |
extern void iommu_init_early_dart(void); |
1752 |
extern void iommu_init_early_pasemi(void); |
1753 |
@@ -1919,9 +1919,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/iommu.h linux-2.6.32.38/arch |
1754 |
#ifdef CONFIG_PCI |
1755 |
extern void pci_iommu_init(void); |
1756 |
extern void pci_direct_iommu_init(void); |
1757 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h |
1758 |
---- linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
1759 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
1760 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h |
1761 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
1762 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 |
1763 |
@@ -26,6 +26,7 @@ enum km_type { |
1764 |
KM_SOFTIRQ1, |
1765 |
KM_PPC_SYNC_PAGE, |
1766 |
@@ -1930,9 +1930,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.38 |
1767 |
KM_TYPE_NR |
1768 |
}; |
1769 |
|
1770 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/page_64.h linux-2.6.32.38/arch/powerpc/include/asm/page_64.h |
1771 |
---- linux-2.6.32.38/arch/powerpc/include/asm/page_64.h 2011-03-27 14:31:47.000000000 -0400 |
1772 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/page_64.h 2011-04-17 15:56:45.000000000 -0400 |
1773 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page_64.h linux-2.6.32.39/arch/powerpc/include/asm/page_64.h |
1774 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/page_64.h 2011-03-27 14:31:47.000000000 -0400 |
1775 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/page_64.h 2011-04-17 15:56:45.000000000 -0400 |
1776 |
@@ -180,15 +180,18 @@ do { \ |
1777 |
* stack by default, so in the absense of a PT_GNU_STACK program header |
1778 |
* we turn execute permission off. |
1779 |
@@ -1954,9 +1954,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/page_64.h linux-2.6.32.38/ar |
1780 |
|
1781 |
#include <asm-generic/getorder.h> |
1782 |
|
1783 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/page.h linux-2.6.32.38/arch/powerpc/include/asm/page.h |
1784 |
---- linux-2.6.32.38/arch/powerpc/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 |
1785 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/page.h 2011-04-17 15:56:45.000000000 -0400 |
1786 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page.h linux-2.6.32.39/arch/powerpc/include/asm/page.h |
1787 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 |
1788 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/page.h 2011-04-17 15:56:45.000000000 -0400 |
1789 |
@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; |
1790 |
* and needs to be executable. This means the whole heap ends |
1791 |
* up being executable. |
1792 |
@@ -1979,9 +1979,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/page.h linux-2.6.32.38/arch/ |
1793 |
#ifndef __ASSEMBLY__ |
1794 |
|
1795 |
#undef STRICT_MM_TYPECHECKS |
1796 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pci.h linux-2.6.32.38/arch/powerpc/include/asm/pci.h |
1797 |
---- linux-2.6.32.38/arch/powerpc/include/asm/pci.h 2011-03-27 14:31:47.000000000 -0400 |
1798 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/pci.h 2011-04-17 15:56:45.000000000 -0400 |
1799 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pci.h linux-2.6.32.39/arch/powerpc/include/asm/pci.h |
1800 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/pci.h 2011-03-27 14:31:47.000000000 -0400 |
1801 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/pci.h 2011-04-17 15:56:45.000000000 -0400 |
1802 |
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq |
1803 |
} |
1804 |
|
1805 |
@@ -1993,9 +1993,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pci.h linux-2.6.32.38/arch/p |
1806 |
#else /* CONFIG_PCI */ |
1807 |
#define set_pci_dma_ops(d) |
1808 |
#define get_pci_dma_ops() NULL |
1809 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h |
1810 |
---- linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
1811 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
1812 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h |
1813 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
1814 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 |
1815 |
@@ -2,6 +2,7 @@ |
1816 |
#define _ASM_POWERPC_PGTABLE_H |
1817 |
#ifdef __KERNEL__ |
1818 |
@@ -2004,9 +2004,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pgtable.h linux-2.6.32.38/ar |
1819 |
#ifndef __ASSEMBLY__ |
1820 |
#include <asm/processor.h> /* For TASK_SIZE */ |
1821 |
#include <asm/mmu.h> |
1822 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h |
1823 |
---- linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h 2011-03-27 14:31:47.000000000 -0400 |
1824 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:56:45.000000000 -0400 |
1825 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h |
1826 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h 2011-03-27 14:31:47.000000000 -0400 |
1827 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:56:45.000000000 -0400 |
1828 |
@@ -21,6 +21,7 @@ |
1829 |
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ |
1830 |
#define _PAGE_USER 0x004 /* usermode access allowed */ |
1831 |
@@ -2015,9 +2015,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.38 |
1832 |
#define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ |
1833 |
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ |
1834 |
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ |
1835 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/reg.h linux-2.6.32.38/arch/powerpc/include/asm/reg.h |
1836 |
---- linux-2.6.32.38/arch/powerpc/include/asm/reg.h 2011-03-27 14:31:47.000000000 -0400 |
1837 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/reg.h 2011-04-17 15:56:45.000000000 -0400 |
1838 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/reg.h linux-2.6.32.39/arch/powerpc/include/asm/reg.h |
1839 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/reg.h 2011-03-27 14:31:47.000000000 -0400 |
1840 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/reg.h 2011-04-17 15:56:45.000000000 -0400 |
1841 |
@@ -191,6 +191,7 @@ |
1842 |
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ |
1843 |
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ |
1844 |
@@ -2026,9 +2026,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/reg.h linux-2.6.32.38/arch/p |
1845 |
#define DSISR_PROTFAULT 0x08000000 /* protection fault */ |
1846 |
#define DSISR_ISSTORE 0x02000000 /* access was a store */ |
1847 |
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ |
1848 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h |
1849 |
---- linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h 2011-03-27 14:31:47.000000000 -0400 |
1850 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:56:45.000000000 -0400 |
1851 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h |
1852 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h 2011-03-27 14:31:47.000000000 -0400 |
1853 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:56:45.000000000 -0400 |
1854 |
@@ -13,7 +13,7 @@ |
1855 |
|
1856 |
#include <linux/swiotlb.h> |
1857 |
@@ -2038,9 +2038,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.38/ar |
1858 |
|
1859 |
static inline void dma_mark_clean(void *addr, size_t size) {} |
1860 |
|
1861 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/system.h linux-2.6.32.38/arch/powerpc/include/asm/system.h |
1862 |
---- linux-2.6.32.38/arch/powerpc/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
1863 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 |
1864 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/system.h linux-2.6.32.39/arch/powerpc/include/asm/system.h |
1865 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
1866 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 |
1867 |
@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi |
1868 |
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) |
1869 |
#endif |
1870 |
@@ -2050,9 +2050,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/system.h linux-2.6.32.38/arc |
1871 |
|
1872 |
/* Used in very early kernel initialization. */ |
1873 |
extern unsigned long reloc_offset(void); |
1874 |
-diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h |
1875 |
---- linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
1876 |
-+++ linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
1877 |
+diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h |
1878 |
+--- linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
1879 |
++++ linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
1880 |
@@ -13,6 +13,8 @@ |
1881 |
#define VERIFY_READ 0 |
1882 |
#define VERIFY_WRITE 1 |
1883 |
@@ -2230,9 +2230,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/include/asm/uaccess.h linux-2.6.32.38/ar |
1884 |
extern unsigned long __clear_user(void __user *addr, unsigned long size); |
1885 |
|
1886 |
static inline unsigned long clear_user(void __user *addr, unsigned long size) |
1887 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c |
1888 |
---- linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c 2011-03-27 14:31:47.000000000 -0400 |
1889 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c 2011-04-17 15:56:45.000000000 -0400 |
1890 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c |
1891 |
+--- linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c 2011-03-27 14:31:47.000000000 -0400 |
1892 |
++++ linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c 2011-04-17 15:56:45.000000000 -0400 |
1893 |
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde |
1894 |
&cache_assoc_attr, |
1895 |
}; |
1896 |
@@ -2242,9 +2242,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.38/arch/ |
1897 |
.show = cache_index_show, |
1898 |
}; |
1899 |
|
1900 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma.c linux-2.6.32.38/arch/powerpc/kernel/dma.c |
1901 |
---- linux-2.6.32.38/arch/powerpc/kernel/dma.c 2011-03-27 14:31:47.000000000 -0400 |
1902 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/dma.c 2011-04-17 15:56:45.000000000 -0400 |
1903 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma.c linux-2.6.32.39/arch/powerpc/kernel/dma.c |
1904 |
+--- linux-2.6.32.39/arch/powerpc/kernel/dma.c 2011-03-27 14:31:47.000000000 -0400 |
1905 |
++++ linux-2.6.32.39/arch/powerpc/kernel/dma.c 2011-04-17 15:56:45.000000000 -0400 |
1906 |
@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl |
1907 |
} |
1908 |
#endif |
1909 |
@@ -2254,9 +2254,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma.c linux-2.6.32.38/arch/powerp |
1910 |
.alloc_coherent = dma_direct_alloc_coherent, |
1911 |
.free_coherent = dma_direct_free_coherent, |
1912 |
.map_sg = dma_direct_map_sg, |
1913 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c |
1914 |
---- linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c 2011-03-27 14:31:47.000000000 -0400 |
1915 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:56:45.000000000 -0400 |
1916 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c |
1917 |
+--- linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c 2011-03-27 14:31:47.000000000 -0400 |
1918 |
++++ linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:56:45.000000000 -0400 |
1919 |
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de |
1920 |
} |
1921 |
|
1922 |
@@ -2266,9 +2266,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.38/arch/ |
1923 |
{ |
1924 |
struct iommu_table *tbl = get_iommu_table_base(dev); |
1925 |
|
1926 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c |
1927 |
---- linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 |
1928 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:56:45.000000000 -0400 |
1929 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c |
1930 |
+--- linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 |
1931 |
++++ linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:56:45.000000000 -0400 |
1932 |
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; |
1933 |
* map_page, and unmap_page on highmem, use normal dma_ops |
1934 |
* for everything else. |
1935 |
@@ -2278,9 +2278,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.38/arc |
1936 |
.alloc_coherent = dma_direct_alloc_coherent, |
1937 |
.free_coherent = dma_direct_free_coherent, |
1938 |
.map_sg = swiotlb_map_sg_attrs, |
1939 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S |
1940 |
---- linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S 2011-03-27 14:31:47.000000000 -0400 |
1941 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:56:45.000000000 -0400 |
1942 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S |
1943 |
+--- linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S 2011-03-27 14:31:47.000000000 -0400 |
1944 |
++++ linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:56:45.000000000 -0400 |
1945 |
@@ -455,6 +455,7 @@ storage_fault_common: |
1946 |
std r14,_DAR(r1) |
1947 |
std r15,_DSISR(r1) |
1948 |
@@ -2299,9 +2299,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.38/ |
1949 |
addi r3,r1,STACK_FRAME_OVERHEAD |
1950 |
ld r4,_DAR(r1) |
1951 |
bl .bad_page_fault |
1952 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S |
1953 |
---- linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S 2011-03-27 14:31:47.000000000 -0400 |
1954 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:56:45.000000000 -0400 |
1955 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S |
1956 |
+--- linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S 2011-03-27 14:31:47.000000000 -0400 |
1957 |
++++ linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:56:45.000000000 -0400 |
1958 |
@@ -818,10 +818,10 @@ handle_page_fault: |
1959 |
11: ld r4,_DAR(r1) |
1960 |
ld r5,_DSISR(r1) |
1961 |
@@ -2314,9 +2314,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.38/ |
1962 |
mr r5,r3 |
1963 |
addi r3,r1,STACK_FRAME_OVERHEAD |
1964 |
lwz r4,_DAR(r1) |
1965 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c |
1966 |
---- linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c 2011-03-27 14:31:47.000000000 -0400 |
1967 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:56:45.000000000 -0400 |
1968 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c |
1969 |
+--- linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c 2011-03-27 14:31:47.000000000 -0400 |
1970 |
++++ linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:56:45.000000000 -0400 |
1971 |
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct |
1972 |
return 1; |
1973 |
} |
1974 |
@@ -2326,9 +2326,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/ibmebus.c linux-2.6.32.38/arch/po |
1975 |
.alloc_coherent = ibmebus_alloc_coherent, |
1976 |
.free_coherent = ibmebus_free_coherent, |
1977 |
.map_sg = ibmebus_map_sg, |
1978 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/kgdb.c linux-2.6.32.38/arch/powerpc/kernel/kgdb.c |
1979 |
---- linux-2.6.32.38/arch/powerpc/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
1980 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
1981 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/kgdb.c linux-2.6.32.39/arch/powerpc/kernel/kgdb.c |
1982 |
+--- linux-2.6.32.39/arch/powerpc/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
1983 |
++++ linux-2.6.32.39/arch/powerpc/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 |
1984 |
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct |
1985 |
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) |
1986 |
return 0; |
1987 |
@@ -2347,9 +2347,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/kgdb.c linux-2.6.32.38/arch/power |
1988 |
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, |
1989 |
}; |
1990 |
|
1991 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/module_32.c linux-2.6.32.38/arch/powerpc/kernel/module_32.c |
1992 |
---- linux-2.6.32.38/arch/powerpc/kernel/module_32.c 2011-03-27 14:31:47.000000000 -0400 |
1993 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/module_32.c 2011-04-17 15:56:45.000000000 -0400 |
1994 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module_32.c linux-2.6.32.39/arch/powerpc/kernel/module_32.c |
1995 |
+--- linux-2.6.32.39/arch/powerpc/kernel/module_32.c 2011-03-27 14:31:47.000000000 -0400 |
1996 |
++++ linux-2.6.32.39/arch/powerpc/kernel/module_32.c 2011-04-17 15:56:45.000000000 -0400 |
1997 |
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr |
1998 |
me->arch.core_plt_section = i; |
1999 |
} |
2000 |
@@ -2379,9 +2379,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/module_32.c linux-2.6.32.38/arch/ |
2001 |
|
2002 |
/* Find this entry, or if that fails, the next avail. entry */ |
2003 |
while (entry->jump[0]) { |
2004 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/module.c linux-2.6.32.38/arch/powerpc/kernel/module.c |
2005 |
---- linux-2.6.32.38/arch/powerpc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
2006 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
2007 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module.c linux-2.6.32.39/arch/powerpc/kernel/module.c |
2008 |
+--- linux-2.6.32.39/arch/powerpc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
2009 |
++++ linux-2.6.32.39/arch/powerpc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
2010 |
@@ -31,11 +31,24 @@ |
2011 |
|
2012 |
LIST_HEAD(module_bug_list); |
2013 |
@@ -2421,9 +2421,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/module.c linux-2.6.32.38/arch/pow |
2014 |
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, |
2015 |
const Elf_Shdr *sechdrs, |
2016 |
const char *name) |
2017 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/pci-common.c linux-2.6.32.38/arch/powerpc/kernel/pci-common.c |
2018 |
---- linux-2.6.32.38/arch/powerpc/kernel/pci-common.c 2011-03-27 14:31:47.000000000 -0400 |
2019 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/pci-common.c 2011-04-17 15:56:45.000000000 -0400 |
2020 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/pci-common.c linux-2.6.32.39/arch/powerpc/kernel/pci-common.c |
2021 |
+--- linux-2.6.32.39/arch/powerpc/kernel/pci-common.c 2011-03-27 14:31:47.000000000 -0400 |
2022 |
++++ linux-2.6.32.39/arch/powerpc/kernel/pci-common.c 2011-04-17 15:56:45.000000000 -0400 |
2023 |
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; |
2024 |
unsigned int ppc_pci_flags = 0; |
2025 |
|
2026 |
@@ -2442,9 +2442,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/pci-common.c linux-2.6.32.38/arch |
2027 |
{ |
2028 |
return pci_dma_ops; |
2029 |
} |
2030 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/process.c linux-2.6.32.38/arch/powerpc/kernel/process.c |
2031 |
---- linux-2.6.32.38/arch/powerpc/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
2032 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 |
2033 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/process.c linux-2.6.32.39/arch/powerpc/kernel/process.c |
2034 |
+--- linux-2.6.32.39/arch/powerpc/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
2035 |
++++ linux-2.6.32.39/arch/powerpc/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 |
2036 |
@@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs) |
2037 |
* Lookup NIP late so we have the best change of getting the |
2038 |
* above info out without failing |
2039 |
@@ -2537,9 +2537,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/process.c linux-2.6.32.38/arch/po |
2040 |
- |
2041 |
- return ret; |
2042 |
-} |
2043 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/signal_32.c linux-2.6.32.38/arch/powerpc/kernel/signal_32.c |
2044 |
---- linux-2.6.32.38/arch/powerpc/kernel/signal_32.c 2011-03-27 14:31:47.000000000 -0400 |
2045 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/signal_32.c 2011-04-17 15:56:45.000000000 -0400 |
2046 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_32.c linux-2.6.32.39/arch/powerpc/kernel/signal_32.c |
2047 |
+--- linux-2.6.32.39/arch/powerpc/kernel/signal_32.c 2011-03-27 14:31:47.000000000 -0400 |
2048 |
++++ linux-2.6.32.39/arch/powerpc/kernel/signal_32.c 2011-04-17 15:56:45.000000000 -0400 |
2049 |
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig |
2050 |
/* Save user registers on the stack */ |
2051 |
frame = &rt_sf->uc.uc_mcontext; |
2052 |
@@ -2549,9 +2549,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/signal_32.c linux-2.6.32.38/arch/ |
2053 |
if (save_user_regs(regs, frame, 0, 1)) |
2054 |
goto badframe; |
2055 |
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; |
2056 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/signal_64.c linux-2.6.32.38/arch/powerpc/kernel/signal_64.c |
2057 |
---- linux-2.6.32.38/arch/powerpc/kernel/signal_64.c 2011-03-27 14:31:47.000000000 -0400 |
2058 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/signal_64.c 2011-04-17 15:56:45.000000000 -0400 |
2059 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_64.c linux-2.6.32.39/arch/powerpc/kernel/signal_64.c |
2060 |
+--- linux-2.6.32.39/arch/powerpc/kernel/signal_64.c 2011-03-27 14:31:47.000000000 -0400 |
2061 |
++++ linux-2.6.32.39/arch/powerpc/kernel/signal_64.c 2011-04-17 15:56:45.000000000 -0400 |
2062 |
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct |
2063 |
current->thread.fpscr.val = 0; |
2064 |
|
2065 |
@@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/signal_64.c linux-2.6.32.38/arch/ |
2066 |
regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; |
2067 |
} else { |
2068 |
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); |
2069 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c |
2070 |
---- linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c 2011-03-27 14:31:47.000000000 -0400 |
2071 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c 2011-04-17 15:56:45.000000000 -0400 |
2072 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c |
2073 |
+--- linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c 2011-03-27 14:31:47.000000000 -0400 |
2074 |
++++ linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c 2011-04-17 15:56:45.000000000 -0400 |
2075 |
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct |
2076 |
if (oldlenp) { |
2077 |
if (!error) { |
2078 |
@@ -2577,9 +2577,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.38/arch/ |
2079 |
} |
2080 |
return error; |
2081 |
} |
2082 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vdso.c linux-2.6.32.38/arch/powerpc/kernel/vdso.c |
2083 |
---- linux-2.6.32.38/arch/powerpc/kernel/vdso.c 2011-03-27 14:31:47.000000000 -0400 |
2084 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/vdso.c 2011-04-17 15:56:45.000000000 -0400 |
2085 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vdso.c linux-2.6.32.39/arch/powerpc/kernel/vdso.c |
2086 |
+--- linux-2.6.32.39/arch/powerpc/kernel/vdso.c 2011-03-27 14:31:47.000000000 -0400 |
2087 |
++++ linux-2.6.32.39/arch/powerpc/kernel/vdso.c 2011-04-17 15:56:45.000000000 -0400 |
2088 |
@@ -36,6 +36,7 @@ |
2089 |
#include <asm/firmware.h> |
2090 |
#include <asm/vdso.h> |
2091 |
@@ -2606,9 +2606,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vdso.c linux-2.6.32.38/arch/power |
2092 |
if (IS_ERR_VALUE(vdso_base)) { |
2093 |
rc = vdso_base; |
2094 |
goto fail_mmapsem; |
2095 |
-diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vio.c linux-2.6.32.38/arch/powerpc/kernel/vio.c |
2096 |
---- linux-2.6.32.38/arch/powerpc/kernel/vio.c 2011-03-27 14:31:47.000000000 -0400 |
2097 |
-+++ linux-2.6.32.38/arch/powerpc/kernel/vio.c 2011-04-17 15:56:45.000000000 -0400 |
2098 |
+diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vio.c linux-2.6.32.39/arch/powerpc/kernel/vio.c |
2099 |
+--- linux-2.6.32.39/arch/powerpc/kernel/vio.c 2011-03-27 14:31:47.000000000 -0400 |
2100 |
++++ linux-2.6.32.39/arch/powerpc/kernel/vio.c 2011-04-17 15:56:45.000000000 -0400 |
2101 |
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc |
2102 |
vio_cmo_dealloc(viodev, alloc_size); |
2103 |
} |
2104 |
@@ -2631,9 +2631,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/kernel/vio.c linux-2.6.32.38/arch/powerp |
2105 |
viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; |
2106 |
} |
2107 |
|
2108 |
-diff -urNp linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c |
2109 |
---- linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400 |
2110 |
-+++ linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:56:45.000000000 -0400 |
2111 |
+diff -urNp linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c |
2112 |
+--- linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400 |
2113 |
++++ linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:56:45.000000000 -0400 |
2114 |
@@ -9,22 +9,6 @@ |
2115 |
#include <linux/module.h> |
2116 |
#include <asm/uaccess.h> |
2117 |
@@ -2665,9 +2665,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/lib/usercopy_64.c linux-2.6.32.38/arch/p |
2118 |
-EXPORT_SYMBOL(copy_to_user); |
2119 |
EXPORT_SYMBOL(copy_in_user); |
2120 |
|
2121 |
-diff -urNp linux-2.6.32.38/arch/powerpc/mm/fault.c linux-2.6.32.38/arch/powerpc/mm/fault.c |
2122 |
---- linux-2.6.32.38/arch/powerpc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
2123 |
-+++ linux-2.6.32.38/arch/powerpc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
2124 |
+diff -urNp linux-2.6.32.39/arch/powerpc/mm/fault.c linux-2.6.32.39/arch/powerpc/mm/fault.c |
2125 |
+--- linux-2.6.32.39/arch/powerpc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
2126 |
++++ linux-2.6.32.39/arch/powerpc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 |
2127 |
@@ -30,6 +30,10 @@ |
2128 |
#include <linux/kprobes.h> |
2129 |
#include <linux/kdebug.h> |
2130 |
@@ -2772,9 +2772,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/mm/fault.c linux-2.6.32.38/arch/powerpc/ |
2131 |
_exception(SIGSEGV, regs, code, address); |
2132 |
return 0; |
2133 |
} |
2134 |
-diff -urNp linux-2.6.32.38/arch/powerpc/mm/mmap_64.c linux-2.6.32.38/arch/powerpc/mm/mmap_64.c |
2135 |
---- linux-2.6.32.38/arch/powerpc/mm/mmap_64.c 2011-03-27 14:31:47.000000000 -0400 |
2136 |
-+++ linux-2.6.32.38/arch/powerpc/mm/mmap_64.c 2011-04-17 15:56:45.000000000 -0400 |
2137 |
+diff -urNp linux-2.6.32.39/arch/powerpc/mm/mmap_64.c linux-2.6.32.39/arch/powerpc/mm/mmap_64.c |
2138 |
+--- linux-2.6.32.39/arch/powerpc/mm/mmap_64.c 2011-03-27 14:31:47.000000000 -0400 |
2139 |
++++ linux-2.6.32.39/arch/powerpc/mm/mmap_64.c 2011-04-17 15:56:45.000000000 -0400 |
2140 |
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str |
2141 |
*/ |
2142 |
if (mmap_is_legacy()) { |
2143 |
@@ -2798,9 +2798,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/mm/mmap_64.c linux-2.6.32.38/arch/powerp |
2144 |
mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
2145 |
mm->unmap_area = arch_unmap_area_topdown; |
2146 |
} |
2147 |
-diff -urNp linux-2.6.32.38/arch/powerpc/mm/slice.c linux-2.6.32.38/arch/powerpc/mm/slice.c |
2148 |
---- linux-2.6.32.38/arch/powerpc/mm/slice.c 2011-03-27 14:31:47.000000000 -0400 |
2149 |
-+++ linux-2.6.32.38/arch/powerpc/mm/slice.c 2011-04-17 15:56:45.000000000 -0400 |
2150 |
+diff -urNp linux-2.6.32.39/arch/powerpc/mm/slice.c linux-2.6.32.39/arch/powerpc/mm/slice.c |
2151 |
+--- linux-2.6.32.39/arch/powerpc/mm/slice.c 2011-03-27 14:31:47.000000000 -0400 |
2152 |
++++ linux-2.6.32.39/arch/powerpc/mm/slice.c 2011-04-17 15:56:45.000000000 -0400 |
2153 |
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ |
2154 |
if ((mm->task_size - len) < addr) |
2155 |
return 0; |
2156 |
@@ -2867,9 +2867,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/mm/slice.c linux-2.6.32.38/arch/powerpc/ |
2157 |
/* If hint, make sure it matches our alignment restrictions */ |
2158 |
if (!fixed && addr) { |
2159 |
addr = _ALIGN_UP(addr, 1ul << pshift); |
2160 |
-diff -urNp linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c |
2161 |
---- linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-03-27 14:31:47.000000000 -0400 |
2162 |
-+++ linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-04-17 15:56:45.000000000 -0400 |
2163 |
+diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c |
2164 |
+--- linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-03-27 14:31:47.000000000 -0400 |
2165 |
++++ linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-04-17 15:56:45.000000000 -0400 |
2166 |
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) |
2167 |
lite5200_pm_target_state = PM_SUSPEND_ON; |
2168 |
} |
2169 |
@@ -2879,9 +2879,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 |
2170 |
.valid = lite5200_pm_valid, |
2171 |
.begin = lite5200_pm_begin, |
2172 |
.prepare = lite5200_pm_prepare, |
2173 |
-diff -urNp linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c |
2174 |
---- linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-03-27 14:31:47.000000000 -0400 |
2175 |
-+++ linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-04-17 15:56:45.000000000 -0400 |
2176 |
+diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c |
2177 |
+--- linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-03-27 14:31:47.000000000 -0400 |
2178 |
++++ linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-04-17 15:56:45.000000000 -0400 |
2179 |
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) |
2180 |
iounmap(mbar); |
2181 |
} |
2182 |
@@ -2891,9 +2891,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 |
2183 |
.valid = mpc52xx_pm_valid, |
2184 |
.prepare = mpc52xx_pm_prepare, |
2185 |
.enter = mpc52xx_pm_enter, |
2186 |
-diff -urNp linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c |
2187 |
---- linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c 2011-03-27 14:31:47.000000000 -0400 |
2188 |
-+++ linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c 2011-04-17 15:56:45.000000000 -0400 |
2189 |
+diff -urNp linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c |
2190 |
+--- linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c 2011-03-27 14:31:47.000000000 -0400 |
2191 |
++++ linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c 2011-04-17 15:56:45.000000000 -0400 |
2192 |
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) |
2193 |
return ret; |
2194 |
} |
2195 |
@@ -2903,9 +2903,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.38 |
2196 |
.valid = mpc83xx_suspend_valid, |
2197 |
.begin = mpc83xx_suspend_begin, |
2198 |
.enter = mpc83xx_suspend_enter, |
2199 |
-diff -urNp linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c |
2200 |
---- linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c 2011-03-27 14:31:47.000000000 -0400 |
2201 |
-+++ linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:56:45.000000000 -0400 |
2202 |
+diff -urNp linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c |
2203 |
+--- linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c 2011-03-27 14:31:47.000000000 -0400 |
2204 |
++++ linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:56:45.000000000 -0400 |
2205 |
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc |
2206 |
|
2207 |
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); |
2208 |
@@ -2915,9 +2915,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.38/a |
2209 |
.alloc_coherent = dma_fixed_alloc_coherent, |
2210 |
.free_coherent = dma_fixed_free_coherent, |
2211 |
.map_sg = dma_fixed_map_sg, |
2212 |
-diff -urNp linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c |
2213 |
---- linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c 2011-03-27 14:31:47.000000000 -0400 |
2214 |
-+++ linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15:56:45.000000000 -0400 |
2215 |
+diff -urNp linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c |
2216 |
+--- linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c 2011-03-27 14:31:47.000000000 -0400 |
2217 |
++++ linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15:56:45.000000000 -0400 |
2218 |
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi |
2219 |
return mask >= DMA_BIT_MASK(32); |
2220 |
} |
2221 |
@@ -2936,9 +2936,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. |
2222 |
.alloc_coherent = ps3_alloc_coherent, |
2223 |
.free_coherent = ps3_free_coherent, |
2224 |
.map_sg = ps3_ioc0_map_sg, |
2225 |
-diff -urNp linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig |
2226 |
---- linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
2227 |
-+++ linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig 2011-04-17 15:56:45.000000000 -0400 |
2228 |
+diff -urNp linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig |
2229 |
+--- linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
2230 |
++++ linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig 2011-04-17 15:56:45.000000000 -0400 |
2231 |
@@ -2,6 +2,8 @@ config PPC_PSERIES |
2232 |
depends on PPC64 && PPC_BOOK3S |
2233 |
bool "IBM pSeries & new (POWER5-based) iSeries" |
2234 |
@@ -2948,9 +2948,9 @@ diff -urNp linux-2.6.32.38/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.3 |
2235 |
select PPC_I8259 |
2236 |
select PPC_RTAS |
2237 |
select RTAS_ERROR_LOGGING |
2238 |
-diff -urNp linux-2.6.32.38/arch/s390/include/asm/elf.h linux-2.6.32.38/arch/s390/include/asm/elf.h |
2239 |
---- linux-2.6.32.38/arch/s390/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
2240 |
-+++ linux-2.6.32.38/arch/s390/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
2241 |
+diff -urNp linux-2.6.32.39/arch/s390/include/asm/elf.h linux-2.6.32.39/arch/s390/include/asm/elf.h |
2242 |
+--- linux-2.6.32.39/arch/s390/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
2243 |
++++ linux-2.6.32.39/arch/s390/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 |
2244 |
@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; |
2245 |
that it will "exec", and that there is sufficient room for the brk. */ |
2246 |
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) |
2247 |
@@ -2965,9 +2965,9 @@ diff -urNp linux-2.6.32.38/arch/s390/include/asm/elf.h linux-2.6.32.38/arch/s390 |
2248 |
/* This yields a mask that user programs can use to figure out what |
2249 |
instruction set this CPU supports. */ |
2250 |
|
2251 |
-diff -urNp linux-2.6.32.38/arch/s390/include/asm/setup.h linux-2.6.32.38/arch/s390/include/asm/setup.h |
2252 |
---- linux-2.6.32.38/arch/s390/include/asm/setup.h 2011-03-27 14:31:47.000000000 -0400 |
2253 |
-+++ linux-2.6.32.38/arch/s390/include/asm/setup.h 2011-04-17 15:56:45.000000000 -0400 |
2254 |
+diff -urNp linux-2.6.32.39/arch/s390/include/asm/setup.h linux-2.6.32.39/arch/s390/include/asm/setup.h |
2255 |
+--- linux-2.6.32.39/arch/s390/include/asm/setup.h 2011-03-27 14:31:47.000000000 -0400 |
2256 |
++++ linux-2.6.32.39/arch/s390/include/asm/setup.h 2011-04-17 15:56:45.000000000 -0400 |
2257 |
@@ -50,13 +50,13 @@ extern unsigned long memory_end; |
2258 |
void detect_memory_layout(struct mem_chunk chunk[]); |
2259 |
|
2260 |
@@ -2984,9 +2984,9 @@ diff -urNp linux-2.6.32.38/arch/s390/include/asm/setup.h linux-2.6.32.38/arch/s3 |
2261 |
#else |
2262 |
#define s390_noexec (0) |
2263 |
#endif |
2264 |
-diff -urNp linux-2.6.32.38/arch/s390/include/asm/uaccess.h linux-2.6.32.38/arch/s390/include/asm/uaccess.h |
2265 |
---- linux-2.6.32.38/arch/s390/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
2266 |
-+++ linux-2.6.32.38/arch/s390/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
2267 |
+diff -urNp linux-2.6.32.39/arch/s390/include/asm/uaccess.h linux-2.6.32.39/arch/s390/include/asm/uaccess.h |
2268 |
+--- linux-2.6.32.39/arch/s390/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
2269 |
++++ linux-2.6.32.39/arch/s390/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 |
2270 |
@@ -232,6 +232,10 @@ static inline unsigned long __must_check |
2271 |
copy_to_user(void __user *to, const void *from, unsigned long n) |
2272 |
{ |
2273 |
@@ -3019,9 +3019,9 @@ diff -urNp linux-2.6.32.38/arch/s390/include/asm/uaccess.h linux-2.6.32.38/arch/ |
2274 |
if (access_ok(VERIFY_READ, from, n)) |
2275 |
n = __copy_from_user(to, from, n); |
2276 |
else |
2277 |
-diff -urNp linux-2.6.32.38/arch/s390/Kconfig linux-2.6.32.38/arch/s390/Kconfig |
2278 |
---- linux-2.6.32.38/arch/s390/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
2279 |
-+++ linux-2.6.32.38/arch/s390/Kconfig 2011-04-17 15:56:45.000000000 -0400 |
2280 |
+diff -urNp linux-2.6.32.39/arch/s390/Kconfig linux-2.6.32.39/arch/s390/Kconfig |
2281 |
+--- linux-2.6.32.39/arch/s390/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
2282 |
++++ linux-2.6.32.39/arch/s390/Kconfig 2011-04-17 15:56:45.000000000 -0400 |
2283 |
@@ -194,28 +194,26 @@ config AUDIT_ARCH |
2284 |
|
2285 |
config S390_SWITCH_AMODE |
2286 |
@@ -3059,9 +3059,9 @@ diff -urNp linux-2.6.32.38/arch/s390/Kconfig linux-2.6.32.38/arch/s390/Kconfig |
2287 |
|
2288 |
comment "Code generation options" |
2289 |
|
2290 |
-diff -urNp linux-2.6.32.38/arch/s390/kernel/module.c linux-2.6.32.38/arch/s390/kernel/module.c |
2291 |
---- linux-2.6.32.38/arch/s390/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
2292 |
-+++ linux-2.6.32.38/arch/s390/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
2293 |
+diff -urNp linux-2.6.32.39/arch/s390/kernel/module.c linux-2.6.32.39/arch/s390/kernel/module.c |
2294 |
+--- linux-2.6.32.39/arch/s390/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
2295 |
++++ linux-2.6.32.39/arch/s390/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 |
2296 |
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, |
2297 |
|
2298 |
/* Increase core size by size of got & plt and set start |
2299 |
@@ -3133,9 +3133,9 @@ diff -urNp linux-2.6.32.38/arch/s390/kernel/module.c linux-2.6.32.38/arch/s390/k |
2300 |
rela->r_addend - loc; |
2301 |
if (r_type == R_390_GOTPC) |
2302 |
*(unsigned int *) loc = val; |
2303 |
-diff -urNp linux-2.6.32.38/arch/s390/kernel/setup.c linux-2.6.32.38/arch/s390/kernel/setup.c |
2304 |
---- linux-2.6.32.38/arch/s390/kernel/setup.c 2011-03-27 14:31:47.000000000 -0400 |
2305 |
-+++ linux-2.6.32.38/arch/s390/kernel/setup.c 2011-04-17 15:56:45.000000000 -0400 |
2306 |
+diff -urNp linux-2.6.32.39/arch/s390/kernel/setup.c linux-2.6.32.39/arch/s390/kernel/setup.c |
2307 |
+--- linux-2.6.32.39/arch/s390/kernel/setup.c 2011-03-27 14:31:47.000000000 -0400 |
2308 |
++++ linux-2.6.32.39/arch/s390/kernel/setup.c 2011-04-17 15:56:45.000000000 -0400 |
2309 |
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * |
2310 |
early_param("mem", early_parse_mem); |
2311 |
|
2312 |
@@ -3189,9 +3189,9 @@ diff -urNp linux-2.6.32.38/arch/s390/kernel/setup.c linux-2.6.32.38/arch/s390/ke |
2313 |
static void setup_addressing_mode(void) |
2314 |
{ |
2315 |
if (s390_noexec) { |
2316 |
-diff -urNp linux-2.6.32.38/arch/s390/mm/mmap.c linux-2.6.32.38/arch/s390/mm/mmap.c |
2317 |
---- linux-2.6.32.38/arch/s390/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
2318 |
-+++ linux-2.6.32.38/arch/s390/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400 |
2319 |
+diff -urNp linux-2.6.32.39/arch/s390/mm/mmap.c linux-2.6.32.39/arch/s390/mm/mmap.c |
2320 |
+--- linux-2.6.32.39/arch/s390/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
2321 |
++++ linux-2.6.32.39/arch/s390/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400 |
2322 |
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str |
2323 |
*/ |
2324 |
if (mmap_is_legacy()) { |
2325 |
@@ -3238,9 +3238,9 @@ diff -urNp linux-2.6.32.38/arch/s390/mm/mmap.c linux-2.6.32.38/arch/s390/mm/mmap |
2326 |
mm->get_unmapped_area = s390_get_unmapped_area_topdown; |
2327 |
mm->unmap_area = arch_unmap_area_topdown; |
2328 |
} |
2329 |
-diff -urNp linux-2.6.32.38/arch/score/include/asm/system.h linux-2.6.32.38/arch/score/include/asm/system.h |
2330 |
---- linux-2.6.32.38/arch/score/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
2331 |
-+++ linux-2.6.32.38/arch/score/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 |
2332 |
+diff -urNp linux-2.6.32.39/arch/score/include/asm/system.h linux-2.6.32.39/arch/score/include/asm/system.h |
2333 |
+--- linux-2.6.32.39/arch/score/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
2334 |
++++ linux-2.6.32.39/arch/score/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 |
2335 |
@@ -17,7 +17,7 @@ do { \ |
2336 |
#define finish_arch_switch(prev) do {} while (0) |
2337 |
|
2338 |
@@ -3250,9 +3250,9 @@ diff -urNp linux-2.6.32.38/arch/score/include/asm/system.h linux-2.6.32.38/arch/ |
2339 |
|
2340 |
#define mb() barrier() |
2341 |
#define rmb() barrier() |
2342 |
-diff -urNp linux-2.6.32.38/arch/score/kernel/process.c linux-2.6.32.38/arch/score/kernel/process.c |
2343 |
---- linux-2.6.32.38/arch/score/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
2344 |
-+++ linux-2.6.32.38/arch/score/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 |
2345 |
+diff -urNp linux-2.6.32.39/arch/score/kernel/process.c linux-2.6.32.39/arch/score/kernel/process.c |
2346 |
+--- linux-2.6.32.39/arch/score/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
2347 |
++++ linux-2.6.32.39/arch/score/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 |
2348 |
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru |
2349 |
|
2350 |
return task_pt_regs(task)->cp0_epc; |
2351 |
@@ -3262,9 +3262,9 @@ diff -urNp linux-2.6.32.38/arch/score/kernel/process.c linux-2.6.32.38/arch/scor |
2352 |
-{ |
2353 |
- return sp; |
2354 |
-} |
2355 |
-diff -urNp linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c |
2356 |
---- linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c 2011-03-27 14:31:47.000000000 -0400 |
2357 |
-+++ linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c 2011-04-17 15:56:45.000000000 -0400 |
2358 |
+diff -urNp linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c |
2359 |
+--- linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c 2011-03-27 14:31:47.000000000 -0400 |
2360 |
++++ linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c 2011-04-17 15:56:45.000000000 -0400 |
2361 |
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ |
2362 |
return 0; |
2363 |
} |
2364 |
@@ -3274,9 +3274,9 @@ diff -urNp linux-2.6.32.38/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.38/arch/s |
2365 |
.enter = hp6x0_pm_enter, |
2366 |
.valid = suspend_valid_only_mem, |
2367 |
}; |
2368 |
-diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c |
2369 |
---- linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c 2011-03-27 14:31:47.000000000 -0400 |
2370 |
-+++ linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c 2011-04-17 15:56:46.000000000 -0400 |
2371 |
+diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c |
2372 |
+--- linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c 2011-03-27 14:31:47.000000000 -0400 |
2373 |
++++ linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c 2011-04-17 15:56:46.000000000 -0400 |
2374 |
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ |
2375 |
NULL, |
2376 |
}; |
2377 |
@@ -3286,9 +3286,9 @@ diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.38/arch/sh/k |
2378 |
.show = sq_sysfs_show, |
2379 |
.store = sq_sysfs_store, |
2380 |
}; |
2381 |
-diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c |
2382 |
---- linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c 2011-03-27 14:31:47.000000000 -0400 |
2383 |
-+++ linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c 2011-04-17 15:56:46.000000000 -0400 |
2384 |
+diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c |
2385 |
+--- linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c 2011-03-27 14:31:47.000000000 -0400 |
2386 |
++++ linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c 2011-04-17 15:56:46.000000000 -0400 |
2387 |
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s |
2388 |
return 0; |
2389 |
} |
2390 |
@@ -3298,9 +3298,9 @@ diff -urNp linux-2.6.32.38/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.38/arch |
2391 |
.enter = sh_pm_enter, |
2392 |
.valid = suspend_valid_only_mem, |
2393 |
}; |
2394 |
-diff -urNp linux-2.6.32.38/arch/sh/kernel/kgdb.c linux-2.6.32.38/arch/sh/kernel/kgdb.c |
2395 |
---- linux-2.6.32.38/arch/sh/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
2396 |
-+++ linux-2.6.32.38/arch/sh/kernel/kgdb.c 2011-04-17 15:56:46.000000000 -0400 |
2397 |
+diff -urNp linux-2.6.32.39/arch/sh/kernel/kgdb.c linux-2.6.32.39/arch/sh/kernel/kgdb.c |
2398 |
+--- linux-2.6.32.39/arch/sh/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
2399 |
++++ linux-2.6.32.39/arch/sh/kernel/kgdb.c 2011-04-17 15:56:46.000000000 -0400 |
2400 |
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) |
2401 |
{ |
2402 |
} |
2403 |
@@ -3310,9 +3310,9 @@ diff -urNp linux-2.6.32.38/arch/sh/kernel/kgdb.c linux-2.6.32.38/arch/sh/kernel/ |
2404 |
/* Breakpoint instruction: trapa #0x3c */ |
2405 |
#ifdef CONFIG_CPU_LITTLE_ENDIAN |
2406 |
.gdb_bpt_instr = { 0x3c, 0xc3 }, |
2407 |
-diff -urNp linux-2.6.32.38/arch/sh/mm/mmap.c linux-2.6.32.38/arch/sh/mm/mmap.c |
2408 |
---- linux-2.6.32.38/arch/sh/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
2409 |
-+++ linux-2.6.32.38/arch/sh/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 |
2410 |
+diff -urNp linux-2.6.32.39/arch/sh/mm/mmap.c linux-2.6.32.39/arch/sh/mm/mmap.c |
2411 |
+--- linux-2.6.32.39/arch/sh/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
2412 |
++++ linux-2.6.32.39/arch/sh/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 |
2413 |
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str |
2414 |
addr = PAGE_ALIGN(addr); |
2415 |
|
2416 |
@@ -3387,9 +3387,9 @@ diff -urNp linux-2.6.32.38/arch/sh/mm/mmap.c linux-2.6.32.38/arch/sh/mm/mmap.c |
2417 |
|
2418 |
bottomup: |
2419 |
/* |
2420 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h |
2421 |
---- linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400 |
2422 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:56:46.000000000 -0400 |
2423 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h |
2424 |
+--- linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400 |
2425 |
++++ linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:56:46.000000000 -0400 |
2426 |
@@ -14,18 +14,40 @@ |
2427 |
#define ATOMIC64_INIT(i) { (i) } |
2428 |
|
2429 |
@@ -3540,9 +3540,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/atomic_64.h linux-2.6.32.38/ar |
2430 |
} |
2431 |
|
2432 |
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) |
2433 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h |
2434 |
---- linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
2435 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 |
2436 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h |
2437 |
+--- linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
2438 |
++++ linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 |
2439 |
@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d |
2440 |
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
2441 |
#define dma_is_consistent(d, h) (1) |
2442 |
@@ -3574,9 +3574,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.38/ |
2443 |
|
2444 |
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); |
2445 |
ops->free_coherent(dev, size, cpu_addr, dma_handle); |
2446 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/elf_32.h linux-2.6.32.38/arch/sparc/include/asm/elf_32.h |
2447 |
---- linux-2.6.32.38/arch/sparc/include/asm/elf_32.h 2011-03-27 14:31:47.000000000 -0400 |
2448 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/elf_32.h 2011-04-17 15:56:46.000000000 -0400 |
2449 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_32.h linux-2.6.32.39/arch/sparc/include/asm/elf_32.h |
2450 |
+--- linux-2.6.32.39/arch/sparc/include/asm/elf_32.h 2011-03-27 14:31:47.000000000 -0400 |
2451 |
++++ linux-2.6.32.39/arch/sparc/include/asm/elf_32.h 2011-04-17 15:56:46.000000000 -0400 |
2452 |
@@ -116,6 +116,13 @@ typedef struct { |
2453 |
|
2454 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) |
2455 |
@@ -3591,9 +3591,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/elf_32.h linux-2.6.32.38/arch/ |
2456 |
/* This yields a mask that user programs can use to figure out what |
2457 |
instruction set this cpu supports. This can NOT be done in userspace |
2458 |
on Sparc. */ |
2459 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/elf_64.h linux-2.6.32.38/arch/sparc/include/asm/elf_64.h |
2460 |
---- linux-2.6.32.38/arch/sparc/include/asm/elf_64.h 2011-03-27 14:31:47.000000000 -0400 |
2461 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/elf_64.h 2011-04-17 15:56:46.000000000 -0400 |
2462 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_64.h linux-2.6.32.39/arch/sparc/include/asm/elf_64.h |
2463 |
+--- linux-2.6.32.39/arch/sparc/include/asm/elf_64.h 2011-03-27 14:31:47.000000000 -0400 |
2464 |
++++ linux-2.6.32.39/arch/sparc/include/asm/elf_64.h 2011-04-17 15:56:46.000000000 -0400 |
2465 |
@@ -163,6 +163,12 @@ typedef struct { |
2466 |
#define ELF_ET_DYN_BASE 0x0000010000000000UL |
2467 |
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL |
2468 |
@@ -3607,9 +3607,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/elf_64.h linux-2.6.32.38/arch/ |
2469 |
|
2470 |
/* This yields a mask that user programs can use to figure out what |
2471 |
instruction set this cpu supports. */ |
2472 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h |
2473 |
---- linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400 |
2474 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400 |
2475 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h |
2476 |
+--- linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400 |
2477 |
++++ linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400 |
2478 |
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) |
2479 |
BTFIXUPDEF_INT(page_none) |
2480 |
BTFIXUPDEF_INT(page_copy) |
2481 |
@@ -3641,9 +3641,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.38/a |
2482 |
extern unsigned long page_kernel; |
2483 |
|
2484 |
#ifdef MODULE |
2485 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h |
2486 |
---- linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h 2011-03-27 14:31:47.000000000 -0400 |
2487 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:56:46.000000000 -0400 |
2488 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h |
2489 |
+--- linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h 2011-03-27 14:31:47.000000000 -0400 |
2490 |
++++ linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:56:46.000000000 -0400 |
2491 |
@@ -115,6 +115,13 @@ |
2492 |
SRMMU_EXEC | SRMMU_REF) |
2493 |
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ |
2494 |
@@ -3658,9 +3658,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.38/arc |
2495 |
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ |
2496 |
SRMMU_DIRTY | SRMMU_REF) |
2497 |
|
2498 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h |
2499 |
---- linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h 2011-03-27 14:31:47.000000000 -0400 |
2500 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:56:46.000000000 -0400 |
2501 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h |
2502 |
+--- linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h 2011-03-27 14:31:47.000000000 -0400 |
2503 |
++++ linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:56:46.000000000 -0400 |
2504 |
@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw |
2505 |
__asm__ __volatile__ ( |
2506 |
"1: ldsw [%2], %0\n" |
2507 |
@@ -3712,9 +3712,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.38/ |
2508 |
" cas [%2], %0, %1\n" |
2509 |
" cmp %0, %1\n" |
2510 |
" bne,pn %%xcc, 1b\n" |
2511 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h |
2512 |
---- linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400 |
2513 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56:46.000000000 -0400 |
2514 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h |
2515 |
+--- linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400 |
2516 |
++++ linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56:46.000000000 -0400 |
2517 |
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ |
2518 |
|
2519 |
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) |
2520 |
@@ -3766,9 +3766,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.38/a |
2521 |
return __copy_user((__force void __user *) to, from, n); |
2522 |
} |
2523 |
|
2524 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h |
2525 |
---- linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400 |
2526 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:56:46.000000000 -0400 |
2527 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h |
2528 |
+--- linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400 |
2529 |
++++ linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:56:46.000000000 -0400 |
2530 |
@@ -9,6 +9,7 @@ |
2531 |
#include <linux/compiler.h> |
2532 |
#include <linux/string.h> |
2533 |
@@ -3811,9 +3811,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.38/a |
2534 |
if (unlikely(ret)) |
2535 |
ret = copy_to_user_fixup(to, from, size); |
2536 |
return ret; |
2537 |
-diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess.h linux-2.6.32.38/arch/sparc/include/asm/uaccess.h |
2538 |
---- linux-2.6.32.38/arch/sparc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
2539 |
-+++ linux-2.6.32.38/arch/sparc/include/asm/uaccess.h 2011-04-17 15:56:46.000000000 -0400 |
2540 |
+diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess.h linux-2.6.32.39/arch/sparc/include/asm/uaccess.h |
2541 |
+--- linux-2.6.32.39/arch/sparc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
2542 |
++++ linux-2.6.32.39/arch/sparc/include/asm/uaccess.h 2011-04-17 15:56:46.000000000 -0400 |
2543 |
@@ -1,5 +1,13 @@ |
2544 |
#ifndef ___ASM_SPARC_UACCESS_H |
2545 |
#define ___ASM_SPARC_UACCESS_H |
2546 |
@@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/include/asm/uaccess.h linux-2.6.32.38/arch |
2547 |
#if defined(__sparc__) && defined(__arch64__) |
2548 |
#include <asm/uaccess_64.h> |
2549 |
#else |
2550 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/iommu.c linux-2.6.32.38/arch/sparc/kernel/iommu.c |
2551 |
---- linux-2.6.32.38/arch/sparc/kernel/iommu.c 2011-03-27 14:31:47.000000000 -0400 |
2552 |
-+++ linux-2.6.32.38/arch/sparc/kernel/iommu.c 2011-04-17 15:56:46.000000000 -0400 |
2553 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/iommu.c linux-2.6.32.39/arch/sparc/kernel/iommu.c |
2554 |
+--- linux-2.6.32.39/arch/sparc/kernel/iommu.c 2011-03-27 14:31:47.000000000 -0400 |
2555 |
++++ linux-2.6.32.39/arch/sparc/kernel/iommu.c 2011-04-17 15:56:46.000000000 -0400 |
2556 |
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc |
2557 |
spin_unlock_irqrestore(&iommu->lock, flags); |
2558 |
} |
2559 |
@@ -3849,9 +3849,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/iommu.c linux-2.6.32.38/arch/sparc/ |
2560 |
EXPORT_SYMBOL(dma_ops); |
2561 |
|
2562 |
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); |
2563 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/ioport.c linux-2.6.32.38/arch/sparc/kernel/ioport.c |
2564 |
---- linux-2.6.32.38/arch/sparc/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400 |
2565 |
-+++ linux-2.6.32.38/arch/sparc/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400 |
2566 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/ioport.c linux-2.6.32.39/arch/sparc/kernel/ioport.c |
2567 |
+--- linux-2.6.32.39/arch/sparc/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400 |
2568 |
++++ linux-2.6.32.39/arch/sparc/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400 |
2569 |
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru |
2570 |
BUG(); |
2571 |
} |
2572 |
@@ -3879,9 +3879,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/ioport.c linux-2.6.32.38/arch/sparc |
2573 |
.alloc_coherent = pci32_alloc_coherent, |
2574 |
.free_coherent = pci32_free_coherent, |
2575 |
.map_page = pci32_map_page, |
2576 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c |
2577 |
---- linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c 2011-03-27 14:31:47.000000000 -0400 |
2578 |
-+++ linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:56:46.000000000 -0400 |
2579 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c |
2580 |
+--- linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c 2011-03-27 14:31:47.000000000 -0400 |
2581 |
++++ linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:56:46.000000000 -0400 |
2582 |
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) |
2583 |
{ |
2584 |
} |
2585 |
@@ -3891,9 +3891,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_32.c linux-2.6.32.38/arch/spar |
2586 |
/* Breakpoint instruction: ta 0x7d */ |
2587 |
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, |
2588 |
}; |
2589 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c |
2590 |
---- linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c 2011-03-27 14:31:47.000000000 -0400 |
2591 |
-+++ linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:56:46.000000000 -0400 |
2592 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c |
2593 |
+--- linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c 2011-03-27 14:31:47.000000000 -0400 |
2594 |
++++ linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:56:46.000000000 -0400 |
2595 |
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) |
2596 |
{ |
2597 |
} |
2598 |
@@ -3903,9 +3903,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/kgdb_64.c linux-2.6.32.38/arch/spar |
2599 |
/* Breakpoint instruction: ta 0x72 */ |
2600 |
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, |
2601 |
}; |
2602 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/Makefile linux-2.6.32.38/arch/sparc/kernel/Makefile |
2603 |
---- linux-2.6.32.38/arch/sparc/kernel/Makefile 2011-03-27 14:31:47.000000000 -0400 |
2604 |
-+++ linux-2.6.32.38/arch/sparc/kernel/Makefile 2011-04-17 15:56:46.000000000 -0400 |
2605 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/Makefile linux-2.6.32.39/arch/sparc/kernel/Makefile |
2606 |
+--- linux-2.6.32.39/arch/sparc/kernel/Makefile 2011-03-27 14:31:47.000000000 -0400 |
2607 |
++++ linux-2.6.32.39/arch/sparc/kernel/Makefile 2011-04-17 15:56:46.000000000 -0400 |
2608 |
@@ -3,7 +3,7 @@ |
2609 |
# |
2610 |
|
2611 |
@@ -3915,9 +3915,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/Makefile linux-2.6.32.38/arch/sparc |
2612 |
|
2613 |
extra-y := head_$(BITS).o |
2614 |
extra-y += init_task.o |
2615 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c |
2616 |
---- linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c 2011-03-27 14:31:47.000000000 -0400 |
2617 |
-+++ linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:56:46.000000000 -0400 |
2618 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c |
2619 |
+--- linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c 2011-03-27 14:31:47.000000000 -0400 |
2620 |
++++ linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:56:46.000000000 -0400 |
2621 |
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic |
2622 |
spin_unlock_irqrestore(&iommu->lock, flags); |
2623 |
} |
2624 |
@@ -3927,9 +3927,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.38/arch/sp |
2625 |
.alloc_coherent = dma_4v_alloc_coherent, |
2626 |
.free_coherent = dma_4v_free_coherent, |
2627 |
.map_page = dma_4v_map_page, |
2628 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/process_32.c linux-2.6.32.38/arch/sparc/kernel/process_32.c |
2629 |
---- linux-2.6.32.38/arch/sparc/kernel/process_32.c 2011-03-27 14:31:47.000000000 -0400 |
2630 |
-+++ linux-2.6.32.38/arch/sparc/kernel/process_32.c 2011-04-17 15:56:46.000000000 -0400 |
2631 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_32.c linux-2.6.32.39/arch/sparc/kernel/process_32.c |
2632 |
+--- linux-2.6.32.39/arch/sparc/kernel/process_32.c 2011-03-27 14:31:47.000000000 -0400 |
2633 |
++++ linux-2.6.32.39/arch/sparc/kernel/process_32.c 2011-04-17 15:56:46.000000000 -0400 |
2634 |
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) |
2635 |
rw->ins[4], rw->ins[5], |
2636 |
rw->ins[6], |
2637 |
@@ -3965,9 +3965,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/process_32.c linux-2.6.32.38/arch/s |
2638 |
fp = rw->ins[6]; |
2639 |
} while (++count < 16); |
2640 |
printk("\n"); |
2641 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/process_64.c linux-2.6.32.38/arch/sparc/kernel/process_64.c |
2642 |
---- linux-2.6.32.38/arch/sparc/kernel/process_64.c 2011-03-27 14:31:47.000000000 -0400 |
2643 |
-+++ linux-2.6.32.38/arch/sparc/kernel/process_64.c 2011-04-17 15:56:46.000000000 -0400 |
2644 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_64.c linux-2.6.32.39/arch/sparc/kernel/process_64.c |
2645 |
+--- linux-2.6.32.39/arch/sparc/kernel/process_64.c 2011-03-27 14:31:47.000000000 -0400 |
2646 |
++++ linux-2.6.32.39/arch/sparc/kernel/process_64.c 2011-04-17 15:56:46.000000000 -0400 |
2647 |
@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg |
2648 |
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", |
2649 |
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); |
2650 |
@@ -4003,9 +4003,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/process_64.c linux-2.6.32.38/arch/s |
2651 |
(void *) gp->tpc, |
2652 |
(void *) gp->o7, |
2653 |
(void *) gp->i7, |
2654 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c |
2655 |
---- linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c 2011-03-27 14:31:47.000000000 -0400 |
2656 |
-+++ linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:56:46.000000000 -0400 |
2657 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c |
2658 |
+--- linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c 2011-03-27 14:31:47.000000000 -0400 |
2659 |
++++ linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:56:46.000000000 -0400 |
2660 |
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str |
2661 |
if (ARCH_SUN4C && len > 0x20000000) |
2662 |
return -ENOMEM; |
2663 |
@@ -4024,9 +4024,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.38/arch |
2664 |
return addr; |
2665 |
addr = vmm->vm_end; |
2666 |
if (flags & MAP_SHARED) |
2667 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c |
2668 |
---- linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c 2011-03-27 14:31:47.000000000 -0400 |
2669 |
-+++ linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:56:46.000000000 -0400 |
2670 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c |
2671 |
+--- linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c 2011-03-27 14:31:47.000000000 -0400 |
2672 |
++++ linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:56:46.000000000 -0400 |
2673 |
@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str |
2674 |
/* We do not accept a shared mapping if it would violate |
2675 |
* cache aliasing constraints. |
2676 |
@@ -4174,9 +4174,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.38/arch |
2677 |
mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
2678 |
mm->unmap_area = arch_unmap_area_topdown; |
2679 |
} |
2680 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_32.c linux-2.6.32.38/arch/sparc/kernel/traps_32.c |
2681 |
---- linux-2.6.32.38/arch/sparc/kernel/traps_32.c 2011-03-27 14:31:47.000000000 -0400 |
2682 |
-+++ linux-2.6.32.38/arch/sparc/kernel/traps_32.c 2011-04-17 15:56:46.000000000 -0400 |
2683 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_32.c linux-2.6.32.39/arch/sparc/kernel/traps_32.c |
2684 |
+--- linux-2.6.32.39/arch/sparc/kernel/traps_32.c 2011-03-27 14:31:47.000000000 -0400 |
2685 |
++++ linux-2.6.32.39/arch/sparc/kernel/traps_32.c 2011-04-17 15:56:46.000000000 -0400 |
2686 |
@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_ |
2687 |
count++ < 30 && |
2688 |
(((unsigned long) rw) >= PAGE_OFFSET) && |
2689 |
@@ -4186,9 +4186,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_32.c linux-2.6.32.38/arch/spa |
2690 |
(void *) rw->ins[7]); |
2691 |
rw = (struct reg_window32 *)rw->ins[6]; |
2692 |
} |
2693 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_64.c linux-2.6.32.38/arch/sparc/kernel/traps_64.c |
2694 |
---- linux-2.6.32.38/arch/sparc/kernel/traps_64.c 2011-03-27 14:31:47.000000000 -0400 |
2695 |
-+++ linux-2.6.32.38/arch/sparc/kernel/traps_64.c 2011-04-17 15:56:46.000000000 -0400 |
2696 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_64.c linux-2.6.32.39/arch/sparc/kernel/traps_64.c |
2697 |
+--- linux-2.6.32.39/arch/sparc/kernel/traps_64.c 2011-03-27 14:31:47.000000000 -0400 |
2698 |
++++ linux-2.6.32.39/arch/sparc/kernel/traps_64.c 2011-04-17 15:56:46.000000000 -0400 |
2699 |
@@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_ |
2700 |
i + 1, |
2701 |
p->trapstack[i].tstate, p->trapstack[i].tpc, |
2702 |
@@ -4298,9 +4298,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/traps_64.c linux-2.6.32.38/arch/spa |
2703 |
(void *) rw->ins[7]); |
2704 |
|
2705 |
rw = kernel_stack_up(rw); |
2706 |
-diff -urNp linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c |
2707 |
---- linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c 2011-03-27 14:31:47.000000000 -0400 |
2708 |
-+++ linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:56:46.000000000 -0400 |
2709 |
+diff -urNp linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c |
2710 |
+--- linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c 2011-03-27 14:31:47.000000000 -0400 |
2711 |
++++ linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:56:46.000000000 -0400 |
2712 |
@@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs |
2713 |
if (count < 5) { |
2714 |
last_time = jiffies; |
2715 |
@@ -4310,9 +4310,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/kernel/unaligned_64.c linux-2.6.32.38/arch |
2716 |
regs->tpc, (void *) regs->tpc); |
2717 |
} |
2718 |
} |
2719 |
-diff -urNp linux-2.6.32.38/arch/sparc/lib/atomic_64.S linux-2.6.32.38/arch/sparc/lib/atomic_64.S |
2720 |
---- linux-2.6.32.38/arch/sparc/lib/atomic_64.S 2011-03-27 14:31:47.000000000 -0400 |
2721 |
-+++ linux-2.6.32.38/arch/sparc/lib/atomic_64.S 2011-04-17 15:56:46.000000000 -0400 |
2722 |
+diff -urNp linux-2.6.32.39/arch/sparc/lib/atomic_64.S linux-2.6.32.39/arch/sparc/lib/atomic_64.S |
2723 |
+--- linux-2.6.32.39/arch/sparc/lib/atomic_64.S 2011-03-27 14:31:47.000000000 -0400 |
2724 |
++++ linux-2.6.32.39/arch/sparc/lib/atomic_64.S 2011-04-17 15:56:46.000000000 -0400 |
2725 |
@@ -18,7 +18,12 @@ |
2726 |
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ |
2727 |
BACKOFF_SETUP(%o2) |
2728 |
@@ -4547,9 +4547,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/lib/atomic_64.S linux-2.6.32.38/arch/sparc |
2729 |
casx [%o1], %g1, %g7 |
2730 |
cmp %g1, %g7 |
2731 |
bne,pn %xcc, 2f |
2732 |
-diff -urNp linux-2.6.32.38/arch/sparc/lib/ksyms.c linux-2.6.32.38/arch/sparc/lib/ksyms.c |
2733 |
---- linux-2.6.32.38/arch/sparc/lib/ksyms.c 2011-03-27 14:31:47.000000000 -0400 |
2734 |
-+++ linux-2.6.32.38/arch/sparc/lib/ksyms.c 2011-04-17 15:56:46.000000000 -0400 |
2735 |
+diff -urNp linux-2.6.32.39/arch/sparc/lib/ksyms.c linux-2.6.32.39/arch/sparc/lib/ksyms.c |
2736 |
+--- linux-2.6.32.39/arch/sparc/lib/ksyms.c 2011-03-27 14:31:47.000000000 -0400 |
2737 |
++++ linux-2.6.32.39/arch/sparc/lib/ksyms.c 2011-04-17 15:56:46.000000000 -0400 |
2738 |
@@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write); |
2739 |
|
2740 |
/* Atomic counter implementation. */ |
2741 |
@@ -4568,9 +4568,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/lib/ksyms.c linux-2.6.32.38/arch/sparc/lib |
2742 |
EXPORT_SYMBOL(atomic64_sub_ret); |
2743 |
|
2744 |
/* Atomic bit operations. */ |
2745 |
-diff -urNp linux-2.6.32.38/arch/sparc/lib/rwsem_64.S linux-2.6.32.38/arch/sparc/lib/rwsem_64.S |
2746 |
---- linux-2.6.32.38/arch/sparc/lib/rwsem_64.S 2011-03-27 14:31:47.000000000 -0400 |
2747 |
-+++ linux-2.6.32.38/arch/sparc/lib/rwsem_64.S 2011-04-17 15:56:46.000000000 -0400 |
2748 |
+diff -urNp linux-2.6.32.39/arch/sparc/lib/rwsem_64.S linux-2.6.32.39/arch/sparc/lib/rwsem_64.S |
2749 |
+--- linux-2.6.32.39/arch/sparc/lib/rwsem_64.S 2011-03-27 14:31:47.000000000 -0400 |
2750 |
++++ linux-2.6.32.39/arch/sparc/lib/rwsem_64.S 2011-04-17 15:56:46.000000000 -0400 |
2751 |
@@ -11,7 +11,12 @@ |
2752 |
.globl __down_read |
2753 |
__down_read: |
2754 |
@@ -4669,9 +4669,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/lib/rwsem_64.S linux-2.6.32.38/arch/sparc/ |
2755 |
cas [%o0], %g3, %g7 |
2756 |
cmp %g3, %g7 |
2757 |
bne,pn %icc, 1b |
2758 |
-diff -urNp linux-2.6.32.38/arch/sparc/Makefile linux-2.6.32.38/arch/sparc/Makefile |
2759 |
---- linux-2.6.32.38/arch/sparc/Makefile 2011-03-27 14:31:47.000000000 -0400 |
2760 |
-+++ linux-2.6.32.38/arch/sparc/Makefile 2011-04-17 15:56:46.000000000 -0400 |
2761 |
+diff -urNp linux-2.6.32.39/arch/sparc/Makefile linux-2.6.32.39/arch/sparc/Makefile |
2762 |
+--- linux-2.6.32.39/arch/sparc/Makefile 2011-03-27 14:31:47.000000000 -0400 |
2763 |
++++ linux-2.6.32.39/arch/sparc/Makefile 2011-04-17 15:56:46.000000000 -0400 |
2764 |
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc |
2765 |
# Export what is needed by arch/sparc/boot/Makefile |
2766 |
export VMLINUX_INIT VMLINUX_MAIN |
2767 |
@@ -4681,9 +4681,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/Makefile linux-2.6.32.38/arch/sparc/Makefi |
2768 |
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) |
2769 |
VMLINUX_MAIN += $(drivers-y) $(net-y) |
2770 |
|
2771 |
-diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_32.c linux-2.6.32.38/arch/sparc/mm/fault_32.c |
2772 |
---- linux-2.6.32.38/arch/sparc/mm/fault_32.c 2011-03-27 14:31:47.000000000 -0400 |
2773 |
-+++ linux-2.6.32.38/arch/sparc/mm/fault_32.c 2011-04-17 15:56:46.000000000 -0400 |
2774 |
+diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_32.c linux-2.6.32.39/arch/sparc/mm/fault_32.c |
2775 |
+--- linux-2.6.32.39/arch/sparc/mm/fault_32.c 2011-03-27 14:31:47.000000000 -0400 |
2776 |
++++ linux-2.6.32.39/arch/sparc/mm/fault_32.c 2011-04-17 15:56:46.000000000 -0400 |
2777 |
@@ -21,6 +21,9 @@ |
2778 |
#include <linux/interrupt.h> |
2779 |
#include <linux/module.h> |
2780 |
@@ -4987,9 +4987,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_32.c linux-2.6.32.38/arch/sparc/m |
2781 |
/* Allow reads even for write-only mappings */ |
2782 |
if(!(vma->vm_flags & (VM_READ | VM_EXEC))) |
2783 |
goto bad_area; |
2784 |
-diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_64.c linux-2.6.32.38/arch/sparc/mm/fault_64.c |
2785 |
---- linux-2.6.32.38/arch/sparc/mm/fault_64.c 2011-03-27 14:31:47.000000000 -0400 |
2786 |
-+++ linux-2.6.32.38/arch/sparc/mm/fault_64.c 2011-04-17 15:56:46.000000000 -0400 |
2787 |
+diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_64.c linux-2.6.32.39/arch/sparc/mm/fault_64.c |
2788 |
+--- linux-2.6.32.39/arch/sparc/mm/fault_64.c 2011-03-27 14:31:47.000000000 -0400 |
2789 |
++++ linux-2.6.32.39/arch/sparc/mm/fault_64.c 2011-04-17 15:56:46.000000000 -0400 |
2790 |
@@ -20,6 +20,9 @@ |
2791 |
#include <linux/kprobes.h> |
2792 |
#include <linux/kdebug.h> |
2793 |
@@ -5496,9 +5496,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/fault_64.c linux-2.6.32.38/arch/sparc/m |
2794 |
/* Pure DTLB misses do not tell us whether the fault causing |
2795 |
* load/store/atomic was a write or not, it only says that there |
2796 |
* was no match. So in such a case we (carefully) read the |
2797 |
-diff -urNp linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c |
2798 |
---- linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 |
2799 |
-+++ linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400 |
2800 |
+diff -urNp linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c |
2801 |
+--- linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 |
2802 |
++++ linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400 |
2803 |
@@ -69,7 +69,7 @@ full_search: |
2804 |
} |
2805 |
return -ENOMEM; |
2806 |
@@ -5558,9 +5558,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/hugetlbpage.c linux-2.6.32.38/arch/spar |
2807 |
return addr; |
2808 |
} |
2809 |
if (mm->get_unmapped_area == arch_get_unmapped_area) |
2810 |
-diff -urNp linux-2.6.32.38/arch/sparc/mm/init_32.c linux-2.6.32.38/arch/sparc/mm/init_32.c |
2811 |
---- linux-2.6.32.38/arch/sparc/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400 |
2812 |
-+++ linux-2.6.32.38/arch/sparc/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400 |
2813 |
+diff -urNp linux-2.6.32.39/arch/sparc/mm/init_32.c linux-2.6.32.39/arch/sparc/mm/init_32.c |
2814 |
+--- linux-2.6.32.39/arch/sparc/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400 |
2815 |
++++ linux-2.6.32.39/arch/sparc/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400 |
2816 |
@@ -317,6 +317,9 @@ extern void device_scan(void); |
2817 |
pgprot_t PAGE_SHARED __read_mostly; |
2818 |
EXPORT_SYMBOL(PAGE_SHARED); |
2819 |
@@ -5595,9 +5595,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/init_32.c linux-2.6.32.38/arch/sparc/mm |
2820 |
protection_map[12] = PAGE_READONLY; |
2821 |
protection_map[13] = PAGE_READONLY; |
2822 |
protection_map[14] = PAGE_SHARED; |
2823 |
-diff -urNp linux-2.6.32.38/arch/sparc/mm/Makefile linux-2.6.32.38/arch/sparc/mm/Makefile |
2824 |
---- linux-2.6.32.38/arch/sparc/mm/Makefile 2011-03-27 14:31:47.000000000 -0400 |
2825 |
-+++ linux-2.6.32.38/arch/sparc/mm/Makefile 2011-04-17 15:56:46.000000000 -0400 |
2826 |
+diff -urNp linux-2.6.32.39/arch/sparc/mm/Makefile linux-2.6.32.39/arch/sparc/mm/Makefile |
2827 |
+--- linux-2.6.32.39/arch/sparc/mm/Makefile 2011-03-27 14:31:47.000000000 -0400 |
2828 |
++++ linux-2.6.32.39/arch/sparc/mm/Makefile 2011-04-17 15:56:46.000000000 -0400 |
2829 |
@@ -2,7 +2,7 @@ |
2830 |
# |
2831 |
|
2832 |
@@ -5607,9 +5607,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/Makefile linux-2.6.32.38/arch/sparc/mm/ |
2833 |
|
2834 |
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o |
2835 |
obj-y += fault_$(BITS).o |
2836 |
-diff -urNp linux-2.6.32.38/arch/sparc/mm/srmmu.c linux-2.6.32.38/arch/sparc/mm/srmmu.c |
2837 |
---- linux-2.6.32.38/arch/sparc/mm/srmmu.c 2011-03-27 14:31:47.000000000 -0400 |
2838 |
-+++ linux-2.6.32.38/arch/sparc/mm/srmmu.c 2011-04-17 15:56:46.000000000 -0400 |
2839 |
+diff -urNp linux-2.6.32.39/arch/sparc/mm/srmmu.c linux-2.6.32.39/arch/sparc/mm/srmmu.c |
2840 |
+--- linux-2.6.32.39/arch/sparc/mm/srmmu.c 2011-03-27 14:31:47.000000000 -0400 |
2841 |
++++ linux-2.6.32.39/arch/sparc/mm/srmmu.c 2011-04-17 15:56:46.000000000 -0400 |
2842 |
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) |
2843 |
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); |
2844 |
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); |
2845 |
@@ -5624,9 +5624,9 @@ diff -urNp linux-2.6.32.38/arch/sparc/mm/srmmu.c linux-2.6.32.38/arch/sparc/mm/s |
2846 |
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); |
2847 |
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); |
2848 |
|
2849 |
-diff -urNp linux-2.6.32.38/arch/um/include/asm/kmap_types.h linux-2.6.32.38/arch/um/include/asm/kmap_types.h |
2850 |
---- linux-2.6.32.38/arch/um/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
2851 |
-+++ linux-2.6.32.38/arch/um/include/asm/kmap_types.h 2011-04-17 15:56:46.000000000 -0400 |
2852 |
+diff -urNp linux-2.6.32.39/arch/um/include/asm/kmap_types.h linux-2.6.32.39/arch/um/include/asm/kmap_types.h |
2853 |
+--- linux-2.6.32.39/arch/um/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
2854 |
++++ linux-2.6.32.39/arch/um/include/asm/kmap_types.h 2011-04-17 15:56:46.000000000 -0400 |
2855 |
@@ -23,6 +23,7 @@ enum km_type { |
2856 |
KM_IRQ1, |
2857 |
KM_SOFTIRQ0, |
2858 |
@@ -5635,9 +5635,9 @@ diff -urNp linux-2.6.32.38/arch/um/include/asm/kmap_types.h linux-2.6.32.38/arch |
2859 |
KM_TYPE_NR |
2860 |
}; |
2861 |
|
2862 |
-diff -urNp linux-2.6.32.38/arch/um/include/asm/page.h linux-2.6.32.38/arch/um/include/asm/page.h |
2863 |
---- linux-2.6.32.38/arch/um/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 |
2864 |
-+++ linux-2.6.32.38/arch/um/include/asm/page.h 2011-04-17 15:56:46.000000000 -0400 |
2865 |
+diff -urNp linux-2.6.32.39/arch/um/include/asm/page.h linux-2.6.32.39/arch/um/include/asm/page.h |
2866 |
+--- linux-2.6.32.39/arch/um/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 |
2867 |
++++ linux-2.6.32.39/arch/um/include/asm/page.h 2011-04-17 15:56:46.000000000 -0400 |
2868 |
@@ -14,6 +14,9 @@ |
2869 |
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) |
2870 |
#define PAGE_MASK (~(PAGE_SIZE-1)) |
2871 |
@@ -5648,9 +5648,9 @@ diff -urNp linux-2.6.32.38/arch/um/include/asm/page.h linux-2.6.32.38/arch/um/in |
2872 |
#ifndef __ASSEMBLY__ |
2873 |
|
2874 |
struct page; |
2875 |
-diff -urNp linux-2.6.32.38/arch/um/kernel/process.c linux-2.6.32.38/arch/um/kernel/process.c |
2876 |
---- linux-2.6.32.38/arch/um/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
2877 |
-+++ linux-2.6.32.38/arch/um/kernel/process.c 2011-04-17 15:56:46.000000000 -0400 |
2878 |
+diff -urNp linux-2.6.32.39/arch/um/kernel/process.c linux-2.6.32.39/arch/um/kernel/process.c |
2879 |
+--- linux-2.6.32.39/arch/um/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
2880 |
++++ linux-2.6.32.39/arch/um/kernel/process.c 2011-04-17 15:56:46.000000000 -0400 |
2881 |
@@ -393,22 +393,6 @@ int singlestepping(void * t) |
2882 |
return 2; |
2883 |
} |
2884 |
@@ -5674,9 +5674,9 @@ diff -urNp linux-2.6.32.38/arch/um/kernel/process.c linux-2.6.32.38/arch/um/kern |
2885 |
unsigned long get_wchan(struct task_struct *p) |
2886 |
{ |
2887 |
unsigned long stack_page, sp, ip; |
2888 |
-diff -urNp linux-2.6.32.38/arch/um/sys-i386/syscalls.c linux-2.6.32.38/arch/um/sys-i386/syscalls.c |
2889 |
---- linux-2.6.32.38/arch/um/sys-i386/syscalls.c 2011-03-27 14:31:47.000000000 -0400 |
2890 |
-+++ linux-2.6.32.38/arch/um/sys-i386/syscalls.c 2011-04-17 15:56:46.000000000 -0400 |
2891 |
+diff -urNp linux-2.6.32.39/arch/um/sys-i386/syscalls.c linux-2.6.32.39/arch/um/sys-i386/syscalls.c |
2892 |
+--- linux-2.6.32.39/arch/um/sys-i386/syscalls.c 2011-03-27 14:31:47.000000000 -0400 |
2893 |
++++ linux-2.6.32.39/arch/um/sys-i386/syscalls.c 2011-04-17 15:56:46.000000000 -0400 |
2894 |
@@ -11,6 +11,21 @@ |
2895 |
#include "asm/uaccess.h" |
2896 |
#include "asm/unistd.h" |
2897 |
@@ -5699,9 +5699,9 @@ diff -urNp linux-2.6.32.38/arch/um/sys-i386/syscalls.c linux-2.6.32.38/arch/um/s |
2898 |
/* |
2899 |
* Perform the select(nd, in, out, ex, tv) and mmap() system |
2900 |
* calls. Linux/i386 didn't use to be able to handle more than |
2901 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/bitops.h linux-2.6.32.38/arch/x86/boot/bitops.h |
2902 |
---- linux-2.6.32.38/arch/x86/boot/bitops.h 2011-03-27 14:31:47.000000000 -0400 |
2903 |
-+++ linux-2.6.32.38/arch/x86/boot/bitops.h 2011-04-17 15:56:46.000000000 -0400 |
2904 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/bitops.h linux-2.6.32.39/arch/x86/boot/bitops.h |
2905 |
+--- linux-2.6.32.39/arch/x86/boot/bitops.h 2011-03-27 14:31:47.000000000 -0400 |
2906 |
++++ linux-2.6.32.39/arch/x86/boot/bitops.h 2011-04-17 15:56:46.000000000 -0400 |
2907 |
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int |
2908 |
u8 v; |
2909 |
const u32 *p = (const u32 *)addr; |
2910 |
@@ -5720,9 +5720,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/bitops.h linux-2.6.32.38/arch/x86/boot/ |
2911 |
} |
2912 |
|
2913 |
#endif /* BOOT_BITOPS_H */ |
2914 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/boot.h linux-2.6.32.38/arch/x86/boot/boot.h |
2915 |
---- linux-2.6.32.38/arch/x86/boot/boot.h 2011-03-27 14:31:47.000000000 -0400 |
2916 |
-+++ linux-2.6.32.38/arch/x86/boot/boot.h 2011-04-17 15:56:46.000000000 -0400 |
2917 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/boot.h linux-2.6.32.39/arch/x86/boot/boot.h |
2918 |
+--- linux-2.6.32.39/arch/x86/boot/boot.h 2011-03-27 14:31:47.000000000 -0400 |
2919 |
++++ linux-2.6.32.39/arch/x86/boot/boot.h 2011-04-17 15:56:46.000000000 -0400 |
2920 |
@@ -82,7 +82,7 @@ static inline void io_delay(void) |
2921 |
static inline u16 ds(void) |
2922 |
{ |
2923 |
@@ -5741,9 +5741,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/boot.h linux-2.6.32.38/arch/x86/boot/bo |
2924 |
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); |
2925 |
return diff; |
2926 |
} |
2927 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/head_32.S linux-2.6.32.38/arch/x86/boot/compressed/head_32.S |
2928 |
---- linux-2.6.32.38/arch/x86/boot/compressed/head_32.S 2011-03-27 14:31:47.000000000 -0400 |
2929 |
-+++ linux-2.6.32.38/arch/x86/boot/compressed/head_32.S 2011-04-17 15:56:46.000000000 -0400 |
2930 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_32.S linux-2.6.32.39/arch/x86/boot/compressed/head_32.S |
2931 |
+--- linux-2.6.32.39/arch/x86/boot/compressed/head_32.S 2011-03-27 14:31:47.000000000 -0400 |
2932 |
++++ linux-2.6.32.39/arch/x86/boot/compressed/head_32.S 2011-04-17 15:56:46.000000000 -0400 |
2933 |
@@ -76,7 +76,7 @@ ENTRY(startup_32) |
2934 |
notl %eax |
2935 |
andl %eax, %ebx |
2936 |
@@ -5772,9 +5772,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/head_32.S linux-2.6.32.38/ar |
2937 |
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) |
2938 |
jmp 1b |
2939 |
2: |
2940 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/head_64.S linux-2.6.32.38/arch/x86/boot/compressed/head_64.S |
2941 |
---- linux-2.6.32.38/arch/x86/boot/compressed/head_64.S 2011-03-27 14:31:47.000000000 -0400 |
2942 |
-+++ linux-2.6.32.38/arch/x86/boot/compressed/head_64.S 2011-04-17 15:56:46.000000000 -0400 |
2943 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_64.S linux-2.6.32.39/arch/x86/boot/compressed/head_64.S |
2944 |
+--- linux-2.6.32.39/arch/x86/boot/compressed/head_64.S 2011-03-27 14:31:47.000000000 -0400 |
2945 |
++++ linux-2.6.32.39/arch/x86/boot/compressed/head_64.S 2011-04-17 15:56:46.000000000 -0400 |
2946 |
@@ -91,7 +91,7 @@ ENTRY(startup_32) |
2947 |
notl %eax |
2948 |
andl %eax, %ebx |
2949 |
@@ -5793,9 +5793,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/head_64.S linux-2.6.32.38/ar |
2950 |
#endif |
2951 |
|
2952 |
/* Target address to relocate to for decompression */ |
2953 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/misc.c linux-2.6.32.38/arch/x86/boot/compressed/misc.c |
2954 |
---- linux-2.6.32.38/arch/x86/boot/compressed/misc.c 2011-03-27 14:31:47.000000000 -0400 |
2955 |
-+++ linux-2.6.32.38/arch/x86/boot/compressed/misc.c 2011-04-17 15:56:46.000000000 -0400 |
2956 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/misc.c linux-2.6.32.39/arch/x86/boot/compressed/misc.c |
2957 |
+--- linux-2.6.32.39/arch/x86/boot/compressed/misc.c 2011-03-27 14:31:47.000000000 -0400 |
2958 |
++++ linux-2.6.32.39/arch/x86/boot/compressed/misc.c 2011-04-17 15:56:46.000000000 -0400 |
2959 |
@@ -288,7 +288,7 @@ static void parse_elf(void *output) |
2960 |
case PT_LOAD: |
2961 |
#ifdef CONFIG_RELOCATABLE |
2962 |
@@ -5814,9 +5814,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/misc.c linux-2.6.32.38/arch/ |
2963 |
error("Wrong destination address"); |
2964 |
#endif |
2965 |
|
2966 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c |
2967 |
---- linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c 2011-03-27 14:31:47.000000000 -0400 |
2968 |
-+++ linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c 2011-04-17 15:56:46.000000000 -0400 |
2969 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c |
2970 |
+--- linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c 2011-03-27 14:31:47.000000000 -0400 |
2971 |
++++ linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c 2011-04-17 15:56:46.000000000 -0400 |
2972 |
@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) |
2973 |
|
2974 |
offs = (olen > ilen) ? olen - ilen : 0; |
2975 |
@@ -5826,9 +5826,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.38/ar |
2976 |
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ |
2977 |
|
2978 |
printf(".section \".rodata.compressed\",\"a\",@progbits\n"); |
2979 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/relocs.c linux-2.6.32.38/arch/x86/boot/compressed/relocs.c |
2980 |
---- linux-2.6.32.38/arch/x86/boot/compressed/relocs.c 2011-03-27 14:31:47.000000000 -0400 |
2981 |
-+++ linux-2.6.32.38/arch/x86/boot/compressed/relocs.c 2011-04-17 15:56:46.000000000 -0400 |
2982 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/relocs.c linux-2.6.32.39/arch/x86/boot/compressed/relocs.c |
2983 |
+--- linux-2.6.32.39/arch/x86/boot/compressed/relocs.c 2011-03-27 14:31:47.000000000 -0400 |
2984 |
++++ linux-2.6.32.39/arch/x86/boot/compressed/relocs.c 2011-04-17 15:56:46.000000000 -0400 |
2985 |
@@ -10,8 +10,11 @@ |
2986 |
#define USE_BSD |
2987 |
#include <endian.h> |
2988 |
@@ -6029,9 +6029,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/compressed/relocs.c linux-2.6.32.38/arc |
2989 |
read_shdrs(fp); |
2990 |
read_strtabs(fp); |
2991 |
read_symtabs(fp); |
2992 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/cpucheck.c linux-2.6.32.38/arch/x86/boot/cpucheck.c |
2993 |
---- linux-2.6.32.38/arch/x86/boot/cpucheck.c 2011-03-27 14:31:47.000000000 -0400 |
2994 |
-+++ linux-2.6.32.38/arch/x86/boot/cpucheck.c 2011-04-17 15:56:46.000000000 -0400 |
2995 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/cpucheck.c linux-2.6.32.39/arch/x86/boot/cpucheck.c |
2996 |
+--- linux-2.6.32.39/arch/x86/boot/cpucheck.c 2011-03-27 14:31:47.000000000 -0400 |
2997 |
++++ linux-2.6.32.39/arch/x86/boot/cpucheck.c 2011-04-17 15:56:46.000000000 -0400 |
2998 |
@@ -74,7 +74,7 @@ static int has_fpu(void) |
2999 |
u16 fcw = -1, fsw = -1; |
3000 |
u32 cr0; |
3001 |
@@ -6127,9 +6127,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/cpucheck.c linux-2.6.32.38/arch/x86/boo |
3002 |
|
3003 |
err = check_flags(); |
3004 |
} |
3005 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/header.S linux-2.6.32.38/arch/x86/boot/header.S |
3006 |
---- linux-2.6.32.38/arch/x86/boot/header.S 2011-03-27 14:31:47.000000000 -0400 |
3007 |
-+++ linux-2.6.32.38/arch/x86/boot/header.S 2011-04-17 15:56:46.000000000 -0400 |
3008 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/header.S linux-2.6.32.39/arch/x86/boot/header.S |
3009 |
+--- linux-2.6.32.39/arch/x86/boot/header.S 2011-03-27 14:31:47.000000000 -0400 |
3010 |
++++ linux-2.6.32.39/arch/x86/boot/header.S 2011-04-17 15:56:46.000000000 -0400 |
3011 |
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical |
3012 |
# single linked list of |
3013 |
# struct setup_data |
3014 |
@@ -6139,9 +6139,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/header.S linux-2.6.32.38/arch/x86/boot/ |
3015 |
|
3016 |
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) |
3017 |
#define VO_INIT_SIZE (VO__end - VO__text) |
3018 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/memory.c linux-2.6.32.38/arch/x86/boot/memory.c |
3019 |
---- linux-2.6.32.38/arch/x86/boot/memory.c 2011-03-27 14:31:47.000000000 -0400 |
3020 |
-+++ linux-2.6.32.38/arch/x86/boot/memory.c 2011-04-17 15:56:46.000000000 -0400 |
3021 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/memory.c linux-2.6.32.39/arch/x86/boot/memory.c |
3022 |
+--- linux-2.6.32.39/arch/x86/boot/memory.c 2011-03-27 14:31:47.000000000 -0400 |
3023 |
++++ linux-2.6.32.39/arch/x86/boot/memory.c 2011-04-17 15:56:46.000000000 -0400 |
3024 |
@@ -19,7 +19,7 @@ |
3025 |
|
3026 |
static int detect_memory_e820(void) |
3027 |
@@ -6151,9 +6151,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/memory.c linux-2.6.32.38/arch/x86/boot/ |
3028 |
struct biosregs ireg, oreg; |
3029 |
struct e820entry *desc = boot_params.e820_map; |
3030 |
static struct e820entry buf; /* static so it is zeroed */ |
3031 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/video.c linux-2.6.32.38/arch/x86/boot/video.c |
3032 |
---- linux-2.6.32.38/arch/x86/boot/video.c 2011-03-27 14:31:47.000000000 -0400 |
3033 |
-+++ linux-2.6.32.38/arch/x86/boot/video.c 2011-04-17 15:56:46.000000000 -0400 |
3034 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/video.c linux-2.6.32.39/arch/x86/boot/video.c |
3035 |
+--- linux-2.6.32.39/arch/x86/boot/video.c 2011-03-27 14:31:47.000000000 -0400 |
3036 |
++++ linux-2.6.32.39/arch/x86/boot/video.c 2011-04-17 15:56:46.000000000 -0400 |
3037 |
@@ -90,7 +90,7 @@ static void store_mode_params(void) |
3038 |
static unsigned int get_entry(void) |
3039 |
{ |
3040 |
@@ -6163,9 +6163,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/video.c linux-2.6.32.38/arch/x86/boot/v |
3041 |
int key; |
3042 |
unsigned int v; |
3043 |
|
3044 |
-diff -urNp linux-2.6.32.38/arch/x86/boot/video-vesa.c linux-2.6.32.38/arch/x86/boot/video-vesa.c |
3045 |
---- linux-2.6.32.38/arch/x86/boot/video-vesa.c 2011-03-27 14:31:47.000000000 -0400 |
3046 |
-+++ linux-2.6.32.38/arch/x86/boot/video-vesa.c 2011-04-17 15:56:46.000000000 -0400 |
3047 |
+diff -urNp linux-2.6.32.39/arch/x86/boot/video-vesa.c linux-2.6.32.39/arch/x86/boot/video-vesa.c |
3048 |
+--- linux-2.6.32.39/arch/x86/boot/video-vesa.c 2011-03-27 14:31:47.000000000 -0400 |
3049 |
++++ linux-2.6.32.39/arch/x86/boot/video-vesa.c 2011-04-17 15:56:46.000000000 -0400 |
3050 |
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) |
3051 |
|
3052 |
boot_params.screen_info.vesapm_seg = oreg.es; |
3053 |
@@ -6174,9 +6174,9 @@ diff -urNp linux-2.6.32.38/arch/x86/boot/video-vesa.c linux-2.6.32.38/arch/x86/b |
3054 |
} |
3055 |
|
3056 |
/* |
3057 |
-diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_aout.c linux-2.6.32.38/arch/x86/ia32/ia32_aout.c |
3058 |
---- linux-2.6.32.38/arch/x86/ia32/ia32_aout.c 2011-03-27 14:31:47.000000000 -0400 |
3059 |
-+++ linux-2.6.32.38/arch/x86/ia32/ia32_aout.c 2011-04-17 15:56:46.000000000 -0400 |
3060 |
+diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_aout.c linux-2.6.32.39/arch/x86/ia32/ia32_aout.c |
3061 |
+--- linux-2.6.32.39/arch/x86/ia32/ia32_aout.c 2011-03-27 14:31:47.000000000 -0400 |
3062 |
++++ linux-2.6.32.39/arch/x86/ia32/ia32_aout.c 2011-04-17 15:56:46.000000000 -0400 |
3063 |
@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st |
3064 |
unsigned long dump_start, dump_size; |
3065 |
struct user32 dump; |
3066 |
@@ -6199,9 +6199,9 @@ diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_aout.c linux-2.6.32.38/arch/x86/ia |
3067 |
end_coredump: |
3068 |
set_fs(fs); |
3069 |
return has_dumped; |
3070 |
-diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32entry.S linux-2.6.32.38/arch/x86/ia32/ia32entry.S |
3071 |
---- linux-2.6.32.38/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000000 -0400 |
3072 |
-+++ linux-2.6.32.38/arch/x86/ia32/ia32entry.S 2011-04-17 15:56:46.000000000 -0400 |
3073 |
+diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia32/ia32entry.S |
3074 |
+--- linux-2.6.32.39/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000000 -0400 |
3075 |
++++ linux-2.6.32.39/arch/x86/ia32/ia32entry.S 2011-04-17 15:56:46.000000000 -0400 |
3076 |
@@ -13,6 +13,7 @@ |
3077 |
#include <asm/thread_info.h> |
3078 |
#include <asm/segment.h> |
3079 |
@@ -6339,9 +6339,9 @@ diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32entry.S linux-2.6.32.38/arch/x86/ia |
3080 |
/* |
3081 |
* No need to follow this irqs on/off section: the syscall |
3082 |
* disabled irqs and here we enable it straight after entry: |
3083 |
-diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_signal.c linux-2.6.32.38/arch/x86/ia32/ia32_signal.c |
3084 |
---- linux-2.6.32.38/arch/x86/ia32/ia32_signal.c 2011-03-27 14:31:47.000000000 -0400 |
3085 |
-+++ linux-2.6.32.38/arch/x86/ia32/ia32_signal.c 2011-04-17 15:56:46.000000000 -0400 |
3086 |
+diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_signal.c linux-2.6.32.39/arch/x86/ia32/ia32_signal.c |
3087 |
+--- linux-2.6.32.39/arch/x86/ia32/ia32_signal.c 2011-03-27 14:31:47.000000000 -0400 |
3088 |
++++ linux-2.6.32.39/arch/x86/ia32/ia32_signal.c 2011-04-17 15:56:46.000000000 -0400 |
3089 |
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct |
3090 |
sp -= frame_size; |
3091 |
/* Align the stack pointer according to the i386 ABI, |
3092 |
@@ -6391,9 +6391,9 @@ diff -urNp linux-2.6.32.38/arch/x86/ia32/ia32_signal.c linux-2.6.32.38/arch/x86/ |
3093 |
} put_user_catch(err); |
3094 |
|
3095 |
if (err) |
3096 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/alternative.h linux-2.6.32.38/arch/x86/include/asm/alternative.h |
3097 |
---- linux-2.6.32.38/arch/x86/include/asm/alternative.h 2011-03-27 14:31:47.000000000 -0400 |
3098 |
-+++ linux-2.6.32.38/arch/x86/include/asm/alternative.h 2011-04-17 15:56:46.000000000 -0400 |
3099 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/alternative.h linux-2.6.32.39/arch/x86/include/asm/alternative.h |
3100 |
+--- linux-2.6.32.39/arch/x86/include/asm/alternative.h 2011-03-27 14:31:47.000000000 -0400 |
3101 |
++++ linux-2.6.32.39/arch/x86/include/asm/alternative.h 2011-04-17 15:56:46.000000000 -0400 |
3102 |
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit |
3103 |
" .byte 662b-661b\n" /* sourcelen */ \ |
3104 |
" .byte 664f-663f\n" /* replacementlen */ \ |
3105 |
@@ -6403,9 +6403,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/alternative.h linux-2.6.32.38/ar |
3106 |
"663:\n\t" newinstr "\n664:\n" /* replacement */ \ |
3107 |
".previous" |
3108 |
|
3109 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/apm.h linux-2.6.32.38/arch/x86/include/asm/apm.h |
3110 |
---- linux-2.6.32.38/arch/x86/include/asm/apm.h 2011-03-27 14:31:47.000000000 -0400 |
3111 |
-+++ linux-2.6.32.38/arch/x86/include/asm/apm.h 2011-04-17 15:56:46.000000000 -0400 |
3112 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/apm.h linux-2.6.32.39/arch/x86/include/asm/apm.h |
3113 |
+--- linux-2.6.32.39/arch/x86/include/asm/apm.h 2011-03-27 14:31:47.000000000 -0400 |
3114 |
++++ linux-2.6.32.39/arch/x86/include/asm/apm.h 2011-04-17 15:56:46.000000000 -0400 |
3115 |
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 |
3116 |
__asm__ __volatile__(APM_DO_ZERO_SEGS |
3117 |
"pushl %%edi\n\t" |
3118 |
@@ -6424,9 +6424,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/apm.h linux-2.6.32.38/arch/x86/i |
3119 |
"setc %%bl\n\t" |
3120 |
"popl %%ebp\n\t" |
3121 |
"popl %%edi\n\t" |
3122 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/atomic_32.h linux-2.6.32.38/arch/x86/include/asm/atomic_32.h |
3123 |
---- linux-2.6.32.38/arch/x86/include/asm/atomic_32.h 2011-03-27 14:31:47.000000000 -0400 |
3124 |
-+++ linux-2.6.32.38/arch/x86/include/asm/atomic_32.h 2011-04-17 15:56:46.000000000 -0400 |
3125 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch/x86/include/asm/atomic_32.h |
3126 |
+--- linux-2.6.32.39/arch/x86/include/asm/atomic_32.h 2011-03-27 14:31:47.000000000 -0400 |
3127 |
++++ linux-2.6.32.39/arch/x86/include/asm/atomic_32.h 2011-04-17 15:56:46.000000000 -0400 |
3128 |
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom |
3129 |
} |
3130 |
|
3131 |
@@ -6762,9 +6762,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/atomic_32.h linux-2.6.32.38/arch |
3132 |
#define ATOMIC64_INIT(val) { (val) } |
3133 |
|
3134 |
extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); |
3135 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/atomic_64.h linux-2.6.32.38/arch/x86/include/asm/atomic_64.h |
3136 |
---- linux-2.6.32.38/arch/x86/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400 |
3137 |
-+++ linux-2.6.32.38/arch/x86/include/asm/atomic_64.h 2011-04-17 15:56:46.000000000 -0400 |
3138 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch/x86/include/asm/atomic_64.h |
3139 |
+--- linux-2.6.32.39/arch/x86/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400 |
3140 |
++++ linux-2.6.32.39/arch/x86/include/asm/atomic_64.h 2011-04-17 15:56:46.000000000 -0400 |
3141 |
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom |
3142 |
} |
3143 |
|
3144 |
@@ -7368,9 +7368,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/atomic_64.h linux-2.6.32.38/arch |
3145 |
} |
3146 |
|
3147 |
/** |
3148 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/bitops.h linux-2.6.32.38/arch/x86/include/asm/bitops.h |
3149 |
---- linux-2.6.32.38/arch/x86/include/asm/bitops.h 2011-03-27 14:31:47.000000000 -0400 |
3150 |
-+++ linux-2.6.32.38/arch/x86/include/asm/bitops.h 2011-04-17 15:56:46.000000000 -0400 |
3151 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/bitops.h linux-2.6.32.39/arch/x86/include/asm/bitops.h |
3152 |
+--- linux-2.6.32.39/arch/x86/include/asm/bitops.h 2011-03-27 14:31:47.000000000 -0400 |
3153 |
++++ linux-2.6.32.39/arch/x86/include/asm/bitops.h 2011-04-17 15:56:46.000000000 -0400 |
3154 |
@@ -38,7 +38,7 @@ |
3155 |
* a mask operation on a byte. |
3156 |
*/ |
3157 |
@@ -7380,9 +7380,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/bitops.h linux-2.6.32.38/arch/x8 |
3158 |
#define CONST_MASK(nr) (1 << ((nr) & 7)) |
3159 |
|
3160 |
/** |
3161 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/boot.h linux-2.6.32.38/arch/x86/include/asm/boot.h |
3162 |
---- linux-2.6.32.38/arch/x86/include/asm/boot.h 2011-03-27 14:31:47.000000000 -0400 |
3163 |
-+++ linux-2.6.32.38/arch/x86/include/asm/boot.h 2011-04-17 15:56:46.000000000 -0400 |
3164 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/boot.h linux-2.6.32.39/arch/x86/include/asm/boot.h |
3165 |
+--- linux-2.6.32.39/arch/x86/include/asm/boot.h 2011-03-27 14:31:47.000000000 -0400 |
3166 |
++++ linux-2.6.32.39/arch/x86/include/asm/boot.h 2011-04-17 15:56:46.000000000 -0400 |
3167 |
@@ -11,10 +11,15 @@ |
3168 |
#include <asm/pgtable_types.h> |
3169 |
|
3170 |
@@ -7400,9 +7400,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/boot.h linux-2.6.32.38/arch/x86/ |
3171 |
/* Minimum kernel alignment, as a power of two */ |
3172 |
#ifdef CONFIG_X86_64 |
3173 |
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT |
3174 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/cacheflush.h linux-2.6.32.38/arch/x86/include/asm/cacheflush.h |
3175 |
---- linux-2.6.32.38/arch/x86/include/asm/cacheflush.h 2011-03-27 14:31:47.000000000 -0400 |
3176 |
-+++ linux-2.6.32.38/arch/x86/include/asm/cacheflush.h 2011-04-17 15:56:46.000000000 -0400 |
3177 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/cacheflush.h linux-2.6.32.39/arch/x86/include/asm/cacheflush.h |
3178 |
+--- linux-2.6.32.39/arch/x86/include/asm/cacheflush.h 2011-03-27 14:31:47.000000000 -0400 |
3179 |
++++ linux-2.6.32.39/arch/x86/include/asm/cacheflush.h 2011-04-17 15:56:46.000000000 -0400 |
3180 |
@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) |
3181 |
static inline unsigned long get_page_memtype(struct page *pg) |
3182 |
{ |
3183 |
@@ -7421,9 +7421,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/cacheflush.h linux-2.6.32.38/arc |
3184 |
ClearPageUncached(pg); |
3185 |
ClearPageWC(pg); |
3186 |
break; |
3187 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/cache.h linux-2.6.32.38/arch/x86/include/asm/cache.h |
3188 |
---- linux-2.6.32.38/arch/x86/include/asm/cache.h 2011-03-27 14:31:47.000000000 -0400 |
3189 |
-+++ linux-2.6.32.38/arch/x86/include/asm/cache.h 2011-04-17 15:56:46.000000000 -0400 |
3190 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/cache.h linux-2.6.32.39/arch/x86/include/asm/cache.h |
3191 |
+--- linux-2.6.32.39/arch/x86/include/asm/cache.h 2011-03-27 14:31:47.000000000 -0400 |
3192 |
++++ linux-2.6.32.39/arch/x86/include/asm/cache.h 2011-04-17 15:56:46.000000000 -0400 |
3193 |
@@ -8,6 +8,7 @@ |
3194 |
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
3195 |
|
3196 |
@@ -7432,9 +7432,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/cache.h linux-2.6.32.38/arch/x86 |
3197 |
|
3198 |
#ifdef CONFIG_X86_VSMP |
3199 |
/* vSMP Internode cacheline shift */ |
3200 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/checksum_32.h linux-2.6.32.38/arch/x86/include/asm/checksum_32.h |
3201 |
---- linux-2.6.32.38/arch/x86/include/asm/checksum_32.h 2011-03-27 14:31:47.000000000 -0400 |
3202 |
-+++ linux-2.6.32.38/arch/x86/include/asm/checksum_32.h 2011-04-17 15:56:46.000000000 -0400 |
3203 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/checksum_32.h linux-2.6.32.39/arch/x86/include/asm/checksum_32.h |
3204 |
+--- linux-2.6.32.39/arch/x86/include/asm/checksum_32.h 2011-03-27 14:31:47.000000000 -0400 |
3205 |
++++ linux-2.6.32.39/arch/x86/include/asm/checksum_32.h 2011-04-17 15:56:46.000000000 -0400 |
3206 |
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene |
3207 |
int len, __wsum sum, |
3208 |
int *src_err_ptr, int *dst_err_ptr); |
3209 |
@@ -7468,9 +7468,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/checksum_32.h linux-2.6.32.38/ar |
3210 |
len, sum, NULL, err_ptr); |
3211 |
|
3212 |
if (len) |
3213 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc_defs.h linux-2.6.32.38/arch/x86/include/asm/desc_defs.h |
3214 |
---- linux-2.6.32.38/arch/x86/include/asm/desc_defs.h 2011-03-27 14:31:47.000000000 -0400 |
3215 |
-+++ linux-2.6.32.38/arch/x86/include/asm/desc_defs.h 2011-04-17 15:56:46.000000000 -0400 |
3216 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc_defs.h linux-2.6.32.39/arch/x86/include/asm/desc_defs.h |
3217 |
+--- linux-2.6.32.39/arch/x86/include/asm/desc_defs.h 2011-03-27 14:31:47.000000000 -0400 |
3218 |
++++ linux-2.6.32.39/arch/x86/include/asm/desc_defs.h 2011-04-17 15:56:46.000000000 -0400 |
3219 |
@@ -31,6 +31,12 @@ struct desc_struct { |
3220 |
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; |
3221 |
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; |
3222 |
@@ -7484,9 +7484,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc_defs.h linux-2.6.32.38/arch |
3223 |
}; |
3224 |
} __attribute__((packed)); |
3225 |
|
3226 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/include/asm/desc.h |
3227 |
---- linux-2.6.32.38/arch/x86/include/asm/desc.h 2011-03-27 14:31:47.000000000 -0400 |
3228 |
-+++ linux-2.6.32.38/arch/x86/include/asm/desc.h 2011-04-17 15:56:46.000000000 -0400 |
3229 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc.h linux-2.6.32.39/arch/x86/include/asm/desc.h |
3230 |
+--- linux-2.6.32.39/arch/x86/include/asm/desc.h 2011-03-27 14:31:47.000000000 -0400 |
3231 |
++++ linux-2.6.32.39/arch/x86/include/asm/desc.h 2011-04-23 12:56:10.000000000 -0400 |
3232 |
@@ -4,6 +4,7 @@ |
3233 |
#include <asm/desc_defs.h> |
3234 |
#include <asm/ldt.h> |
3235 |
@@ -7541,7 +7541,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3236 |
} |
3237 |
|
3238 |
#endif |
3239 |
-@@ -115,19 +118,24 @@ static inline void paravirt_free_ldt(str |
3240 |
+@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(str |
3241 |
static inline void native_write_idt_entry(gate_desc *idt, int entry, |
3242 |
const gate_desc *gate) |
3243 |
{ |
3244 |
@@ -7559,14 +7559,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3245 |
} |
3246 |
|
3247 |
static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry, |
3248 |
- const void *desc, int type) |
3249 |
- { |
3250 |
- unsigned int size; |
3251 |
-+ |
3252 |
- switch (type) { |
3253 |
- case DESC_TSS: |
3254 |
- size = sizeof(tss_desc); |
3255 |
-@@ -139,7 +147,10 @@ static inline void native_write_gdt_entr |
3256 |
+@@ -139,7 +146,10 @@ static inline void native_write_gdt_entr |
3257 |
size = sizeof(struct desc_struct); |
3258 |
break; |
3259 |
} |
3260 |
@@ -7577,7 +7570,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3261 |
} |
3262 |
|
3263 |
static inline void pack_descriptor(struct desc_struct *desc, unsigned long base, |
3264 |
-@@ -211,7 +222,9 @@ static inline void native_set_ldt(const |
3265 |
+@@ -211,7 +221,9 @@ static inline void native_set_ldt(const |
3266 |
|
3267 |
static inline void native_load_tr_desc(void) |
3268 |
{ |
3269 |
@@ -7587,7 +7580,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3270 |
} |
3271 |
|
3272 |
static inline void native_load_gdt(const struct desc_ptr *dtr) |
3273 |
-@@ -246,8 +259,10 @@ static inline void native_load_tls(struc |
3274 |
+@@ -246,8 +258,10 @@ static inline void native_load_tls(struc |
3275 |
unsigned int i; |
3276 |
struct desc_struct *gdt = get_cpu_gdt_table(cpu); |
3277 |
|
3278 |
@@ -7598,7 +7591,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3279 |
} |
3280 |
|
3281 |
#define _LDT_empty(info) \ |
3282 |
-@@ -309,7 +324,7 @@ static inline void set_desc_limit(struct |
3283 |
+@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct |
3284 |
desc->limit = (limit >> 16) & 0xf; |
3285 |
} |
3286 |
|
3287 |
@@ -7607,7 +7600,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3288 |
unsigned dpl, unsigned ist, unsigned seg) |
3289 |
{ |
3290 |
gate_desc s; |
3291 |
-@@ -327,7 +342,7 @@ static inline void _set_gate(int gate, u |
3292 |
+@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, u |
3293 |
* Pentium F0 0F bugfix can have resulted in the mapped |
3294 |
* IDT being write-protected. |
3295 |
*/ |
3296 |
@@ -7616,7 +7609,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3297 |
{ |
3298 |
BUG_ON((unsigned)n > 0xFF); |
3299 |
_set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); |
3300 |
-@@ -356,19 +371,19 @@ static inline void alloc_intr_gate(unsig |
3301 |
+@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsig |
3302 |
/* |
3303 |
* This routine sets up an interrupt gate at directory privilege level 3. |
3304 |
*/ |
3305 |
@@ -7639,7 +7632,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3306 |
{ |
3307 |
BUG_ON((unsigned)n > 0xFF); |
3308 |
_set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); |
3309 |
-@@ -377,19 +392,31 @@ static inline void set_trap_gate(unsigne |
3310 |
+@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigne |
3311 |
static inline void set_task_gate(unsigned int n, unsigned int gdt_entry) |
3312 |
{ |
3313 |
BUG_ON((unsigned)n > 0xFF); |
3314 |
@@ -7674,9 +7667,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/desc.h linux-2.6.32.38/arch/x86/ |
3315 |
+#endif |
3316 |
+ |
3317 |
#endif /* _ASM_X86_DESC_H */ |
3318 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/device.h linux-2.6.32.38/arch/x86/include/asm/device.h |
3319 |
---- linux-2.6.32.38/arch/x86/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400 |
3320 |
-+++ linux-2.6.32.38/arch/x86/include/asm/device.h 2011-04-17 15:56:46.000000000 -0400 |
3321 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/device.h linux-2.6.32.39/arch/x86/include/asm/device.h |
3322 |
+--- linux-2.6.32.39/arch/x86/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400 |
3323 |
++++ linux-2.6.32.39/arch/x86/include/asm/device.h 2011-04-17 15:56:46.000000000 -0400 |
3324 |
@@ -6,7 +6,7 @@ struct dev_archdata { |
3325 |
void *acpi_handle; |
3326 |
#endif |
3327 |
@@ -7686,9 +7679,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/device.h linux-2.6.32.38/arch/x8 |
3328 |
#endif |
3329 |
#ifdef CONFIG_DMAR |
3330 |
void *iommu; /* hook for IOMMU specific extension */ |
3331 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h |
3332 |
---- linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
3333 |
-+++ linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 |
3334 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h |
3335 |
+--- linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
3336 |
++++ linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 |
3337 |
@@ -25,9 +25,9 @@ extern int iommu_merge; |
3338 |
extern struct device x86_dma_fallback_dev; |
3339 |
extern int panic_on_overflow; |
3340 |
@@ -7728,9 +7721,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/dma-mapping.h linux-2.6.32.38/ar |
3341 |
|
3342 |
WARN_ON(irqs_disabled()); /* for portability */ |
3343 |
|
3344 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/e820.h linux-2.6.32.38/arch/x86/include/asm/e820.h |
3345 |
---- linux-2.6.32.38/arch/x86/include/asm/e820.h 2011-03-27 14:31:47.000000000 -0400 |
3346 |
-+++ linux-2.6.32.38/arch/x86/include/asm/e820.h 2011-04-17 15:56:46.000000000 -0400 |
3347 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/e820.h linux-2.6.32.39/arch/x86/include/asm/e820.h |
3348 |
+--- linux-2.6.32.39/arch/x86/include/asm/e820.h 2011-03-27 14:31:47.000000000 -0400 |
3349 |
++++ linux-2.6.32.39/arch/x86/include/asm/e820.h 2011-04-17 15:56:46.000000000 -0400 |
3350 |
@@ -133,7 +133,7 @@ extern char *default_machine_specific_me |
3351 |
#define ISA_END_ADDRESS 0x100000 |
3352 |
#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) |
3353 |
@@ -7740,9 +7733,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/e820.h linux-2.6.32.38/arch/x86/ |
3354 |
#define BIOS_END 0x00100000 |
3355 |
|
3356 |
#ifdef __KERNEL__ |
3357 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/elf.h linux-2.6.32.38/arch/x86/include/asm/elf.h |
3358 |
---- linux-2.6.32.38/arch/x86/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
3359 |
-+++ linux-2.6.32.38/arch/x86/include/asm/elf.h 2011-04-17 15:56:46.000000000 -0400 |
3360 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/elf.h linux-2.6.32.39/arch/x86/include/asm/elf.h |
3361 |
+--- linux-2.6.32.39/arch/x86/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 |
3362 |
++++ linux-2.6.32.39/arch/x86/include/asm/elf.h 2011-04-17 15:56:46.000000000 -0400 |
3363 |
@@ -257,7 +257,25 @@ extern int force_personality32; |
3364 |
the loader. We need to make sure that it is out of the way of the program |
3365 |
that it will "exec", and that there is sufficient room for the brk. */ |
3366 |
@@ -7796,9 +7789,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/elf.h linux-2.6.32.38/arch/x86/i |
3367 |
-#define arch_randomize_brk arch_randomize_brk |
3368 |
- |
3369 |
#endif /* _ASM_X86_ELF_H */ |
3370 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/futex.h linux-2.6.32.38/arch/x86/include/asm/futex.h |
3371 |
---- linux-2.6.32.38/arch/x86/include/asm/futex.h 2011-03-27 14:31:47.000000000 -0400 |
3372 |
-+++ linux-2.6.32.38/arch/x86/include/asm/futex.h 2011-04-17 15:56:46.000000000 -0400 |
3373 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/futex.h linux-2.6.32.39/arch/x86/include/asm/futex.h |
3374 |
+--- linux-2.6.32.39/arch/x86/include/asm/futex.h 2011-03-27 14:31:47.000000000 -0400 |
3375 |
++++ linux-2.6.32.39/arch/x86/include/asm/futex.h 2011-04-17 15:56:46.000000000 -0400 |
3376 |
@@ -12,16 +12,18 @@ |
3377 |
#include <asm/system.h> |
3378 |
|
3379 |
@@ -7874,9 +7867,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/futex.h linux-2.6.32.38/arch/x86 |
3380 |
: "i" (-EFAULT), "r" (newval), "0" (oldval) |
3381 |
: "memory" |
3382 |
); |
3383 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/i387.h linux-2.6.32.38/arch/x86/include/asm/i387.h |
3384 |
---- linux-2.6.32.38/arch/x86/include/asm/i387.h 2011-03-27 14:31:47.000000000 -0400 |
3385 |
-+++ linux-2.6.32.38/arch/x86/include/asm/i387.h 2011-04-17 15:56:46.000000000 -0400 |
3386 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/i387.h linux-2.6.32.39/arch/x86/include/asm/i387.h |
3387 |
+--- linux-2.6.32.39/arch/x86/include/asm/i387.h 2011-03-27 14:31:47.000000000 -0400 |
3388 |
++++ linux-2.6.32.39/arch/x86/include/asm/i387.h 2011-04-17 15:56:46.000000000 -0400 |
3389 |
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc |
3390 |
{ |
3391 |
int err; |
3392 |
@@ -7926,9 +7919,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/i387.h linux-2.6.32.38/arch/x86/ |
3393 |
else |
3394 |
clts(); |
3395 |
} |
3396 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_32.h linux-2.6.32.38/arch/x86/include/asm/io_32.h |
3397 |
---- linux-2.6.32.38/arch/x86/include/asm/io_32.h 2011-03-27 14:31:47.000000000 -0400 |
3398 |
-+++ linux-2.6.32.38/arch/x86/include/asm/io_32.h 2011-04-17 15:56:46.000000000 -0400 |
3399 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_32.h linux-2.6.32.39/arch/x86/include/asm/io_32.h |
3400 |
+--- linux-2.6.32.39/arch/x86/include/asm/io_32.h 2011-03-27 14:31:47.000000000 -0400 |
3401 |
++++ linux-2.6.32.39/arch/x86/include/asm/io_32.h 2011-04-17 15:56:46.000000000 -0400 |
3402 |
@@ -3,6 +3,7 @@ |
3403 |
|
3404 |
#include <linux/string.h> |
3405 |
@@ -7955,9 +7948,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_32.h linux-2.6.32.38/arch/x86 |
3406 |
#include <asm-generic/iomap.h> |
3407 |
|
3408 |
#include <linux/vmalloc.h> |
3409 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_64.h linux-2.6.32.38/arch/x86/include/asm/io_64.h |
3410 |
---- linux-2.6.32.38/arch/x86/include/asm/io_64.h 2011-03-27 14:31:47.000000000 -0400 |
3411 |
-+++ linux-2.6.32.38/arch/x86/include/asm/io_64.h 2011-04-17 15:56:46.000000000 -0400 |
3412 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_64.h linux-2.6.32.39/arch/x86/include/asm/io_64.h |
3413 |
+--- linux-2.6.32.39/arch/x86/include/asm/io_64.h 2011-03-27 14:31:47.000000000 -0400 |
3414 |
++++ linux-2.6.32.39/arch/x86/include/asm/io_64.h 2011-04-17 15:56:46.000000000 -0400 |
3415 |
@@ -140,6 +140,17 @@ __OUTS(l) |
3416 |
|
3417 |
#include <linux/vmalloc.h> |
3418 |
@@ -7976,9 +7969,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/io_64.h linux-2.6.32.38/arch/x86 |
3419 |
#include <asm-generic/iomap.h> |
3420 |
|
3421 |
void __memcpy_fromio(void *, unsigned long, unsigned); |
3422 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/iommu.h linux-2.6.32.38/arch/x86/include/asm/iommu.h |
3423 |
---- linux-2.6.32.38/arch/x86/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400 |
3424 |
-+++ linux-2.6.32.38/arch/x86/include/asm/iommu.h 2011-04-17 15:56:46.000000000 -0400 |
3425 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/iommu.h linux-2.6.32.39/arch/x86/include/asm/iommu.h |
3426 |
+--- linux-2.6.32.39/arch/x86/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400 |
3427 |
++++ linux-2.6.32.39/arch/x86/include/asm/iommu.h 2011-04-17 15:56:46.000000000 -0400 |
3428 |
@@ -3,7 +3,7 @@ |
3429 |
|
3430 |
extern void pci_iommu_shutdown(void); |
3431 |
@@ -7988,9 +7981,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/iommu.h linux-2.6.32.38/arch/x86 |
3432 |
extern int force_iommu, no_iommu; |
3433 |
extern int iommu_detected; |
3434 |
extern int iommu_pass_through; |
3435 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/irqflags.h linux-2.6.32.38/arch/x86/include/asm/irqflags.h |
3436 |
---- linux-2.6.32.38/arch/x86/include/asm/irqflags.h 2011-03-27 14:31:47.000000000 -0400 |
3437 |
-+++ linux-2.6.32.38/arch/x86/include/asm/irqflags.h 2011-04-17 15:56:46.000000000 -0400 |
3438 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/irqflags.h linux-2.6.32.39/arch/x86/include/asm/irqflags.h |
3439 |
+--- linux-2.6.32.39/arch/x86/include/asm/irqflags.h 2011-03-27 14:31:47.000000000 -0400 |
3440 |
++++ linux-2.6.32.39/arch/x86/include/asm/irqflags.h 2011-04-17 15:56:46.000000000 -0400 |
3441 |
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ |
3442 |
sti; \ |
3443 |
sysexit |
3444 |
@@ -8003,9 +7996,28 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/irqflags.h linux-2.6.32.38/arch/ |
3445 |
#else |
3446 |
#define INTERRUPT_RETURN iret |
3447 |
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit |
3448 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/kvm_host.h linux-2.6.32.38/arch/x86/include/asm/kvm_host.h |
3449 |
---- linux-2.6.32.38/arch/x86/include/asm/kvm_host.h 2011-03-27 14:31:47.000000000 -0400 |
3450 |
-+++ linux-2.6.32.38/arch/x86/include/asm/kvm_host.h 2011-04-17 15:56:46.000000000 -0400 |
3451 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/kprobes.h linux-2.6.32.39/arch/x86/include/asm/kprobes.h |
3452 |
+--- linux-2.6.32.39/arch/x86/include/asm/kprobes.h 2011-03-27 14:31:47.000000000 -0400 |
3453 |
++++ linux-2.6.32.39/arch/x86/include/asm/kprobes.h 2011-04-23 12:56:12.000000000 -0400 |
3454 |
+@@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t; |
3455 |
+ #define BREAKPOINT_INSTRUCTION 0xcc |
3456 |
+ #define RELATIVEJUMP_INSTRUCTION 0xe9 |
3457 |
+ #define MAX_INSN_SIZE 16 |
3458 |
+-#define MAX_STACK_SIZE 64 |
3459 |
+-#define MIN_STACK_SIZE(ADDR) \ |
3460 |
+- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ |
3461 |
+- THREAD_SIZE - (unsigned long)(ADDR))) \ |
3462 |
+- ? (MAX_STACK_SIZE) \ |
3463 |
+- : (((unsigned long)current_thread_info()) + \ |
3464 |
+- THREAD_SIZE - (unsigned long)(ADDR))) |
3465 |
++#define MAX_STACK_SIZE 64UL |
3466 |
++#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR)) |
3467 |
+ |
3468 |
+ #define flush_insn_slot(p) do { } while (0) |
3469 |
+ |
3470 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/kvm_host.h linux-2.6.32.39/arch/x86/include/asm/kvm_host.h |
3471 |
+--- linux-2.6.32.39/arch/x86/include/asm/kvm_host.h 2011-03-27 14:31:47.000000000 -0400 |
3472 |
++++ linux-2.6.32.39/arch/x86/include/asm/kvm_host.h 2011-04-17 15:56:46.000000000 -0400 |
3473 |
@@ -533,7 +533,7 @@ struct kvm_x86_ops { |
3474 |
const struct trace_print_flags *exit_reasons_str; |
3475 |
}; |
3476 |
@@ -8015,9 +8027,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/kvm_host.h linux-2.6.32.38/arch/ |
3477 |
|
3478 |
int kvm_mmu_module_init(void); |
3479 |
void kvm_mmu_module_exit(void); |
3480 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/local.h linux-2.6.32.38/arch/x86/include/asm/local.h |
3481 |
---- linux-2.6.32.38/arch/x86/include/asm/local.h 2011-03-27 14:31:47.000000000 -0400 |
3482 |
-+++ linux-2.6.32.38/arch/x86/include/asm/local.h 2011-04-17 15:56:46.000000000 -0400 |
3483 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/local.h linux-2.6.32.39/arch/x86/include/asm/local.h |
3484 |
+--- linux-2.6.32.39/arch/x86/include/asm/local.h 2011-03-27 14:31:47.000000000 -0400 |
3485 |
++++ linux-2.6.32.39/arch/x86/include/asm/local.h 2011-04-17 15:56:46.000000000 -0400 |
3486 |
@@ -18,26 +18,58 @@ typedef struct { |
3487 |
|
3488 |
static inline void local_inc(local_t *l) |
3489 |
@@ -8170,23 +8182,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/local.h linux-2.6.32.38/arch/x86 |
3490 |
: "+r" (i), "+m" (l->a.counter) |
3491 |
: : "memory"); |
3492 |
return i + __i; |
3493 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.38/arch/x86/include/asm/mc146818rtc.h |
3494 |
---- linux-2.6.32.38/arch/x86/include/asm/mc146818rtc.h 2011-03-27 14:31:47.000000000 -0400 |
3495 |
-+++ linux-2.6.32.38/arch/x86/include/asm/mc146818rtc.h 2011-04-17 15:56:46.000000000 -0400 |
3496 |
-@@ -81,8 +81,8 @@ static inline unsigned char current_lock |
3497 |
- #else |
3498 |
- #define lock_cmos_prefix(reg) do {} while (0) |
3499 |
- #define lock_cmos_suffix(reg) do {} while (0) |
3500 |
--#define lock_cmos(reg) |
3501 |
--#define unlock_cmos() |
3502 |
-+#define lock_cmos(reg) do {} while (0) |
3503 |
-+#define unlock_cmos() do {} while (0) |
3504 |
- #define do_i_have_lock_cmos() 0 |
3505 |
- #define current_lock_cmos_reg() 0 |
3506 |
- #endif |
3507 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/microcode.h linux-2.6.32.38/arch/x86/include/asm/microcode.h |
3508 |
---- linux-2.6.32.38/arch/x86/include/asm/microcode.h 2011-03-27 14:31:47.000000000 -0400 |
3509 |
-+++ linux-2.6.32.38/arch/x86/include/asm/microcode.h 2011-04-17 15:56:46.000000000 -0400 |
3510 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/microcode.h linux-2.6.32.39/arch/x86/include/asm/microcode.h |
3511 |
+--- linux-2.6.32.39/arch/x86/include/asm/microcode.h 2011-03-27 14:31:47.000000000 -0400 |
3512 |
++++ linux-2.6.32.39/arch/x86/include/asm/microcode.h 2011-04-17 15:56:46.000000000 -0400 |
3513 |
@@ -12,13 +12,13 @@ struct device; |
3514 |
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; |
3515 |
|
3516 |
@@ -8227,9 +8225,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/microcode.h linux-2.6.32.38/arch |
3517 |
{ |
3518 |
return NULL; |
3519 |
} |
3520 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/mman.h linux-2.6.32.38/arch/x86/include/asm/mman.h |
3521 |
---- linux-2.6.32.38/arch/x86/include/asm/mman.h 2011-03-27 14:31:47.000000000 -0400 |
3522 |
-+++ linux-2.6.32.38/arch/x86/include/asm/mman.h 2011-04-17 15:56:46.000000000 -0400 |
3523 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/mman.h linux-2.6.32.39/arch/x86/include/asm/mman.h |
3524 |
+--- linux-2.6.32.39/arch/x86/include/asm/mman.h 2011-03-27 14:31:47.000000000 -0400 |
3525 |
++++ linux-2.6.32.39/arch/x86/include/asm/mman.h 2011-04-17 15:56:46.000000000 -0400 |
3526 |
@@ -5,4 +5,14 @@ |
3527 |
|
3528 |
#include <asm-generic/mman.h> |
3529 |
@@ -8245,9 +8243,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/mman.h linux-2.6.32.38/arch/x86/ |
3530 |
+#endif |
3531 |
+ |
3532 |
#endif /* _ASM_X86_MMAN_H */ |
3533 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/mmu_context.h linux-2.6.32.38/arch/x86/include/asm/mmu_context.h |
3534 |
---- linux-2.6.32.38/arch/x86/include/asm/mmu_context.h 2011-03-27 14:31:47.000000000 -0400 |
3535 |
-+++ linux-2.6.32.38/arch/x86/include/asm/mmu_context.h 2011-04-17 15:56:46.000000000 -0400 |
3536 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu_context.h linux-2.6.32.39/arch/x86/include/asm/mmu_context.h |
3537 |
+--- linux-2.6.32.39/arch/x86/include/asm/mmu_context.h 2011-03-27 14:31:47.000000000 -0400 |
3538 |
++++ linux-2.6.32.39/arch/x86/include/asm/mmu_context.h 2011-04-17 15:56:46.000000000 -0400 |
3539 |
@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m |
3540 |
|
3541 |
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) |
3542 |
@@ -8371,9 +8369,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/mmu_context.h linux-2.6.32.38/ar |
3543 |
} |
3544 |
|
3545 |
#define activate_mm(prev, next) \ |
3546 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/mmu.h linux-2.6.32.38/arch/x86/include/asm/mmu.h |
3547 |
---- linux-2.6.32.38/arch/x86/include/asm/mmu.h 2011-03-27 14:31:47.000000000 -0400 |
3548 |
-+++ linux-2.6.32.38/arch/x86/include/asm/mmu.h 2011-04-17 15:56:46.000000000 -0400 |
3549 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu.h linux-2.6.32.39/arch/x86/include/asm/mmu.h |
3550 |
+--- linux-2.6.32.39/arch/x86/include/asm/mmu.h 2011-03-27 14:31:47.000000000 -0400 |
3551 |
++++ linux-2.6.32.39/arch/x86/include/asm/mmu.h 2011-04-17 15:56:46.000000000 -0400 |
3552 |
@@ -9,10 +9,23 @@ |
3553 |
* we put the segment information here. |
3554 |
*/ |
3555 |
@@ -8400,45 +8398,64 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/mmu.h linux-2.6.32.38/arch/x86/i |
3556 |
} mm_context_t; |
3557 |
|
3558 |
#ifdef CONFIG_SMP |
3559 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/module.h linux-2.6.32.38/arch/x86/include/asm/module.h |
3560 |
---- linux-2.6.32.38/arch/x86/include/asm/module.h 2011-03-27 14:31:47.000000000 -0400 |
3561 |
-+++ linux-2.6.32.38/arch/x86/include/asm/module.h 2011-04-17 15:56:46.000000000 -0400 |
3562 |
-@@ -59,13 +59,31 @@ |
3563 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/module.h linux-2.6.32.39/arch/x86/include/asm/module.h |
3564 |
+--- linux-2.6.32.39/arch/x86/include/asm/module.h 2011-03-27 14:31:47.000000000 -0400 |
3565 |
++++ linux-2.6.32.39/arch/x86/include/asm/module.h 2011-04-23 13:18:57.000000000 -0400 |
3566 |
+@@ -5,6 +5,7 @@ |
3567 |
+ |
3568 |
+ #ifdef CONFIG_X86_64 |
3569 |
+ /* X86_64 does not define MODULE_PROC_FAMILY */ |
3570 |
++#define MODULE_PROC_FAMILY "" |
3571 |
+ #elif defined CONFIG_M386 |
3572 |
+ #define MODULE_PROC_FAMILY "386 " |
3573 |
+ #elif defined CONFIG_M486 |
3574 |
+@@ -59,13 +60,36 @@ |
3575 |
#error unknown processor family |
3576 |
#endif |
3577 |
|
3578 |
+-#ifdef CONFIG_X86_32 |
3579 |
+-# ifdef CONFIG_4KSTACKS |
3580 |
+-# define MODULE_STACKSIZE "4KSTACKS " |
3581 |
+-# else |
3582 |
+-# define MODULE_STACKSIZE "" |
3583 |
+-# endif |
3584 |
+-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE |
3585 |
+#ifdef CONFIG_PAX_MEMORY_UDEREF |
3586 |
+#define MODULE_PAX_UDEREF "UDEREF " |
3587 |
+#else |
3588 |
+#define MODULE_PAX_UDEREF "" |
3589 |
+#endif |
3590 |
+ |
3591 |
- #ifdef CONFIG_X86_32 |
3592 |
- # ifdef CONFIG_4KSTACKS |
3593 |
- # define MODULE_STACKSIZE "4KSTACKS " |
3594 |
- # else |
3595 |
- # define MODULE_STACKSIZE "" |
3596 |
- # endif |
3597 |
--# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE |
3598 |
-+# ifdef CONFIG_PAX_KERNEXEC |
3599 |
-+# define MODULE_PAX_KERNEXEC "KERNEXEC " |
3600 |
-+# else |
3601 |
-+# define MODULE_PAX_KERNEXEC "" |
3602 |
-+# endif |
3603 |
-+# ifdef CONFIG_GRKERNSEC |
3604 |
-+# define MODULE_GRSEC "GRSECURITY " |
3605 |
-+# else |
3606 |
-+# define MODULE_GRSEC "" |
3607 |
-+# endif |
3608 |
-+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF |
3609 |
++#ifdef CONFIG_PAX_KERNEXEC |
3610 |
++#define MODULE_PAX_KERNEXEC "KERNEXEC " |
3611 |
++#else |
3612 |
++#define MODULE_PAX_KERNEXEC "" |
3613 |
++#endif |
3614 |
++ |
3615 |
++#ifdef CONFIG_PAX_REFCOUNT |
3616 |
++#define MODULE_PAX_REFCOUNT "REFCOUNT " |
3617 |
+#else |
3618 |
-+# define MODULE_ARCH_VERMAGIC MODULE_PAX_UDEREF |
3619 |
++#define MODULE_PAX_REFCOUNT "" |
3620 |
#endif |
3621 |
|
3622 |
++#if defined(CONFIG_X86_32) && defined(CONFIG_4KSTACKS) |
3623 |
++#define MODULE_STACKSIZE "4KSTACKS " |
3624 |
++#else |
3625 |
++#define MODULE_STACKSIZE "" |
3626 |
++#endif |
3627 |
++ |
3628 |
++#ifdef CONFIG_GRKERNSEC |
3629 |
++#define MODULE_GRSEC "GRSECURITY " |
3630 |
++#else |
3631 |
++#define MODULE_GRSEC "" |
3632 |
++#endif |
3633 |
++ |
3634 |
++#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT |
3635 |
++ |
3636 |
#endif /* _ASM_X86_MODULE_H */ |
3637 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/page_64_types.h linux-2.6.32.38/arch/x86/include/asm/page_64_types.h |
3638 |
---- linux-2.6.32.38/arch/x86/include/asm/page_64_types.h 2011-03-27 14:31:47.000000000 -0400 |
3639 |
-+++ linux-2.6.32.38/arch/x86/include/asm/page_64_types.h 2011-04-17 15:56:46.000000000 -0400 |
3640 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/page_64_types.h linux-2.6.32.39/arch/x86/include/asm/page_64_types.h |
3641 |
+--- linux-2.6.32.39/arch/x86/include/asm/page_64_types.h 2011-03-27 14:31:47.000000000 -0400 |
3642 |
++++ linux-2.6.32.39/arch/x86/include/asm/page_64_types.h 2011-04-17 15:56:46.000000000 -0400 |
3643 |
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from); |
3644 |
|
3645 |
/* duplicated to the one in bootmem.h */ |
3646 |
@@ -8448,9 +8465,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/page_64_types.h linux-2.6.32.38/ |
3647 |
|
3648 |
extern unsigned long __phys_addr(unsigned long); |
3649 |
#define __phys_reloc_hide(x) (x) |
3650 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/paravirt.h linux-2.6.32.38/arch/x86/include/asm/paravirt.h |
3651 |
---- linux-2.6.32.38/arch/x86/include/asm/paravirt.h 2011-03-27 14:31:47.000000000 -0400 |
3652 |
-+++ linux-2.6.32.38/arch/x86/include/asm/paravirt.h 2011-04-17 15:56:46.000000000 -0400 |
3653 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt.h linux-2.6.32.39/arch/x86/include/asm/paravirt.h |
3654 |
+--- linux-2.6.32.39/arch/x86/include/asm/paravirt.h 2011-03-27 14:31:47.000000000 -0400 |
3655 |
++++ linux-2.6.32.39/arch/x86/include/asm/paravirt.h 2011-04-17 15:56:46.000000000 -0400 |
3656 |
@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned |
3657 |
pv_mmu_ops.set_fixmap(idx, phys, flags); |
3658 |
} |
3659 |
@@ -8504,9 +8521,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/paravirt.h linux-2.6.32.38/arch/ |
3660 |
#endif /* CONFIG_X86_32 */ |
3661 |
|
3662 |
#endif /* __ASSEMBLY__ */ |
3663 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h |
3664 |
---- linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h 2011-03-27 14:31:47.000000000 -0400 |
3665 |
-+++ linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:56:46.000000000 -0400 |
3666 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h |
3667 |
+--- linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h 2011-03-27 14:31:47.000000000 -0400 |
3668 |
++++ linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:56:46.000000000 -0400 |
3669 |
@@ -316,6 +316,12 @@ struct pv_mmu_ops { |
3670 |
an mfn. We can tell which is which from the index. */ |
3671 |
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, |
3672 |
@@ -8520,9 +8537,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/paravirt_types.h linux-2.6.32.38 |
3673 |
}; |
3674 |
|
3675 |
struct raw_spinlock; |
3676 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pci_x86.h linux-2.6.32.38/arch/x86/include/asm/pci_x86.h |
3677 |
---- linux-2.6.32.38/arch/x86/include/asm/pci_x86.h 2011-03-27 14:31:47.000000000 -0400 |
3678 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pci_x86.h 2011-04-17 15:56:46.000000000 -0400 |
3679 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pci_x86.h linux-2.6.32.39/arch/x86/include/asm/pci_x86.h |
3680 |
+--- linux-2.6.32.39/arch/x86/include/asm/pci_x86.h 2011-03-27 14:31:47.000000000 -0400 |
3681 |
++++ linux-2.6.32.39/arch/x86/include/asm/pci_x86.h 2011-04-17 15:56:46.000000000 -0400 |
3682 |
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct |
3683 |
extern void (*pcibios_disable_irq)(struct pci_dev *dev); |
3684 |
|
3685 |
@@ -8545,9 +8562,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pci_x86.h linux-2.6.32.38/arch/x |
3686 |
extern bool port_cf9_safe; |
3687 |
|
3688 |
/* arch_initcall level */ |
3689 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgalloc.h linux-2.6.32.38/arch/x86/include/asm/pgalloc.h |
3690 |
---- linux-2.6.32.38/arch/x86/include/asm/pgalloc.h 2011-03-27 14:31:47.000000000 -0400 |
3691 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgalloc.h 2011-04-17 15:56:46.000000000 -0400 |
3692 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgalloc.h linux-2.6.32.39/arch/x86/include/asm/pgalloc.h |
3693 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgalloc.h 2011-03-27 14:31:47.000000000 -0400 |
3694 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgalloc.h 2011-04-17 15:56:46.000000000 -0400 |
3695 |
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s |
3696 |
pmd_t *pmd, pte_t *pte) |
3697 |
{ |
3698 |
@@ -8562,9 +8579,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgalloc.h linux-2.6.32.38/arch/x |
3699 |
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); |
3700 |
} |
3701 |
|
3702 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h |
3703 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h 2011-03-27 14:31:47.000000000 -0400 |
3704 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:56:46.000000000 -0400 |
3705 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h |
3706 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h 2011-03-27 14:31:47.000000000 -0400 |
3707 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:56:46.000000000 -0400 |
3708 |
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t |
3709 |
|
3710 |
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
3711 |
@@ -8575,9 +8592,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.38 |
3712 |
} |
3713 |
|
3714 |
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) |
3715 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h |
3716 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400 |
3717 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400 |
3718 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h |
3719 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400 |
3720 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400 |
3721 |
@@ -26,9 +26,6 @@ |
3722 |
struct mm_struct; |
3723 |
struct vm_area_struct; |
3724 |
@@ -8621,9 +8638,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_32.h linux-2.6.32.38/arc |
3725 |
/* |
3726 |
* kern_addr_valid() is (1) for FLATMEM and (0) for |
3727 |
* SPARSEMEM and DISCONTIGMEM |
3728 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h |
3729 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h 2011-03-27 14:31:47.000000000 -0400 |
3730 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15:56:46.000000000 -0400 |
3731 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h |
3732 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h 2011-03-27 14:31:47.000000000 -0400 |
3733 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15:56:46.000000000 -0400 |
3734 |
@@ -8,7 +8,7 @@ |
3735 |
*/ |
3736 |
#ifdef CONFIG_X86_PAE |
3737 |
@@ -8653,9 +8670,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32. |
3738 |
#define MODULES_VADDR VMALLOC_START |
3739 |
#define MODULES_END VMALLOC_END |
3740 |
#define MODULES_LEN (MODULES_VADDR - MODULES_END) |
3741 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h |
3742 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h 2011-03-27 14:31:47.000000000 -0400 |
3743 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:56:46.000000000 -0400 |
3744 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h |
3745 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h 2011-03-27 14:31:47.000000000 -0400 |
3746 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:56:46.000000000 -0400 |
3747 |
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic |
3748 |
|
3749 |
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
3750 |
@@ -8673,9 +8690,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.38 |
3751 |
} |
3752 |
|
3753 |
/* |
3754 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h |
3755 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h 2011-03-27 14:31:47.000000000 -0400 |
3756 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:56:46.000000000 -0400 |
3757 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h |
3758 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h 2011-03-27 14:31:47.000000000 -0400 |
3759 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:56:46.000000000 -0400 |
3760 |
@@ -16,10 +16,13 @@ |
3761 |
|
3762 |
extern pud_t level3_kernel_pgt[512]; |
3763 |
@@ -8712,9 +8729,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_64.h linux-2.6.32.38/arc |
3764 |
} |
3765 |
|
3766 |
static inline void native_pgd_clear(pgd_t *pgd) |
3767 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h |
3768 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h 2011-03-27 14:31:47.000000000 -0400 |
3769 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15:56:46.000000000 -0400 |
3770 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h |
3771 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h 2011-03-27 14:31:47.000000000 -0400 |
3772 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15:56:46.000000000 -0400 |
3773 |
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; |
3774 |
#define MODULES_VADDR _AC(0xffffffffa0000000, UL) |
3775 |
#define MODULES_END _AC(0xffffffffff000000, UL) |
3776 |
@@ -8726,9 +8743,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32. |
3777 |
+#define ktva_ktla(addr) (addr) |
3778 |
|
3779 |
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */ |
3780 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable.h linux-2.6.32.38/arch/x86/include/asm/pgtable.h |
3781 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
3782 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable.h 2011-04-17 15:56:46.000000000 -0400 |
3783 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable.h linux-2.6.32.39/arch/x86/include/asm/pgtable.h |
3784 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
3785 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable.h 2011-04-17 15:56:46.000000000 -0400 |
3786 |
@@ -74,12 +74,51 @@ extern struct list_head pgd_list; |
3787 |
|
3788 |
#define arch_end_context_switch(prev) do {} while(0) |
3789 |
@@ -8898,9 +8915,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable.h linux-2.6.32.38/arch/x |
3790 |
|
3791 |
#include <asm-generic/pgtable.h> |
3792 |
#endif /* __ASSEMBLY__ */ |
3793 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h |
3794 |
---- linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h 2011-03-27 14:31:47.000000000 -0400 |
3795 |
-+++ linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:56:46.000000000 -0400 |
3796 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h |
3797 |
+--- linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h 2011-03-27 14:31:47.000000000 -0400 |
3798 |
++++ linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:56:46.000000000 -0400 |
3799 |
@@ -16,12 +16,11 @@ |
3800 |
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ |
3801 |
#define _PAGE_BIT_PAT 7 /* on 4KB pages */ |
3802 |
@@ -9021,9 +9038,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/pgtable_types.h linux-2.6.32.38/ |
3803 |
|
3804 |
#define pgprot_writecombine pgprot_writecombine |
3805 |
extern pgprot_t pgprot_writecombine(pgprot_t prot); |
3806 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/processor.h linux-2.6.32.38/arch/x86/include/asm/processor.h |
3807 |
---- linux-2.6.32.38/arch/x86/include/asm/processor.h 2011-03-27 14:31:47.000000000 -0400 |
3808 |
-+++ linux-2.6.32.38/arch/x86/include/asm/processor.h 2011-04-17 15:56:46.000000000 -0400 |
3809 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/processor.h linux-2.6.32.39/arch/x86/include/asm/processor.h |
3810 |
+--- linux-2.6.32.39/arch/x86/include/asm/processor.h 2011-04-22 19:16:29.000000000 -0400 |
3811 |
++++ linux-2.6.32.39/arch/x86/include/asm/processor.h 2011-04-23 12:56:10.000000000 -0400 |
3812 |
@@ -272,7 +272,7 @@ struct tss_struct { |
3813 |
|
3814 |
} ____cacheline_aligned; |
3815 |
@@ -9068,7 +9085,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/processor.h linux-2.6.32.38/arch |
3816 |
- unsigned long *__ptr = (unsigned long *)(info); \ |
3817 |
- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \ |
3818 |
-}) |
3819 |
-+#define KSTK_TOP(info) ((info)->task.thread.sp0) |
3820 |
++#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0) |
3821 |
|
3822 |
/* |
3823 |
* The below -8 is to reserve 8 bytes on top of the ring0 stack. |
3824 |
@@ -9108,9 +9125,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/processor.h linux-2.6.32.38/arch |
3825 |
#define KSTK_EIP(task) (task_pt_regs(task)->ip) |
3826 |
|
3827 |
/* Get/set a process' ability to use the timestamp counter instruction */ |
3828 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/ptrace.h linux-2.6.32.38/arch/x86/include/asm/ptrace.h |
3829 |
---- linux-2.6.32.38/arch/x86/include/asm/ptrace.h 2011-03-27 14:31:47.000000000 -0400 |
3830 |
-+++ linux-2.6.32.38/arch/x86/include/asm/ptrace.h 2011-04-17 15:56:46.000000000 -0400 |
3831 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/ptrace.h linux-2.6.32.39/arch/x86/include/asm/ptrace.h |
3832 |
+--- linux-2.6.32.39/arch/x86/include/asm/ptrace.h 2011-03-27 14:31:47.000000000 -0400 |
3833 |
++++ linux-2.6.32.39/arch/x86/include/asm/ptrace.h 2011-04-17 15:56:46.000000000 -0400 |
3834 |
@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ |
3835 |
} |
3836 |
|
3837 |
@@ -9147,9 +9164,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/ptrace.h linux-2.6.32.38/arch/x8 |
3838 |
#endif |
3839 |
} |
3840 |
|
3841 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/reboot.h linux-2.6.32.38/arch/x86/include/asm/reboot.h |
3842 |
---- linux-2.6.32.38/arch/x86/include/asm/reboot.h 2011-03-27 14:31:47.000000000 -0400 |
3843 |
-+++ linux-2.6.32.38/arch/x86/include/asm/reboot.h 2011-04-17 15:56:46.000000000 -0400 |
3844 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/reboot.h linux-2.6.32.39/arch/x86/include/asm/reboot.h |
3845 |
+--- linux-2.6.32.39/arch/x86/include/asm/reboot.h 2011-03-27 14:31:47.000000000 -0400 |
3846 |
++++ linux-2.6.32.39/arch/x86/include/asm/reboot.h 2011-04-17 15:56:46.000000000 -0400 |
3847 |
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; |
3848 |
|
3849 |
void native_machine_crash_shutdown(struct pt_regs *regs); |
3850 |
@@ -9159,9 +9176,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/reboot.h linux-2.6.32.38/arch/x8 |
3851 |
|
3852 |
typedef void (*nmi_shootdown_cb)(int, struct die_args*); |
3853 |
void nmi_shootdown_cpus(nmi_shootdown_cb callback); |
3854 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/rwsem.h linux-2.6.32.38/arch/x86/include/asm/rwsem.h |
3855 |
---- linux-2.6.32.38/arch/x86/include/asm/rwsem.h 2011-03-27 14:31:47.000000000 -0400 |
3856 |
-+++ linux-2.6.32.38/arch/x86/include/asm/rwsem.h 2011-04-17 15:56:46.000000000 -0400 |
3857 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/rwsem.h linux-2.6.32.39/arch/x86/include/asm/rwsem.h |
3858 |
+--- linux-2.6.32.39/arch/x86/include/asm/rwsem.h 2011-03-27 14:31:47.000000000 -0400 |
3859 |
++++ linux-2.6.32.39/arch/x86/include/asm/rwsem.h 2011-04-17 15:56:46.000000000 -0400 |
3860 |
@@ -118,6 +118,14 @@ static inline void __down_read(struct rw |
3861 |
{ |
3862 |
asm volatile("# beginning down_read\n\t" |
3863 |
@@ -9286,9 +9303,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/rwsem.h linux-2.6.32.38/arch/x86 |
3864 |
: "+r" (tmp), "+m" (sem->count) |
3865 |
: : "memory"); |
3866 |
|
3867 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/segment.h linux-2.6.32.38/arch/x86/include/asm/segment.h |
3868 |
---- linux-2.6.32.38/arch/x86/include/asm/segment.h 2011-03-27 14:31:47.000000000 -0400 |
3869 |
-+++ linux-2.6.32.38/arch/x86/include/asm/segment.h 2011-04-17 15:56:46.000000000 -0400 |
3870 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/segment.h linux-2.6.32.39/arch/x86/include/asm/segment.h |
3871 |
+--- linux-2.6.32.39/arch/x86/include/asm/segment.h 2011-03-27 14:31:47.000000000 -0400 |
3872 |
++++ linux-2.6.32.39/arch/x86/include/asm/segment.h 2011-04-17 15:56:46.000000000 -0400 |
3873 |
@@ -62,8 +62,8 @@ |
3874 |
* 26 - ESPFIX small SS |
3875 |
* 27 - per-cpu [ offset to per-cpu data area ] |
3876 |
@@ -9357,9 +9374,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/segment.h linux-2.6.32.38/arch/x |
3877 |
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) |
3878 |
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) |
3879 |
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) |
3880 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/smp.h linux-2.6.32.38/arch/x86/include/asm/smp.h |
3881 |
---- linux-2.6.32.38/arch/x86/include/asm/smp.h 2011-03-27 14:31:47.000000000 -0400 |
3882 |
-+++ linux-2.6.32.38/arch/x86/include/asm/smp.h 2011-04-17 15:56:46.000000000 -0400 |
3883 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/smp.h linux-2.6.32.39/arch/x86/include/asm/smp.h |
3884 |
+--- linux-2.6.32.39/arch/x86/include/asm/smp.h 2011-03-27 14:31:47.000000000 -0400 |
3885 |
++++ linux-2.6.32.39/arch/x86/include/asm/smp.h 2011-04-17 15:56:46.000000000 -0400 |
3886 |
@@ -24,7 +24,7 @@ extern unsigned int num_processors; |
3887 |
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); |
3888 |
DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); |
3889 |
@@ -9386,9 +9403,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/smp.h linux-2.6.32.38/arch/x86/i |
3890 |
#define safe_smp_processor_id() smp_processor_id() |
3891 |
|
3892 |
#endif |
3893 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/spinlock.h linux-2.6.32.38/arch/x86/include/asm/spinlock.h |
3894 |
---- linux-2.6.32.38/arch/x86/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400 |
3895 |
-+++ linux-2.6.32.38/arch/x86/include/asm/spinlock.h 2011-04-17 15:56:46.000000000 -0400 |
3896 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/spinlock.h linux-2.6.32.39/arch/x86/include/asm/spinlock.h |
3897 |
+--- linux-2.6.32.39/arch/x86/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400 |
3898 |
++++ linux-2.6.32.39/arch/x86/include/asm/spinlock.h 2011-04-17 15:56:46.000000000 -0400 |
3899 |
@@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r |
3900 |
static inline void __raw_read_lock(raw_rwlock_t *rw) |
3901 |
{ |
3902 |
@@ -9451,9 +9468,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/spinlock.h linux-2.6.32.38/arch/ |
3903 |
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); |
3904 |
} |
3905 |
|
3906 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/stackprotector.h linux-2.6.32.38/arch/x86/include/asm/stackprotector.h |
3907 |
---- linux-2.6.32.38/arch/x86/include/asm/stackprotector.h 2011-03-27 14:31:47.000000000 -0400 |
3908 |
-+++ linux-2.6.32.38/arch/x86/include/asm/stackprotector.h 2011-04-17 15:56:46.000000000 -0400 |
3909 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/stackprotector.h linux-2.6.32.39/arch/x86/include/asm/stackprotector.h |
3910 |
+--- linux-2.6.32.39/arch/x86/include/asm/stackprotector.h 2011-03-27 14:31:47.000000000 -0400 |
3911 |
++++ linux-2.6.32.39/arch/x86/include/asm/stackprotector.h 2011-04-17 15:56:46.000000000 -0400 |
3912 |
@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se |
3913 |
|
3914 |
static inline void load_stack_canary_segment(void) |
3915 |
@@ -9463,9 +9480,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/stackprotector.h linux-2.6.32.38 |
3916 |
asm volatile ("mov %0, %%gs" : : "r" (0)); |
3917 |
#endif |
3918 |
} |
3919 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/system.h linux-2.6.32.38/arch/x86/include/asm/system.h |
3920 |
---- linux-2.6.32.38/arch/x86/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
3921 |
-+++ linux-2.6.32.38/arch/x86/include/asm/system.h 2011-04-17 15:56:46.000000000 -0400 |
3922 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/system.h linux-2.6.32.39/arch/x86/include/asm/system.h |
3923 |
+--- linux-2.6.32.39/arch/x86/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 |
3924 |
++++ linux-2.6.32.39/arch/x86/include/asm/system.h 2011-04-17 15:56:46.000000000 -0400 |
3925 |
@@ -132,7 +132,7 @@ do { \ |
3926 |
"thread_return:\n\t" \ |
3927 |
"movq "__percpu_arg([current_task])",%%rsi\n\t" \ |
3928 |
@@ -9502,9 +9519,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/system.h linux-2.6.32.38/arch/x8 |
3929 |
extern void free_init_pages(char *what, unsigned long begin, unsigned long end); |
3930 |
|
3931 |
void default_idle(void); |
3932 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/thread_info.h linux-2.6.32.38/arch/x86/include/asm/thread_info.h |
3933 |
---- linux-2.6.32.38/arch/x86/include/asm/thread_info.h 2011-03-27 14:31:47.000000000 -0400 |
3934 |
-+++ linux-2.6.32.38/arch/x86/include/asm/thread_info.h 2011-04-17 15:56:46.000000000 -0400 |
3935 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/thread_info.h linux-2.6.32.39/arch/x86/include/asm/thread_info.h |
3936 |
+--- linux-2.6.32.39/arch/x86/include/asm/thread_info.h 2011-03-27 14:31:47.000000000 -0400 |
3937 |
++++ linux-2.6.32.39/arch/x86/include/asm/thread_info.h 2011-04-23 13:24:42.000000000 -0400 |
3938 |
@@ -10,6 +10,7 @@ |
3939 |
#include <linux/compiler.h> |
3940 |
#include <asm/page.h> |
3941 |
@@ -9556,7 +9573,7 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/thread_info.h linux-2.6.32.38/ar |
3942 |
|
3943 |
+#ifdef __ASSEMBLY__ |
3944 |
+/* how to get the thread information struct from ASM */ |
3945 |
-+#define GET_THREAD_INFO(reg) \ |
3946 |
++#define GET_THREAD_INFO(reg) \ |
3947 |
+ mov PER_CPU_VAR(current_tinfo), reg |
3948 |
+ |
3949 |
+/* use this one if reg already contains %esp */ |
3950 |
@@ -9638,8 +9655,8 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/thread_info.h linux-2.6.32.38/ar |
3951 |
#define arch_task_cache_init arch_task_cache_init |
3952 |
+ |
3953 |
+#define __HAVE_THREAD_FUNCTIONS |
3954 |
-+#define task_thread_info(task) (&(task)->tinfo) |
3955 |
-+#define task_stack_page(task) ((task)->stack) |
3956 |
++#define task_thread_info(task) (&(task)->tinfo) |
3957 |
++#define task_stack_page(task) ((task)->stack) |
3958 |
+#define setup_thread_stack(p, org) do {} while (0) |
3959 |
+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1) |
3960 |
+ |
3961 |
@@ -9649,9 +9666,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/thread_info.h linux-2.6.32.38/ar |
3962 |
+ |
3963 |
#endif |
3964 |
#endif /* _ASM_X86_THREAD_INFO_H */ |
3965 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h |
3966 |
---- linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400 |
3967 |
-+++ linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:56:46.000000000 -0400 |
3968 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h |
3969 |
+--- linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400 |
3970 |
++++ linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:56:46.000000000 -0400 |
3971 |
@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u |
3972 |
static __always_inline unsigned long __must_check |
3973 |
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) |
3974 |
@@ -9781,9 +9798,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess_32.h linux-2.6.32.38/arc |
3975 |
long __must_check strncpy_from_user(char *dst, const char __user *src, |
3976 |
long count); |
3977 |
long __must_check __strncpy_from_user(char *dst, |
3978 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h |
3979 |
---- linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400 |
3980 |
-+++ linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:56:46.000000000 -0400 |
3981 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h |
3982 |
+--- linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400 |
3983 |
++++ linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:56:46.000000000 -0400 |
3984 |
@@ -9,6 +9,9 @@ |
3985 |
#include <linux/prefetch.h> |
3986 |
#include <linux/lockdep.h> |
3987 |
@@ -10129,9 +10146,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess_64.h linux-2.6.32.38/arc |
3988 |
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); |
3989 |
|
3990 |
#endif /* _ASM_X86_UACCESS_64_H */ |
3991 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess.h linux-2.6.32.38/arch/x86/include/asm/uaccess.h |
3992 |
---- linux-2.6.32.38/arch/x86/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
3993 |
-+++ linux-2.6.32.38/arch/x86/include/asm/uaccess.h 2011-04-17 15:56:46.000000000 -0400 |
3994 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess.h linux-2.6.32.39/arch/x86/include/asm/uaccess.h |
3995 |
+--- linux-2.6.32.39/arch/x86/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
3996 |
++++ linux-2.6.32.39/arch/x86/include/asm/uaccess.h 2011-04-17 15:56:46.000000000 -0400 |
3997 |
@@ -8,12 +8,15 @@ |
3998 |
#include <linux/thread_info.h> |
3999 |
#include <linux/prefetch.h> |
4000 |
@@ -10350,9 +10367,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/uaccess.h linux-2.6.32.38/arch/x |
4001 |
#ifdef CONFIG_X86_32 |
4002 |
# include "uaccess_32.h" |
4003 |
#else |
4004 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/vgtod.h linux-2.6.32.38/arch/x86/include/asm/vgtod.h |
4005 |
---- linux-2.6.32.38/arch/x86/include/asm/vgtod.h 2011-03-27 14:31:47.000000000 -0400 |
4006 |
-+++ linux-2.6.32.38/arch/x86/include/asm/vgtod.h 2011-04-17 15:56:46.000000000 -0400 |
4007 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/vgtod.h linux-2.6.32.39/arch/x86/include/asm/vgtod.h |
4008 |
+--- linux-2.6.32.39/arch/x86/include/asm/vgtod.h 2011-03-27 14:31:47.000000000 -0400 |
4009 |
++++ linux-2.6.32.39/arch/x86/include/asm/vgtod.h 2011-04-17 15:56:46.000000000 -0400 |
4010 |
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { |
4011 |
int sysctl_enabled; |
4012 |
struct timezone sys_tz; |
4013 |
@@ -10361,9 +10378,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/vgtod.h linux-2.6.32.38/arch/x86 |
4014 |
cycle_t (*vread)(void); |
4015 |
cycle_t cycle_last; |
4016 |
cycle_t mask; |
4017 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/vmi.h linux-2.6.32.38/arch/x86/include/asm/vmi.h |
4018 |
---- linux-2.6.32.38/arch/x86/include/asm/vmi.h 2011-03-27 14:31:47.000000000 -0400 |
4019 |
-+++ linux-2.6.32.38/arch/x86/include/asm/vmi.h 2011-04-17 15:56:46.000000000 -0400 |
4020 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/vmi.h linux-2.6.32.39/arch/x86/include/asm/vmi.h |
4021 |
+--- linux-2.6.32.39/arch/x86/include/asm/vmi.h 2011-03-27 14:31:47.000000000 -0400 |
4022 |
++++ linux-2.6.32.39/arch/x86/include/asm/vmi.h 2011-04-17 15:56:46.000000000 -0400 |
4023 |
@@ -191,6 +191,7 @@ struct vrom_header { |
4024 |
u8 reserved[96]; /* Reserved for headers */ |
4025 |
char vmi_init[8]; /* VMI_Init jump point */ |
4026 |
@@ -10372,9 +10389,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/vmi.h linux-2.6.32.38/arch/x86/i |
4027 |
} __attribute__((packed)); |
4028 |
|
4029 |
struct pnp_header { |
4030 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/vsyscall.h linux-2.6.32.38/arch/x86/include/asm/vsyscall.h |
4031 |
---- linux-2.6.32.38/arch/x86/include/asm/vsyscall.h 2011-03-27 14:31:47.000000000 -0400 |
4032 |
-+++ linux-2.6.32.38/arch/x86/include/asm/vsyscall.h 2011-04-17 15:56:46.000000000 -0400 |
4033 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/vsyscall.h linux-2.6.32.39/arch/x86/include/asm/vsyscall.h |
4034 |
+--- linux-2.6.32.39/arch/x86/include/asm/vsyscall.h 2011-03-27 14:31:47.000000000 -0400 |
4035 |
++++ linux-2.6.32.39/arch/x86/include/asm/vsyscall.h 2011-04-17 15:56:46.000000000 -0400 |
4036 |
@@ -15,9 +15,10 @@ enum vsyscall_num { |
4037 |
|
4038 |
#ifdef __KERNEL__ |
4039 |
@@ -10405,9 +10422,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/vsyscall.h linux-2.6.32.38/arch/ |
4040 |
#endif /* __KERNEL__ */ |
4041 |
|
4042 |
#endif /* _ASM_X86_VSYSCALL_H */ |
4043 |
-diff -urNp linux-2.6.32.38/arch/x86/include/asm/xsave.h linux-2.6.32.38/arch/x86/include/asm/xsave.h |
4044 |
---- linux-2.6.32.38/arch/x86/include/asm/xsave.h 2011-03-27 14:31:47.000000000 -0400 |
4045 |
-+++ linux-2.6.32.38/arch/x86/include/asm/xsave.h 2011-04-17 15:56:46.000000000 -0400 |
4046 |
+diff -urNp linux-2.6.32.39/arch/x86/include/asm/xsave.h linux-2.6.32.39/arch/x86/include/asm/xsave.h |
4047 |
+--- linux-2.6.32.39/arch/x86/include/asm/xsave.h 2011-03-27 14:31:47.000000000 -0400 |
4048 |
++++ linux-2.6.32.39/arch/x86/include/asm/xsave.h 2011-04-17 15:56:46.000000000 -0400 |
4049 |
@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct |
4050 |
static inline int xsave_user(struct xsave_struct __user *buf) |
4051 |
{ |
4052 |
@@ -10433,9 +10450,9 @@ diff -urNp linux-2.6.32.38/arch/x86/include/asm/xsave.h linux-2.6.32.38/arch/x86 |
4053 |
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" |
4054 |
"2:\n" |
4055 |
".section .fixup,\"ax\"\n" |
4056 |
-diff -urNp linux-2.6.32.38/arch/x86/Kconfig linux-2.6.32.38/arch/x86/Kconfig |
4057 |
---- linux-2.6.32.38/arch/x86/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
4058 |
-+++ linux-2.6.32.38/arch/x86/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
4059 |
+diff -urNp linux-2.6.32.39/arch/x86/Kconfig linux-2.6.32.39/arch/x86/Kconfig |
4060 |
+--- linux-2.6.32.39/arch/x86/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
4061 |
++++ linux-2.6.32.39/arch/x86/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
4062 |
@@ -223,7 +223,7 @@ config X86_TRAMPOLINE |
4063 |
|
4064 |
config X86_32_LAZY_GS |
4065 |
@@ -10517,9 +10534,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Kconfig linux-2.6.32.38/arch/x86/Kconfig |
4066 |
---help--- |
4067 |
Map the 32-bit VDSO to the predictable old-style address too. |
4068 |
---help--- |
4069 |
-diff -urNp linux-2.6.32.38/arch/x86/Kconfig.cpu linux-2.6.32.38/arch/x86/Kconfig.cpu |
4070 |
---- linux-2.6.32.38/arch/x86/Kconfig.cpu 2011-03-27 14:31:47.000000000 -0400 |
4071 |
-+++ linux-2.6.32.38/arch/x86/Kconfig.cpu 2011-04-17 15:56:46.000000000 -0400 |
4072 |
+diff -urNp linux-2.6.32.39/arch/x86/Kconfig.cpu linux-2.6.32.39/arch/x86/Kconfig.cpu |
4073 |
+--- linux-2.6.32.39/arch/x86/Kconfig.cpu 2011-03-27 14:31:47.000000000 -0400 |
4074 |
++++ linux-2.6.32.39/arch/x86/Kconfig.cpu 2011-04-17 15:56:46.000000000 -0400 |
4075 |
@@ -340,7 +340,7 @@ config X86_PPRO_FENCE |
4076 |
|
4077 |
config X86_F00F_BUG |
4078 |
@@ -10547,9 +10564,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Kconfig.cpu linux-2.6.32.38/arch/x86/Kconfig |
4079 |
|
4080 |
config X86_MINIMUM_CPU_FAMILY |
4081 |
int |
4082 |
-diff -urNp linux-2.6.32.38/arch/x86/Kconfig.debug linux-2.6.32.38/arch/x86/Kconfig.debug |
4083 |
---- linux-2.6.32.38/arch/x86/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400 |
4084 |
-+++ linux-2.6.32.38/arch/x86/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400 |
4085 |
+diff -urNp linux-2.6.32.39/arch/x86/Kconfig.debug linux-2.6.32.39/arch/x86/Kconfig.debug |
4086 |
+--- linux-2.6.32.39/arch/x86/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400 |
4087 |
++++ linux-2.6.32.39/arch/x86/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400 |
4088 |
@@ -99,7 +99,7 @@ config X86_PTDUMP |
4089 |
config DEBUG_RODATA |
4090 |
bool "Write protect kernel read-only data structures" |
4091 |
@@ -10559,21 +10576,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Kconfig.debug linux-2.6.32.38/arch/x86/Kconf |
4092 |
---help--- |
4093 |
Mark the kernel read-only data as write-protected in the pagetables, |
4094 |
in order to catch accidental (and incorrect) writes to such const |
4095 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/boot.c linux-2.6.32.38/arch/x86/kernel/acpi/boot.c |
4096 |
---- linux-2.6.32.38/arch/x86/kernel/acpi/boot.c 2011-03-27 14:31:47.000000000 -0400 |
4097 |
-+++ linux-2.6.32.38/arch/x86/kernel/acpi/boot.c 2011-04-17 15:56:46.000000000 -0400 |
4098 |
-@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a |
4099 |
- DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), |
4100 |
- }, |
4101 |
- }, |
4102 |
-- {} |
4103 |
-+ { NULL, NULL, {{0, {0}}}, NULL} |
4104 |
- }; |
4105 |
- |
4106 |
- /* |
4107 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S |
4108 |
---- linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S 2011-03-27 14:31:47.000000000 -0400 |
4109 |
-+++ linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S 2011-04-17 15:56:46.000000000 -0400 |
4110 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S |
4111 |
+--- linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S 2011-03-27 14:31:47.000000000 -0400 |
4112 |
++++ linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S 2011-04-17 15:56:46.000000000 -0400 |
4113 |
@@ -104,7 +104,7 @@ _start: |
4114 |
movl %eax, %ecx |
4115 |
orl %edx, %ecx |
4116 |
@@ -10583,9 +10588,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.3 |
4117 |
wrmsr |
4118 |
1: |
4119 |
|
4120 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c |
4121 |
---- linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400 |
4122 |
-+++ linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:56:46.000000000 -0400 |
4123 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c |
4124 |
+--- linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400 |
4125 |
++++ linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:56:46.000000000 -0400 |
4126 |
@@ -11,11 +11,12 @@ |
4127 |
#include <linux/cpumask.h> |
4128 |
#include <asm/segment.h> |
4129 |
@@ -10630,9 +10635,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/sleep.c linux-2.6.32.38/arch/x86 |
4130 |
} |
4131 |
|
4132 |
|
4133 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S |
4134 |
---- linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S 2011-03-27 14:31:47.000000000 -0400 |
4135 |
-+++ linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:56:46.000000000 -0400 |
4136 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S |
4137 |
+--- linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S 2011-03-27 14:31:47.000000000 -0400 |
4138 |
++++ linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:56:46.000000000 -0400 |
4139 |
@@ -30,13 +30,11 @@ wakeup_pmode_return: |
4140 |
# and restore the stack ... but you need gdt for this to work |
4141 |
movl saved_context_esp, %esp |
4142 |
@@ -10649,9 +10654,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.38/arch |
4143 |
|
4144 |
bogus_magic: |
4145 |
jmp bogus_magic |
4146 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/alternative.c linux-2.6.32.38/arch/x86/kernel/alternative.c |
4147 |
---- linux-2.6.32.38/arch/x86/kernel/alternative.c 2011-03-27 14:31:47.000000000 -0400 |
4148 |
-+++ linux-2.6.32.38/arch/x86/kernel/alternative.c 2011-04-17 15:56:46.000000000 -0400 |
4149 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/alternative.c linux-2.6.32.39/arch/x86/kernel/alternative.c |
4150 |
+--- linux-2.6.32.39/arch/x86/kernel/alternative.c 2011-03-27 14:31:47.000000000 -0400 |
4151 |
++++ linux-2.6.32.39/arch/x86/kernel/alternative.c 2011-04-17 15:56:46.000000000 -0400 |
4152 |
@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str |
4153 |
|
4154 |
BUG_ON(p->len > MAX_PATCH_LEN); |
4155 |
@@ -10734,9 +10739,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/alternative.c linux-2.6.32.38/arch/x8 |
4156 |
+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]); |
4157 |
return addr; |
4158 |
} |
4159 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/amd_iommu.c linux-2.6.32.38/arch/x86/kernel/amd_iommu.c |
4160 |
---- linux-2.6.32.38/arch/x86/kernel/amd_iommu.c 2011-03-27 14:31:47.000000000 -0400 |
4161 |
-+++ linux-2.6.32.38/arch/x86/kernel/amd_iommu.c 2011-04-17 15:56:46.000000000 -0400 |
4162 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/amd_iommu.c linux-2.6.32.39/arch/x86/kernel/amd_iommu.c |
4163 |
+--- linux-2.6.32.39/arch/x86/kernel/amd_iommu.c 2011-03-27 14:31:47.000000000 -0400 |
4164 |
++++ linux-2.6.32.39/arch/x86/kernel/amd_iommu.c 2011-04-17 15:56:46.000000000 -0400 |
4165 |
@@ -2076,7 +2076,7 @@ static void prealloc_protection_domains( |
4166 |
} |
4167 |
} |
4168 |
@@ -10746,9 +10751,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/amd_iommu.c linux-2.6.32.38/arch/x86/ |
4169 |
.alloc_coherent = alloc_coherent, |
4170 |
.free_coherent = free_coherent, |
4171 |
.map_page = map_page, |
4172 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c |
4173 |
---- linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c 2011-03-27 14:31:47.000000000 -0400 |
4174 |
-+++ linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:56:46.000000000 -0400 |
4175 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c |
4176 |
+--- linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c 2011-03-27 14:31:47.000000000 -0400 |
4177 |
++++ linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:56:46.000000000 -0400 |
4178 |
@@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi |
4179 |
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, |
4180 |
GFP_ATOMIC); |
4181 |
@@ -10785,9 +10790,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/apic/io_apic.c linux-2.6.32.38/arch/x |
4182 |
{ |
4183 |
spin_unlock(&vector_lock); |
4184 |
} |
4185 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/apm_32.c linux-2.6.32.38/arch/x86/kernel/apm_32.c |
4186 |
---- linux-2.6.32.38/arch/x86/kernel/apm_32.c 2011-03-27 14:31:47.000000000 -0400 |
4187 |
-+++ linux-2.6.32.38/arch/x86/kernel/apm_32.c 2011-04-17 15:56:46.000000000 -0400 |
4188 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/apm_32.c linux-2.6.32.39/arch/x86/kernel/apm_32.c |
4189 |
+--- linux-2.6.32.39/arch/x86/kernel/apm_32.c 2011-03-27 14:31:47.000000000 -0400 |
4190 |
++++ linux-2.6.32.39/arch/x86/kernel/apm_32.c 2011-04-23 12:56:10.000000000 -0400 |
4191 |
@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); |
4192 |
* This is for buggy BIOS's that refer to (real mode) segment 0x40 |
4193 |
* even though they are called in protected mode. |
4194 |
@@ -10852,28 +10857,7 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/apm_32.c linux-2.6.32.38/arch/x86/ker |
4195 |
0xb8, 0x00, 0x10, /* movw $0x1000,ax */ |
4196 |
0x8e, 0xd0, /* movw ax,ss */ |
4197 |
0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ |
4198 |
-@@ -1933,7 +1947,10 @@ static const struct file_operations apm_ |
4199 |
- static struct miscdevice apm_device = { |
4200 |
- APM_MINOR_DEV, |
4201 |
- "apm_bios", |
4202 |
-- &apm_bios_fops |
4203 |
-+ &apm_bios_fops, |
4204 |
-+ {NULL, NULL}, |
4205 |
-+ NULL, |
4206 |
-+ NULL |
4207 |
- }; |
4208 |
- |
4209 |
- |
4210 |
-@@ -2254,7 +2271,7 @@ static struct dmi_system_id __initdata a |
4211 |
- { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, |
4212 |
- }, |
4213 |
- |
4214 |
-- { } |
4215 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} |
4216 |
- }; |
4217 |
- |
4218 |
- /* |
4219 |
-@@ -2357,12 +2374,15 @@ static int __init apm_init(void) |
4220 |
+@@ -2357,12 +2371,15 @@ static int __init apm_init(void) |
4221 |
* code to that CPU. |
4222 |
*/ |
4223 |
gdt = get_cpu_gdt_table(0); |
4224 |
@@ -10889,9 +10873,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/apm_32.c linux-2.6.32.38/arch/x86/ker |
4225 |
|
4226 |
proc_create("apm", 0, NULL, &apm_file_ops); |
4227 |
|
4228 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c |
4229 |
---- linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c 2011-03-27 14:31:47.000000000 -0400 |
4230 |
-+++ linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:56:46.000000000 -0400 |
4231 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c |
4232 |
+--- linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c 2011-03-27 14:31:47.000000000 -0400 |
4233 |
++++ linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:56:46.000000000 -0400 |
4234 |
@@ -51,7 +51,6 @@ void foo(void) |
4235 |
OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); |
4236 |
BLANK(); |
4237 |
@@ -10912,9 +10896,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.38/arch |
4238 |
#endif |
4239 |
|
4240 |
#ifdef CONFIG_XEN |
4241 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c |
4242 |
---- linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c 2011-03-27 14:31:47.000000000 -0400 |
4243 |
-+++ linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:56:46.000000000 -0400 |
4244 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c |
4245 |
+--- linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c 2011-03-27 14:31:47.000000000 -0400 |
4246 |
++++ linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:56:46.000000000 -0400 |
4247 |
@@ -63,6 +63,18 @@ int main(void) |
4248 |
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); |
4249 |
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); |
4250 |
@@ -10942,10 +10926,10 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.38/arch |
4251 |
DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); |
4252 |
BLANK(); |
4253 |
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); |
4254 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/amd.c linux-2.6.32.38/arch/x86/kernel/cpu/amd.c |
4255 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/amd.c 2011-03-27 14:31:47.000000000 -0400 |
4256 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/amd.c 2011-04-17 15:56:46.000000000 -0400 |
4257 |
-@@ -573,7 +573,7 @@ static unsigned int __cpuinit amd_size_c |
4258 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/amd.c linux-2.6.32.39/arch/x86/kernel/cpu/amd.c |
4259 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/amd.c 2011-04-22 19:16:29.000000000 -0400 |
4260 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/amd.c 2011-04-22 19:16:41.000000000 -0400 |
4261 |
+@@ -596,7 +596,7 @@ static unsigned int __cpuinit amd_size_c |
4262 |
unsigned int size) |
4263 |
{ |
4264 |
/* AMD errata T13 (order #21922) */ |
4265 |
@@ -10954,9 +10938,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/amd.c linux-2.6.32.38/arch/x86/ke |
4266 |
/* Duron Rev A0 */ |
4267 |
if (c->x86_model == 3 && c->x86_mask == 0) |
4268 |
size = 64; |
4269 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/common.c linux-2.6.32.38/arch/x86/kernel/cpu/common.c |
4270 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/common.c 2011-03-27 14:31:47.000000000 -0400 |
4271 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/common.c 2011-04-17 15:56:46.000000000 -0400 |
4272 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/common.c linux-2.6.32.39/arch/x86/kernel/cpu/common.c |
4273 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/common.c 2011-03-27 14:31:47.000000000 -0400 |
4274 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/common.c 2011-04-17 15:56:46.000000000 -0400 |
4275 |
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon |
4276 |
|
4277 |
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; |
4278 |
@@ -11101,33 +11085,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/common.c linux-2.6.32.38/arch/x86 |
4279 |
struct thread_struct *thread = &curr->thread; |
4280 |
|
4281 |
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { |
4282 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c |
4283 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-27 14:31:47.000000000 -0400 |
4284 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-04-17 15:56:46.000000000 -0400 |
4285 |
-@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any |
4286 |
- DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), |
4287 |
- }, |
4288 |
- }, |
4289 |
-- { } |
4290 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
4291 |
- }; |
4292 |
- |
4293 |
- static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) |
4294 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c |
4295 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-03-27 14:31:47.000000000 -0400 |
4296 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-04-17 15:56:46.000000000 -0400 |
4297 |
-@@ -225,7 +225,7 @@ static struct cpu_model models[] = |
4298 |
- { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, |
4299 |
- { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, |
4300 |
- |
4301 |
-- { NULL, } |
4302 |
-+ { NULL, NULL, 0, NULL} |
4303 |
- }; |
4304 |
- #undef _BANIAS |
4305 |
- #undef BANIAS |
4306 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/intel.c linux-2.6.32.38/arch/x86/kernel/cpu/intel.c |
4307 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/intel.c 2011-03-27 14:31:47.000000000 -0400 |
4308 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/intel.c 2011-04-17 15:56:46.000000000 -0400 |
4309 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel.c linux-2.6.32.39/arch/x86/kernel/cpu/intel.c |
4310 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/intel.c 2011-03-27 14:31:47.000000000 -0400 |
4311 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/intel.c 2011-04-17 15:56:46.000000000 -0400 |
4312 |
@@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug |
4313 |
* Update the IDT descriptor and reload the IDT so that |
4314 |
* it uses the read-only mapped virtual address. |
4315 |
@@ -11137,9 +11097,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/intel.c linux-2.6.32.38/arch/x86/ |
4316 |
load_idt(&idt_descr); |
4317 |
} |
4318 |
#endif |
4319 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c |
4320 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-03-27 14:31:47.000000000 -0400 |
4321 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-04-17 15:56:46.000000000 -0400 |
4322 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c |
4323 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-03-27 14:31:47.000000000 -0400 |
4324 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-04-17 15:56:46.000000000 -0400 |
4325 |
@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob |
4326 |
return ret; |
4327 |
} |
4328 |
@@ -11149,9 +11109,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.38 |
4329 |
.show = show, |
4330 |
.store = store, |
4331 |
}; |
4332 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/Makefile linux-2.6.32.38/arch/x86/kernel/cpu/Makefile |
4333 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/Makefile 2011-03-27 14:31:47.000000000 -0400 |
4334 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/Makefile 2011-04-17 15:56:46.000000000 -0400 |
4335 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/Makefile linux-2.6.32.39/arch/x86/kernel/cpu/Makefile |
4336 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/Makefile 2011-03-27 14:31:47.000000000 -0400 |
4337 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/Makefile 2011-04-17 15:56:46.000000000 -0400 |
4338 |
@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER |
4339 |
CFLAGS_REMOVE_common.o = -pg |
4340 |
endif |
4341 |
@@ -11163,9 +11123,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/Makefile linux-2.6.32.38/arch/x86 |
4342 |
obj-y := intel_cacheinfo.o addon_cpuid_features.o |
4343 |
obj-y += proc.o capflags.o powerflags.o common.o |
4344 |
obj-y += vmware.o hypervisor.o sched.o |
4345 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c |
4346 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-03-27 14:31:47.000000000 -0400 |
4347 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-04-17 15:56:46.000000000 -0400 |
4348 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c |
4349 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-03-27 14:31:47.000000000 -0400 |
4350 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-04-17 15:56:46.000000000 -0400 |
4351 |
@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob |
4352 |
return ret; |
4353 |
} |
4354 |
@@ -11175,9 +11135,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.38/ |
4355 |
.show = show, |
4356 |
.store = store, |
4357 |
}; |
4358 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c |
4359 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-27 14:31:47.000000000 -0400 |
4360 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-17 15:56:46.000000000 -0400 |
4361 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c |
4362 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-27 14:31:47.000000000 -0400 |
4363 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-23 12:56:10.000000000 -0400 |
4364 |
@@ -43,6 +43,7 @@ |
4365 |
#include <asm/ipi.h> |
4366 |
#include <asm/mce.h> |
4367 |
@@ -11230,17 +11190,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.38/arch |
4368 |
open_exclu = 0; |
4369 |
|
4370 |
spin_unlock(&mce_state_lock); |
4371 |
-@@ -1595,6 +1596,7 @@ static struct miscdevice mce_log_device |
4372 |
- MISC_MCELOG_MINOR, |
4373 |
- "mcelog", |
4374 |
- &mce_chrdev_ops, |
4375 |
-+ {NULL, NULL}, NULL, NULL |
4376 |
- }; |
4377 |
- |
4378 |
- /* |
4379 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c |
4380 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c 2011-03-27 14:31:47.000000000 -0400 |
4381 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c 2011-04-17 15:56:46.000000000 -0400 |
4382 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c |
4383 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c 2011-03-27 14:31:47.000000000 -0400 |
4384 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c 2011-04-17 15:56:46.000000000 -0400 |
4385 |
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base |
4386 |
return 0; |
4387 |
} |
4388 |
@@ -11250,9 +11202,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.38/arch/x |
4389 |
.vendor = X86_VENDOR_AMD, |
4390 |
.set = amd_set_mtrr, |
4391 |
.get = amd_get_mtrr, |
4392 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c |
4393 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c 2011-03-27 14:31:47.000000000 -0400 |
4394 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c 2011-04-17 15:56:46.000000000 -0400 |
4395 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c |
4396 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c 2011-03-27 14:31:47.000000000 -0400 |
4397 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c 2011-04-17 15:56:46.000000000 -0400 |
4398 |
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long |
4399 |
return 0; |
4400 |
} |
4401 |
@@ -11262,9 +11214,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.38/ar |
4402 |
.vendor = X86_VENDOR_CENTAUR, |
4403 |
.set = centaur_set_mcr, |
4404 |
.get = centaur_get_mcr, |
4405 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c |
4406 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-03-27 14:31:47.000000000 -0400 |
4407 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-04-17 15:56:46.000000000 -0400 |
4408 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c |
4409 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-03-27 14:31:47.000000000 -0400 |
4410 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-04-17 15:56:46.000000000 -0400 |
4411 |
@@ -265,7 +265,7 @@ static void cyrix_set_all(void) |
4412 |
post_set(); |
4413 |
} |
4414 |
@@ -11274,18 +11226,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.38/arch |
4415 |
.vendor = X86_VENDOR_CYRIX, |
4416 |
.set_all = cyrix_set_all, |
4417 |
.set = cyrix_set_arr, |
4418 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c |
4419 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-27 14:31:47.000000000 -0400 |
4420 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-17 15:56:46.000000000 -0400 |
4421 |
-@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra |
4422 |
- { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ |
4423 |
- { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ |
4424 |
- { MSR_MTRRfix4K_C0000, 8 }, /* eight 4k MTRRs */ |
4425 |
-- {} |
4426 |
-+ { 0, 0 } |
4427 |
- }; |
4428 |
- |
4429 |
- static unsigned long smp_changes_mask; |
4430 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c |
4431 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-27 14:31:47.000000000 -0400 |
4432 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-23 12:56:10.000000000 -0400 |
4433 |
@@ -752,7 +752,7 @@ int positive_have_wrcomb(void) |
4434 |
/* |
4435 |
* Generic structure... |
4436 |
@@ -11295,9 +11238,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.38/ar |
4437 |
.use_intel_if = 1, |
4438 |
.set_all = generic_set_all, |
4439 |
.get = generic_get_mtrr, |
4440 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c |
4441 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:00:52.000000000 -0400 |
4442 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:03:05.000000000 -0400 |
4443 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c |
4444 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:00:52.000000000 -0400 |
4445 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:03:05.000000000 -0400 |
4446 |
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); |
4447 |
u64 size_or_mask, size_and_mask; |
4448 |
static bool mtrr_aps_delayed_init; |
4449 |
@@ -11316,9 +11259,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.38/arch/ |
4450 |
{ |
4451 |
if (ops->vendor && ops->vendor < X86_VENDOR_NUM) |
4452 |
mtrr_ops[ops->vendor] = ops; |
4453 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h |
4454 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-27 14:31:47.000000000 -0400 |
4455 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:56:46.000000000 -0400 |
4456 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h |
4457 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-27 14:31:47.000000000 -0400 |
4458 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:56:46.000000000 -0400 |
4459 |
@@ -12,19 +12,19 @@ |
4460 |
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; |
4461 |
|
4462 |
@@ -11369,9 +11312,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.38/arch/ |
4463 |
|
4464 |
#define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) |
4465 |
#define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) |
4466 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c |
4467 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-03-27 14:31:47.000000000 -0400 |
4468 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-04-17 15:56:46.000000000 -0400 |
4469 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c |
4470 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-03-27 14:31:47.000000000 -0400 |
4471 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-04-17 15:56:46.000000000 -0400 |
4472 |
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { |
4473 |
|
4474 |
/* Interface defining a CPU specific perfctr watchdog */ |
4475 |
@@ -11405,9 +11348,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.3 |
4476 |
static struct wd_ops intel_arch_wd_ops __read_mostly = { |
4477 |
.reserve = single_msr_reserve, |
4478 |
.unreserve = single_msr_unreserve, |
4479 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c |
4480 |
---- linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c 2011-03-27 14:31:47.000000000 -0400 |
4481 |
-+++ linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:56:46.000000000 -0400 |
4482 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c |
4483 |
+--- linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c 2011-03-27 14:31:47.000000000 -0400 |
4484 |
++++ linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:56:46.000000000 -0400 |
4485 |
@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs |
4486 |
break; |
4487 |
|
4488 |
@@ -11417,9 +11360,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.38/arch |
4489 |
} |
4490 |
} |
4491 |
|
4492 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/crash.c linux-2.6.32.38/arch/x86/kernel/crash.c |
4493 |
---- linux-2.6.32.38/arch/x86/kernel/crash.c 2011-03-27 14:31:47.000000000 -0400 |
4494 |
-+++ linux-2.6.32.38/arch/x86/kernel/crash.c 2011-04-17 15:56:46.000000000 -0400 |
4495 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/crash.c linux-2.6.32.39/arch/x86/kernel/crash.c |
4496 |
+--- linux-2.6.32.39/arch/x86/kernel/crash.c 2011-03-27 14:31:47.000000000 -0400 |
4497 |
++++ linux-2.6.32.39/arch/x86/kernel/crash.c 2011-04-17 15:56:46.000000000 -0400 |
4498 |
@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, |
4499 |
regs = args->regs; |
4500 |
|
4501 |
@@ -11429,9 +11372,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/crash.c linux-2.6.32.38/arch/x86/kern |
4502 |
crash_fixup_ss_esp(&fixed_regs, regs); |
4503 |
regs = &fixed_regs; |
4504 |
} |
4505 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/doublefault_32.c linux-2.6.32.38/arch/x86/kernel/doublefault_32.c |
4506 |
---- linux-2.6.32.38/arch/x86/kernel/doublefault_32.c 2011-03-27 14:31:47.000000000 -0400 |
4507 |
-+++ linux-2.6.32.38/arch/x86/kernel/doublefault_32.c 2011-04-17 15:56:46.000000000 -0400 |
4508 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/doublefault_32.c linux-2.6.32.39/arch/x86/kernel/doublefault_32.c |
4509 |
+--- linux-2.6.32.39/arch/x86/kernel/doublefault_32.c 2011-03-27 14:31:47.000000000 -0400 |
4510 |
++++ linux-2.6.32.39/arch/x86/kernel/doublefault_32.c 2011-04-17 15:56:46.000000000 -0400 |
4511 |
@@ -11,7 +11,7 @@ |
4512 |
|
4513 |
#define DOUBLEFAULT_STACKSIZE (1024) |
4514 |
@@ -11463,9 +11406,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/doublefault_32.c linux-2.6.32.38/arch |
4515 |
.fs = __KERNEL_PERCPU, |
4516 |
|
4517 |
.__cr3 = __pa_nodebug(swapper_pg_dir), |
4518 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c |
4519 |
---- linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c 2011-03-27 14:31:47.000000000 -0400 |
4520 |
-+++ linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:56:46.000000000 -0400 |
4521 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c |
4522 |
+--- linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c 2011-03-27 14:31:47.000000000 -0400 |
4523 |
++++ linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:56:46.000000000 -0400 |
4524 |
@@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task |
4525 |
#endif |
4526 |
|
4527 |
@@ -11531,9 +11474,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack_32.c linux-2.6.32.38/arch/x |
4528 |
if (ip < PAGE_OFFSET) |
4529 |
return 0; |
4530 |
if (probe_kernel_address((unsigned short *)ip, ud2)) |
4531 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c |
4532 |
---- linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c 2011-03-27 14:31:47.000000000 -0400 |
4533 |
-+++ linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:56:46.000000000 -0400 |
4534 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c |
4535 |
+--- linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c 2011-03-27 14:31:47.000000000 -0400 |
4536 |
++++ linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:56:46.000000000 -0400 |
4537 |
@@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task |
4538 |
unsigned long *irq_stack_end = |
4539 |
(unsigned long *)per_cpu(irq_stack_ptr, cpu); |
4540 |
@@ -11584,9 +11527,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack_64.c linux-2.6.32.38/arch/x |
4541 |
put_cpu(); |
4542 |
} |
4543 |
EXPORT_SYMBOL(dump_trace); |
4544 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack.c linux-2.6.32.38/arch/x86/kernel/dumpstack.c |
4545 |
---- linux-2.6.32.38/arch/x86/kernel/dumpstack.c 2011-03-27 14:31:47.000000000 -0400 |
4546 |
-+++ linux-2.6.32.38/arch/x86/kernel/dumpstack.c 2011-04-17 15:56:46.000000000 -0400 |
4547 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.c linux-2.6.32.39/arch/x86/kernel/dumpstack.c |
4548 |
+--- linux-2.6.32.39/arch/x86/kernel/dumpstack.c 2011-03-27 14:31:47.000000000 -0400 |
4549 |
++++ linux-2.6.32.39/arch/x86/kernel/dumpstack.c 2011-04-17 15:56:46.000000000 -0400 |
4550 |
@@ -2,6 +2,9 @@ |
4551 |
* Copyright (C) 1991, 1992 Linus Torvalds |
4552 |
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs |
4553 |
@@ -11703,34 +11646,21 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack.c linux-2.6.32.38/arch/x86/ |
4554 |
report_bug(regs->ip, regs); |
4555 |
|
4556 |
if (__die(str, regs, err)) |
4557 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/dumpstack.h linux-2.6.32.38/arch/x86/kernel/dumpstack.h |
4558 |
---- linux-2.6.32.38/arch/x86/kernel/dumpstack.h 2011-03-27 14:31:47.000000000 -0400 |
4559 |
-+++ linux-2.6.32.38/arch/x86/kernel/dumpstack.h 2011-04-17 15:56:46.000000000 -0400 |
4560 |
-@@ -14,11 +14,16 @@ |
4561 |
- #define get_bp(bp) asm("movq %%rbp, %0" : "=r" (bp) :) |
4562 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.h linux-2.6.32.39/arch/x86/kernel/dumpstack.h |
4563 |
+--- linux-2.6.32.39/arch/x86/kernel/dumpstack.h 2011-03-27 14:31:47.000000000 -0400 |
4564 |
++++ linux-2.6.32.39/arch/x86/kernel/dumpstack.h 2011-04-23 13:25:26.000000000 -0400 |
4565 |
+@@ -15,7 +15,7 @@ |
4566 |
#endif |
4567 |
|
4568 |
--extern unsigned long |
4569 |
+ extern unsigned long |
4570 |
-print_context_stack(struct thread_info *tinfo, |
4571 |
-- unsigned long *stack, unsigned long bp, |
4572 |
-- const struct stacktrace_ops *ops, void *data, |
4573 |
-- unsigned long *end, int *graph); |
4574 |
-+typedef unsigned long walk_stack_t(struct task_struct *task, |
4575 |
-+ void *stack_start, |
4576 |
-+ unsigned long *stack, |
4577 |
-+ unsigned long bp, |
4578 |
-+ const struct stacktrace_ops *ops, |
4579 |
-+ void *data, |
4580 |
-+ unsigned long *end, |
4581 |
-+ int *graph); |
4582 |
-+ |
4583 |
-+extern walk_stack_t print_context_stack; |
4584 |
- |
4585 |
- extern void |
4586 |
- show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, |
4587 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/e820.c linux-2.6.32.38/arch/x86/kernel/e820.c |
4588 |
---- linux-2.6.32.38/arch/x86/kernel/e820.c 2011-03-27 14:31:47.000000000 -0400 |
4589 |
-+++ linux-2.6.32.38/arch/x86/kernel/e820.c 2011-04-17 15:56:46.000000000 -0400 |
4590 |
++print_context_stack(struct task_struct *task, void *stack_start, |
4591 |
+ unsigned long *stack, unsigned long bp, |
4592 |
+ const struct stacktrace_ops *ops, void *data, |
4593 |
+ unsigned long *end, int *graph); |
4594 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/e820.c linux-2.6.32.39/arch/x86/kernel/e820.c |
4595 |
+--- linux-2.6.32.39/arch/x86/kernel/e820.c 2011-03-27 14:31:47.000000000 -0400 |
4596 |
++++ linux-2.6.32.39/arch/x86/kernel/e820.c 2011-04-17 15:56:46.000000000 -0400 |
4597 |
@@ -733,7 +733,7 @@ struct early_res { |
4598 |
}; |
4599 |
static struct early_res early_res[MAX_EARLY_RES] __initdata = { |
4600 |
@@ -11740,9 +11670,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/e820.c linux-2.6.32.38/arch/x86/kerne |
4601 |
}; |
4602 |
|
4603 |
static int __init find_overlapped_early(u64 start, u64 end) |
4604 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_32.c linux-2.6.32.38/arch/x86/kernel/efi_32.c |
4605 |
---- linux-2.6.32.38/arch/x86/kernel/efi_32.c 2011-03-27 14:31:47.000000000 -0400 |
4606 |
-+++ linux-2.6.32.38/arch/x86/kernel/efi_32.c 2011-04-17 15:56:46.000000000 -0400 |
4607 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_32.c linux-2.6.32.39/arch/x86/kernel/efi_32.c |
4608 |
+--- linux-2.6.32.39/arch/x86/kernel/efi_32.c 2011-03-27 14:31:47.000000000 -0400 |
4609 |
++++ linux-2.6.32.39/arch/x86/kernel/efi_32.c 2011-04-17 15:56:46.000000000 -0400 |
4610 |
@@ -38,70 +38,38 @@ |
4611 |
*/ |
4612 |
|
4613 |
@@ -11823,9 +11753,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_32.c linux-2.6.32.38/arch/x86/ker |
4614 |
|
4615 |
/* |
4616 |
* After the lock is released, the original page table is restored. |
4617 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S |
4618 |
---- linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S 2011-03-27 14:31:47.000000000 -0400 |
4619 |
-+++ linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S 2011-04-17 15:56:46.000000000 -0400 |
4620 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S |
4621 |
+--- linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S 2011-03-27 14:31:47.000000000 -0400 |
4622 |
++++ linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S 2011-04-17 15:56:46.000000000 -0400 |
4623 |
@@ -6,6 +6,7 @@ |
4624 |
*/ |
4625 |
|
4626 |
@@ -11924,9 +11854,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/efi_stub_32.S linux-2.6.32.38/arch/x8 |
4627 |
saved_return_addr: |
4628 |
.long 0 |
4629 |
efi_rt_function_ptr: |
4630 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_32.S linux-2.6.32.38/arch/x86/kernel/entry_32.S |
4631 |
---- linux-2.6.32.38/arch/x86/kernel/entry_32.S 2011-03-27 14:31:47.000000000 -0400 |
4632 |
-+++ linux-2.6.32.38/arch/x86/kernel/entry_32.S 2011-04-19 17:24:49.000000000 -0400 |
4633 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/kernel/entry_32.S |
4634 |
+--- linux-2.6.32.39/arch/x86/kernel/entry_32.S 2011-03-27 14:31:47.000000000 -0400 |
4635 |
++++ linux-2.6.32.39/arch/x86/kernel/entry_32.S 2011-04-19 17:24:49.000000000 -0400 |
4636 |
@@ -185,13 +185,81 @@ |
4637 |
/*CFI_REL_OFFSET gs, PT_GS*/ |
4638 |
.endm |
4639 |
@@ -12292,9 +12222,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_32.S linux-2.6.32.38/arch/x86/k |
4640 |
RESTORE_REGS |
4641 |
lss 12+4(%esp), %esp # back to espfix stack |
4642 |
CFI_ADJUST_CFA_OFFSET -24 |
4643 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_64.S linux-2.6.32.38/arch/x86/kernel/entry_64.S |
4644 |
---- linux-2.6.32.38/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.000000000 -0400 |
4645 |
-+++ linux-2.6.32.38/arch/x86/kernel/entry_64.S 2011-04-17 15:56:46.000000000 -0400 |
4646 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/kernel/entry_64.S |
4647 |
+--- linux-2.6.32.39/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.000000000 -0400 |
4648 |
++++ linux-2.6.32.39/arch/x86/kernel/entry_64.S 2011-04-17 15:56:46.000000000 -0400 |
4649 |
@@ -53,6 +53,7 @@ |
4650 |
#include <asm/paravirt.h> |
4651 |
#include <asm/ftrace.h> |
4652 |
@@ -12786,9 +12716,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/entry_64.S linux-2.6.32.38/arch/x86/k |
4653 |
RESTORE_ALL 8 |
4654 |
jmp irq_return |
4655 |
nmi_userspace: |
4656 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/ftrace.c linux-2.6.32.38/arch/x86/kernel/ftrace.c |
4657 |
---- linux-2.6.32.38/arch/x86/kernel/ftrace.c 2011-03-27 14:31:47.000000000 -0400 |
4658 |
-+++ linux-2.6.32.38/arch/x86/kernel/ftrace.c 2011-04-17 15:56:46.000000000 -0400 |
4659 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/ftrace.c linux-2.6.32.39/arch/x86/kernel/ftrace.c |
4660 |
+--- linux-2.6.32.39/arch/x86/kernel/ftrace.c 2011-03-27 14:31:47.000000000 -0400 |
4661 |
++++ linux-2.6.32.39/arch/x86/kernel/ftrace.c 2011-04-17 15:56:46.000000000 -0400 |
4662 |
@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) |
4663 |
{ |
4664 |
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { |
4665 |
@@ -12854,9 +12784,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ftrace.c linux-2.6.32.38/arch/x86/ker |
4666 |
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) |
4667 |
return -EFAULT; |
4668 |
|
4669 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/head32.c linux-2.6.32.38/arch/x86/kernel/head32.c |
4670 |
---- linux-2.6.32.38/arch/x86/kernel/head32.c 2011-03-27 14:31:47.000000000 -0400 |
4671 |
-+++ linux-2.6.32.38/arch/x86/kernel/head32.c 2011-04-17 15:56:46.000000000 -0400 |
4672 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/head32.c linux-2.6.32.39/arch/x86/kernel/head32.c |
4673 |
+--- linux-2.6.32.39/arch/x86/kernel/head32.c 2011-03-27 14:31:47.000000000 -0400 |
4674 |
++++ linux-2.6.32.39/arch/x86/kernel/head32.c 2011-04-17 15:56:46.000000000 -0400 |
4675 |
@@ -16,6 +16,7 @@ |
4676 |
#include <asm/apic.h> |
4677 |
#include <asm/io_apic.h> |
4678 |
@@ -12874,9 +12804,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/head32.c linux-2.6.32.38/arch/x86/ker |
4679 |
|
4680 |
#ifdef CONFIG_BLK_DEV_INITRD |
4681 |
/* Reserve INITRD */ |
4682 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/head_32.S linux-2.6.32.38/arch/x86/kernel/head_32.S |
4683 |
---- linux-2.6.32.38/arch/x86/kernel/head_32.S 2011-03-27 14:31:47.000000000 -0400 |
4684 |
-+++ linux-2.6.32.38/arch/x86/kernel/head_32.S 2011-04-17 15:56:46.000000000 -0400 |
4685 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/head_32.S linux-2.6.32.39/arch/x86/kernel/head_32.S |
4686 |
+--- linux-2.6.32.39/arch/x86/kernel/head_32.S 2011-03-27 14:31:47.000000000 -0400 |
4687 |
++++ linux-2.6.32.39/arch/x86/kernel/head_32.S 2011-04-17 15:56:46.000000000 -0400 |
4688 |
@@ -19,10 +19,17 @@ |
4689 |
#include <asm/setup.h> |
4690 |
#include <asm/processor-flags.h> |
4691 |
@@ -13346,9 +13276,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/head_32.S linux-2.6.32.38/arch/x86/ke |
4692 |
+ /* Be sure this is zeroed to avoid false validations in Xen */ |
4693 |
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 |
4694 |
+ .endr |
4695 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/head_64.S linux-2.6.32.38/arch/x86/kernel/head_64.S |
4696 |
---- linux-2.6.32.38/arch/x86/kernel/head_64.S 2011-03-27 14:31:47.000000000 -0400 |
4697 |
-+++ linux-2.6.32.38/arch/x86/kernel/head_64.S 2011-04-17 15:56:46.000000000 -0400 |
4698 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/head_64.S linux-2.6.32.39/arch/x86/kernel/head_64.S |
4699 |
+--- linux-2.6.32.39/arch/x86/kernel/head_64.S 2011-03-27 14:31:47.000000000 -0400 |
4700 |
++++ linux-2.6.32.39/arch/x86/kernel/head_64.S 2011-04-17 15:56:46.000000000 -0400 |
4701 |
@@ -19,6 +19,7 @@ |
4702 |
#include <asm/cache.h> |
4703 |
#include <asm/processor-flags.h> |
4704 |
@@ -13619,9 +13549,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/head_64.S linux-2.6.32.38/arch/x86/ke |
4705 |
|
4706 |
__PAGE_ALIGNED_BSS |
4707 |
.align PAGE_SIZE |
4708 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c |
4709 |
---- linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c 2011-03-27 14:31:47.000000000 -0400 |
4710 |
-+++ linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:56:46.000000000 -0400 |
4711 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c |
4712 |
+--- linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c 2011-03-27 14:31:47.000000000 -0400 |
4713 |
++++ linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:56:46.000000000 -0400 |
4714 |
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); |
4715 |
EXPORT_SYMBOL(cmpxchg8b_emu); |
4716 |
#endif |
4717 |
@@ -13643,9 +13573,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.38/arch/ |
4718 |
+#ifdef CONFIG_PAX_KERNEXEC |
4719 |
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); |
4720 |
+#endif |
4721 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/init_task.c linux-2.6.32.38/arch/x86/kernel/init_task.c |
4722 |
---- linux-2.6.32.38/arch/x86/kernel/init_task.c 2011-03-27 14:31:47.000000000 -0400 |
4723 |
-+++ linux-2.6.32.38/arch/x86/kernel/init_task.c 2011-04-17 15:56:46.000000000 -0400 |
4724 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/init_task.c linux-2.6.32.39/arch/x86/kernel/init_task.c |
4725 |
+--- linux-2.6.32.39/arch/x86/kernel/init_task.c 2011-03-27 14:31:47.000000000 -0400 |
4726 |
++++ linux-2.6.32.39/arch/x86/kernel/init_task.c 2011-04-17 15:56:46.000000000 -0400 |
4727 |
@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan |
4728 |
* way process stacks are handled. This is done by having a special |
4729 |
* "init_task" linker map entry.. |
4730 |
@@ -13664,9 +13594,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/init_task.c linux-2.6.32.38/arch/x86/ |
4731 |
- |
4732 |
+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; |
4733 |
+EXPORT_SYMBOL(init_tss); |
4734 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/ioport.c linux-2.6.32.38/arch/x86/kernel/ioport.c |
4735 |
---- linux-2.6.32.38/arch/x86/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400 |
4736 |
-+++ linux-2.6.32.38/arch/x86/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400 |
4737 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/ioport.c linux-2.6.32.39/arch/x86/kernel/ioport.c |
4738 |
+--- linux-2.6.32.39/arch/x86/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400 |
4739 |
++++ linux-2.6.32.39/arch/x86/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400 |
4740 |
@@ -6,6 +6,7 @@ |
4741 |
#include <linux/sched.h> |
4742 |
#include <linux/kernel.h> |
4743 |
@@ -13710,9 +13640,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ioport.c linux-2.6.32.38/arch/x86/ker |
4744 |
if (!capable(CAP_SYS_RAWIO)) |
4745 |
return -EPERM; |
4746 |
} |
4747 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_32.c linux-2.6.32.38/arch/x86/kernel/irq_32.c |
4748 |
---- linux-2.6.32.38/arch/x86/kernel/irq_32.c 2011-03-27 14:31:47.000000000 -0400 |
4749 |
-+++ linux-2.6.32.38/arch/x86/kernel/irq_32.c 2011-04-17 15:56:46.000000000 -0400 |
4750 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/irq_32.c linux-2.6.32.39/arch/x86/kernel/irq_32.c |
4751 |
+--- linux-2.6.32.39/arch/x86/kernel/irq_32.c 2011-03-27 14:31:47.000000000 -0400 |
4752 |
++++ linux-2.6.32.39/arch/x86/kernel/irq_32.c 2011-04-23 13:26:46.000000000 -0400 |
4753 |
@@ -35,7 +35,7 @@ static int check_stack_overflow(void) |
4754 |
__asm__ __volatile__("andl %%esp,%0" : |
4755 |
"=r" (sp) : "0" (THREAD_SIZE - 1)); |
4756 |
@@ -13722,17 +13652,19 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_32.c linux-2.6.32.38/arch/x86/ker |
4757 |
} |
4758 |
|
4759 |
static void print_stack_overflow(void) |
4760 |
-@@ -54,8 +54,8 @@ static inline void print_stack_overflow( |
4761 |
+@@ -54,9 +54,9 @@ static inline void print_stack_overflow( |
4762 |
* per-CPU IRQ handling contexts (thread information and stack) |
4763 |
*/ |
4764 |
union irq_ctx { |
4765 |
- struct thread_info tinfo; |
4766 |
- u32 stack[THREAD_SIZE/sizeof(u32)]; |
4767 |
+-} __attribute__((aligned(PAGE_SIZE))); |
4768 |
+ unsigned long previous_esp; |
4769 |
+ u32 stack[THREAD_SIZE/sizeof(u32)]; |
4770 |
- } __attribute__((aligned(PAGE_SIZE))); |
4771 |
++} __attribute__((aligned(THREAD_SIZE))); |
4772 |
|
4773 |
static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx); |
4774 |
+ static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx); |
4775 |
@@ -78,10 +78,9 @@ static void call_on_stack(void *func, vo |
4776 |
static inline int |
4777 |
execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) |
4778 |
@@ -13813,8 +13745,8 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_32.c linux-2.6.32.38/arch/x86/ker |
4779 |
- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0); |
4780 |
- |
4781 |
- per_cpu(softirq_ctx, cpu) = irqctx; |
4782 |
-+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER)); |
4783 |
-+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER)); |
4784 |
++ per_cpu(hardirq_ctx, cpu) = &per_cpu(hardirq_stack, cpu); |
4785 |
++ per_cpu(softirq_ctx, cpu) = &per_cpu(softirq_stack, cpu); |
4786 |
|
4787 |
printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n", |
4788 |
cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); |
4789 |
@@ -13853,9 +13785,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/irq_32.c linux-2.6.32.38/arch/x86/ker |
4790 |
/* |
4791 |
* Shouldnt happen, we returned above if in_interrupt(): |
4792 |
*/ |
4793 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/kgdb.c linux-2.6.32.38/arch/x86/kernel/kgdb.c |
4794 |
---- linux-2.6.32.38/arch/x86/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
4795 |
-+++ linux-2.6.32.38/arch/x86/kernel/kgdb.c 2011-04-17 15:56:46.000000000 -0400 |
4796 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/kgdb.c linux-2.6.32.39/arch/x86/kernel/kgdb.c |
4797 |
+--- linux-2.6.32.39/arch/x86/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 |
4798 |
++++ linux-2.6.32.39/arch/x86/kernel/kgdb.c 2011-04-17 15:56:46.000000000 -0400 |
4799 |
@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception |
4800 |
return instruction_pointer(regs); |
4801 |
} |
4802 |
@@ -13865,9 +13797,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/kgdb.c linux-2.6.32.38/arch/x86/kerne |
4803 |
/* Breakpoint instruction: */ |
4804 |
.gdb_bpt_instr = { 0xcc }, |
4805 |
.flags = KGDB_HW_BREAKPOINT, |
4806 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/kprobes.c linux-2.6.32.38/arch/x86/kernel/kprobes.c |
4807 |
---- linux-2.6.32.38/arch/x86/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 |
4808 |
-+++ linux-2.6.32.38/arch/x86/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 |
4809 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/kprobes.c linux-2.6.32.39/arch/x86/kernel/kprobes.c |
4810 |
+--- linux-2.6.32.39/arch/x86/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 |
4811 |
++++ linux-2.6.32.39/arch/x86/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 |
4812 |
@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f |
4813 |
char op; |
4814 |
s32 raddr; |
4815 |
@@ -13969,9 +13901,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/kprobes.c linux-2.6.32.38/arch/x86/ke |
4816 |
return ret; |
4817 |
|
4818 |
switch (val) { |
4819 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/ldt.c linux-2.6.32.38/arch/x86/kernel/ldt.c |
4820 |
---- linux-2.6.32.38/arch/x86/kernel/ldt.c 2011-03-27 14:31:47.000000000 -0400 |
4821 |
-+++ linux-2.6.32.38/arch/x86/kernel/ldt.c 2011-04-17 15:56:46.000000000 -0400 |
4822 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/ldt.c linux-2.6.32.39/arch/x86/kernel/ldt.c |
4823 |
+--- linux-2.6.32.39/arch/x86/kernel/ldt.c 2011-03-27 14:31:47.000000000 -0400 |
4824 |
++++ linux-2.6.32.39/arch/x86/kernel/ldt.c 2011-04-17 15:56:46.000000000 -0400 |
4825 |
@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i |
4826 |
if (reload) { |
4827 |
#ifdef CONFIG_SMP |
4828 |
@@ -14036,9 +13968,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ldt.c linux-2.6.32.38/arch/x86/kernel |
4829 |
fill_ldt(&ldt, &ldt_info); |
4830 |
if (oldmode) |
4831 |
ldt.avl = 0; |
4832 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c |
4833 |
---- linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c 2011-03-27 14:31:47.000000000 -0400 |
4834 |
-+++ linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:56:46.000000000 -0400 |
4835 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c |
4836 |
+--- linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c 2011-03-27 14:31:47.000000000 -0400 |
4837 |
++++ linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:56:46.000000000 -0400 |
4838 |
@@ -26,7 +26,7 @@ |
4839 |
#include <asm/system.h> |
4840 |
#include <asm/cacheflush.h> |
4841 |
@@ -14066,9 +13998,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.38/ar |
4842 |
|
4843 |
relocate_kernel_ptr = control_page; |
4844 |
page_list[PA_CONTROL_PAGE] = __pa(control_page); |
4845 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_amd.c linux-2.6.32.38/arch/x86/kernel/microcode_amd.c |
4846 |
---- linux-2.6.32.38/arch/x86/kernel/microcode_amd.c 2011-04-17 17:00:52.000000000 -0400 |
4847 |
-+++ linux-2.6.32.38/arch/x86/kernel/microcode_amd.c 2011-04-17 17:03:05.000000000 -0400 |
4848 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_amd.c linux-2.6.32.39/arch/x86/kernel/microcode_amd.c |
4849 |
+--- linux-2.6.32.39/arch/x86/kernel/microcode_amd.c 2011-04-17 17:00:52.000000000 -0400 |
4850 |
++++ linux-2.6.32.39/arch/x86/kernel/microcode_amd.c 2011-04-17 17:03:05.000000000 -0400 |
4851 |
@@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c |
4852 |
uci->mc = NULL; |
4853 |
} |
4854 |
@@ -14087,9 +14019,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_amd.c linux-2.6.32.38/arch/ |
4855 |
{ |
4856 |
return µcode_amd_ops; |
4857 |
} |
4858 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_core.c linux-2.6.32.38/arch/x86/kernel/microcode_core.c |
4859 |
---- linux-2.6.32.38/arch/x86/kernel/microcode_core.c 2011-03-27 14:31:47.000000000 -0400 |
4860 |
-+++ linux-2.6.32.38/arch/x86/kernel/microcode_core.c 2011-04-17 15:56:46.000000000 -0400 |
4861 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_core.c linux-2.6.32.39/arch/x86/kernel/microcode_core.c |
4862 |
+--- linux-2.6.32.39/arch/x86/kernel/microcode_core.c 2011-03-27 14:31:47.000000000 -0400 |
4863 |
++++ linux-2.6.32.39/arch/x86/kernel/microcode_core.c 2011-04-17 15:56:46.000000000 -0400 |
4864 |
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); |
4865 |
|
4866 |
#define MICROCODE_VERSION "2.00" |
4867 |
@@ -14099,9 +14031,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_core.c linux-2.6.32.38/arch |
4868 |
|
4869 |
/* |
4870 |
* Synchronization. |
4871 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_intel.c linux-2.6.32.38/arch/x86/kernel/microcode_intel.c |
4872 |
---- linux-2.6.32.38/arch/x86/kernel/microcode_intel.c 2011-03-27 14:31:47.000000000 -0400 |
4873 |
-+++ linux-2.6.32.38/arch/x86/kernel/microcode_intel.c 2011-04-17 15:56:46.000000000 -0400 |
4874 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_intel.c linux-2.6.32.39/arch/x86/kernel/microcode_intel.c |
4875 |
+--- linux-2.6.32.39/arch/x86/kernel/microcode_intel.c 2011-03-27 14:31:47.000000000 -0400 |
4876 |
++++ linux-2.6.32.39/arch/x86/kernel/microcode_intel.c 2011-04-17 15:56:46.000000000 -0400 |
4877 |
@@ -443,13 +443,13 @@ static enum ucode_state request_microcod |
4878 |
|
4879 |
static int get_ucode_user(void *to, const void *from, size_t n) |
4880 |
@@ -14136,9 +14068,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/microcode_intel.c linux-2.6.32.38/arc |
4881 |
{ |
4882 |
return µcode_intel_ops; |
4883 |
} |
4884 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/module.c linux-2.6.32.38/arch/x86/kernel/module.c |
4885 |
---- linux-2.6.32.38/arch/x86/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
4886 |
-+++ linux-2.6.32.38/arch/x86/kernel/module.c 2011-04-17 15:56:46.000000000 -0400 |
4887 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/module.c linux-2.6.32.39/arch/x86/kernel/module.c |
4888 |
+--- linux-2.6.32.39/arch/x86/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
4889 |
++++ linux-2.6.32.39/arch/x86/kernel/module.c 2011-04-17 15:56:46.000000000 -0400 |
4890 |
@@ -34,7 +34,7 @@ |
4891 |
#define DEBUGP(fmt...) |
4892 |
#endif |
4893 |
@@ -14279,9 +14211,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/module.c linux-2.6.32.38/arch/x86/ker |
4894 |
#if 0 |
4895 |
if ((s64)val != *(s32 *)loc) |
4896 |
goto overflow; |
4897 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/paravirt.c linux-2.6.32.38/arch/x86/kernel/paravirt.c |
4898 |
---- linux-2.6.32.38/arch/x86/kernel/paravirt.c 2011-03-27 14:31:47.000000000 -0400 |
4899 |
-+++ linux-2.6.32.38/arch/x86/kernel/paravirt.c 2011-04-17 15:56:46.000000000 -0400 |
4900 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt.c linux-2.6.32.39/arch/x86/kernel/paravirt.c |
4901 |
+--- linux-2.6.32.39/arch/x86/kernel/paravirt.c 2011-03-27 14:31:47.000000000 -0400 |
4902 |
++++ linux-2.6.32.39/arch/x86/kernel/paravirt.c 2011-04-17 15:56:46.000000000 -0400 |
4903 |
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu |
4904 |
* corresponding structure. */ |
4905 |
static void *get_call_destination(u8 type) |
4906 |
@@ -14385,9 +14317,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/paravirt.c linux-2.6.32.38/arch/x86/k |
4907 |
}; |
4908 |
|
4909 |
EXPORT_SYMBOL_GPL(pv_time_ops); |
4910 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c |
4911 |
---- linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c 2011-03-27 14:31:47.000000000 -0400 |
4912 |
-+++ linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:56:46.000000000 -0400 |
4913 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c |
4914 |
+--- linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c 2011-03-27 14:31:47.000000000 -0400 |
4915 |
++++ linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:56:46.000000000 -0400 |
4916 |
@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * |
4917 |
__raw_spin_lock(lock); |
4918 |
} |
4919 |
@@ -14397,9 +14329,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.38/ |
4920 |
#ifdef CONFIG_SMP |
4921 |
.spin_is_locked = __ticket_spin_is_locked, |
4922 |
.spin_is_contended = __ticket_spin_is_contended, |
4923 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c |
4924 |
---- linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c 2011-03-27 14:31:47.000000000 -0400 |
4925 |
-+++ linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:56:46.000000000 -0400 |
4926 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c |
4927 |
+--- linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c 2011-03-27 14:31:47.000000000 -0400 |
4928 |
++++ linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:56:46.000000000 -0400 |
4929 |
@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct |
4930 |
free_pages((unsigned long)vaddr, get_order(size)); |
4931 |
} |
4932 |
@@ -14409,9 +14341,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.38/arch |
4933 |
.alloc_coherent = calgary_alloc_coherent, |
4934 |
.free_coherent = calgary_free_coherent, |
4935 |
.map_sg = calgary_map_sg, |
4936 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-dma.c linux-2.6.32.38/arch/x86/kernel/pci-dma.c |
4937 |
---- linux-2.6.32.38/arch/x86/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400 |
4938 |
-+++ linux-2.6.32.38/arch/x86/kernel/pci-dma.c 2011-04-17 15:56:46.000000000 -0400 |
4939 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-dma.c linux-2.6.32.39/arch/x86/kernel/pci-dma.c |
4940 |
+--- linux-2.6.32.39/arch/x86/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400 |
4941 |
++++ linux-2.6.32.39/arch/x86/kernel/pci-dma.c 2011-04-17 15:56:46.000000000 -0400 |
4942 |
@@ -14,7 +14,7 @@ |
4943 |
|
4944 |
static int forbid_dac __read_mostly; |
4945 |
@@ -14430,9 +14362,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-dma.c linux-2.6.32.38/arch/x86/ke |
4946 |
|
4947 |
#ifdef CONFIG_PCI |
4948 |
if (mask > 0xffffffff && forbid_dac > 0) { |
4949 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c |
4950 |
---- linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c 2011-03-27 14:31:47.000000000 -0400 |
4951 |
-+++ linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:56:46.000000000 -0400 |
4952 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c |
4953 |
+--- linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c 2011-03-27 14:31:47.000000000 -0400 |
4954 |
++++ linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:56:46.000000000 -0400 |
4955 |
@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag |
4956 |
return -1; |
4957 |
} |
4958 |
@@ -14442,9 +14374,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-gart_64.c linux-2.6.32.38/arch/x8 |
4959 |
.map_sg = gart_map_sg, |
4960 |
.unmap_sg = gart_unmap_sg, |
4961 |
.map_page = gart_map_page, |
4962 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-nommu.c linux-2.6.32.38/arch/x86/kernel/pci-nommu.c |
4963 |
---- linux-2.6.32.38/arch/x86/kernel/pci-nommu.c 2011-03-27 14:31:47.000000000 -0400 |
4964 |
-+++ linux-2.6.32.38/arch/x86/kernel/pci-nommu.c 2011-04-17 15:56:46.000000000 -0400 |
4965 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-nommu.c linux-2.6.32.39/arch/x86/kernel/pci-nommu.c |
4966 |
+--- linux-2.6.32.39/arch/x86/kernel/pci-nommu.c 2011-03-27 14:31:47.000000000 -0400 |
4967 |
++++ linux-2.6.32.39/arch/x86/kernel/pci-nommu.c 2011-04-17 15:56:46.000000000 -0400 |
4968 |
@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str |
4969 |
flush_write_buffers(); |
4970 |
} |
4971 |
@@ -14454,9 +14386,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-nommu.c linux-2.6.32.38/arch/x86/ |
4972 |
.alloc_coherent = dma_generic_alloc_coherent, |
4973 |
.free_coherent = nommu_free_coherent, |
4974 |
.map_sg = nommu_map_sg, |
4975 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c |
4976 |
---- linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 |
4977 |
-+++ linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:56:46.000000000 -0400 |
4978 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c |
4979 |
+--- linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 |
4980 |
++++ linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:56:46.000000000 -0400 |
4981 |
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( |
4982 |
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); |
4983 |
} |
4984 |
@@ -14466,9 +14398,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.38/arch/x8 |
4985 |
.mapping_error = swiotlb_dma_mapping_error, |
4986 |
.alloc_coherent = x86_swiotlb_alloc_coherent, |
4987 |
.free_coherent = swiotlb_free_coherent, |
4988 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/process_32.c linux-2.6.32.38/arch/x86/kernel/process_32.c |
4989 |
---- linux-2.6.32.38/arch/x86/kernel/process_32.c 2011-03-27 14:31:47.000000000 -0400 |
4990 |
-+++ linux-2.6.32.38/arch/x86/kernel/process_32.c 2011-04-17 15:56:46.000000000 -0400 |
4991 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/process_32.c linux-2.6.32.39/arch/x86/kernel/process_32.c |
4992 |
+--- linux-2.6.32.39/arch/x86/kernel/process_32.c 2011-03-27 14:31:47.000000000 -0400 |
4993 |
++++ linux-2.6.32.39/arch/x86/kernel/process_32.c 2011-04-17 15:56:46.000000000 -0400 |
4994 |
@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as |
4995 |
unsigned long thread_saved_pc(struct task_struct *tsk) |
4996 |
{ |
4997 |
@@ -14562,9 +14494,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/process_32.c linux-2.6.32.38/arch/x86 |
4998 |
return 0; |
4999 |
} |
5000 |
- |
5001 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/process_64.c linux-2.6.32.38/arch/x86/kernel/process_64.c |
5002 |
---- linux-2.6.32.38/arch/x86/kernel/process_64.c 2011-03-27 14:31:47.000000000 -0400 |
5003 |
-+++ linux-2.6.32.38/arch/x86/kernel/process_64.c 2011-04-17 15:56:46.000000000 -0400 |
5004 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/process_64.c linux-2.6.32.39/arch/x86/kernel/process_64.c |
5005 |
+--- linux-2.6.32.39/arch/x86/kernel/process_64.c 2011-03-27 14:31:47.000000000 -0400 |
5006 |
++++ linux-2.6.32.39/arch/x86/kernel/process_64.c 2011-04-17 15:56:46.000000000 -0400 |
5007 |
@@ -91,7 +91,7 @@ static void __exit_idle(void) |
5008 |
void exit_idle(void) |
5009 |
{ |
5010 |
@@ -14630,9 +14562,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/process_64.c linux-2.6.32.38/arch/x86 |
5011 |
return 0; |
5012 |
ip = *(u64 *)(fp+8); |
5013 |
if (!in_sched_functions(ip)) |
5014 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/process.c linux-2.6.32.38/arch/x86/kernel/process.c |
5015 |
---- linux-2.6.32.38/arch/x86/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 |
5016 |
-+++ linux-2.6.32.38/arch/x86/kernel/process.c 2011-04-17 15:56:46.000000000 -0400 |
5017 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/process.c linux-2.6.32.39/arch/x86/kernel/process.c |
5018 |
+--- linux-2.6.32.39/arch/x86/kernel/process.c 2011-04-22 19:16:29.000000000 -0400 |
5019 |
++++ linux-2.6.32.39/arch/x86/kernel/process.c 2011-04-23 13:27:33.000000000 -0400 |
5020 |
@@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru |
5021 |
|
5022 |
void free_thread_info(struct thread_info *ti) |
5023 |
@@ -14645,13 +14577,15 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/process.c linux-2.6.32.38/arch/x86/ke |
5024 |
+ |
5025 |
void arch_task_cache_init(void) |
5026 |
{ |
5027 |
-+ /* create a slab on which task structs can be allocated */ |
5028 |
+- task_xstate_cachep = |
5029 |
+- kmem_cache_create("task_xstate", xstate_size, |
5030 |
++ /* create a slab on which task_structs can be allocated */ |
5031 |
+ task_struct_cachep = |
5032 |
+ kmem_cache_create("task_struct", sizeof(struct task_struct), |
5033 |
+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); |
5034 |
+ |
5035 |
- task_xstate_cachep = |
5036 |
- kmem_cache_create("task_xstate", xstate_size, |
5037 |
++ task_xstate_cachep = |
5038 |
++ kmem_cache_create("task_xstate", xstate_size, |
5039 |
__alignof__(union thread_xstate), |
5040 |
- SLAB_PANIC | SLAB_NOTRACK, NULL); |
5041 |
+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); |
5042 |
@@ -14688,7 +14622,7 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/process.c linux-2.6.32.38/arch/x86/ke |
5043 |
tsk->thread.debugreg0 = 0; |
5044 |
tsk->thread.debugreg1 = 0; |
5045 |
tsk->thread.debugreg2 = 0; |
5046 |
-@@ -603,16 +623,32 @@ static int __init idle_setup(char *str) |
5047 |
+@@ -568,16 +588,32 @@ static int __init idle_setup(char *str) |
5048 |
} |
5049 |
early_param("idle", idle_setup); |
5050 |
|
5051 |
@@ -14730,9 +14664,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/process.c linux-2.6.32.38/arch/x86/ke |
5052 |
} |
5053 |
+#endif |
5054 |
|
5055 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/ptrace.c linux-2.6.32.38/arch/x86/kernel/ptrace.c |
5056 |
---- linux-2.6.32.38/arch/x86/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 |
5057 |
-+++ linux-2.6.32.38/arch/x86/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400 |
5058 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/ptrace.c linux-2.6.32.39/arch/x86/kernel/ptrace.c |
5059 |
+--- linux-2.6.32.39/arch/x86/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 |
5060 |
++++ linux-2.6.32.39/arch/x86/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400 |
5061 |
@@ -925,7 +925,7 @@ static const struct user_regset_view use |
5062 |
long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
5063 |
{ |
5064 |
@@ -14819,9 +14753,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/ptrace.c linux-2.6.32.38/arch/x86/ker |
5065 |
{ |
5066 |
if (unlikely(current->audit_context)) |
5067 |
audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); |
5068 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/reboot.c linux-2.6.32.38/arch/x86/kernel/reboot.c |
5069 |
---- linux-2.6.32.38/arch/x86/kernel/reboot.c 2011-03-27 14:31:47.000000000 -0400 |
5070 |
-+++ linux-2.6.32.38/arch/x86/kernel/reboot.c 2011-04-17 15:56:46.000000000 -0400 |
5071 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/reboot.c linux-2.6.32.39/arch/x86/kernel/reboot.c |
5072 |
+--- linux-2.6.32.39/arch/x86/kernel/reboot.c 2011-03-27 14:31:47.000000000 -0400 |
5073 |
++++ linux-2.6.32.39/arch/x86/kernel/reboot.c 2011-04-23 12:56:10.000000000 -0400 |
5074 |
@@ -33,7 +33,7 @@ void (*pm_power_off)(void); |
5075 |
EXPORT_SYMBOL(pm_power_off); |
5076 |
|
5077 |
@@ -14831,15 +14765,6 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/reboot.c linux-2.6.32.38/arch/x86/ker |
5078 |
enum reboot_type reboot_type = BOOT_KBD; |
5079 |
int reboot_force; |
5080 |
|
5081 |
-@@ -276,7 +276,7 @@ static struct dmi_system_id __initdata r |
5082 |
- DMI_MATCH(DMI_BOARD_NAME, "P4S800"), |
5083 |
- }, |
5084 |
- }, |
5085 |
-- { } |
5086 |
-+ { NULL, NULL, {{0, {0}}}, NULL} |
5087 |
- }; |
5088 |
- |
5089 |
- static int __init reboot_init(void) |
5090 |
@@ -292,12 +292,12 @@ core_initcall(reboot_init); |
5091 |
controller to pulse the CPU reset line, which is more thorough, but |
5092 |
doesn't work with at least one type of 486 motherboard. It is easy |
5093 |
@@ -14898,9 +14823,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/reboot.c linux-2.6.32.38/arch/x86/ker |
5094 |
|
5095 |
/* Set up the IDT for real mode. */ |
5096 |
load_idt(&real_mode_idt); |
5097 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/setup.c linux-2.6.32.38/arch/x86/kernel/setup.c |
5098 |
---- linux-2.6.32.38/arch/x86/kernel/setup.c 2011-04-17 17:00:52.000000000 -0400 |
5099 |
-+++ linux-2.6.32.38/arch/x86/kernel/setup.c 2011-04-17 17:03:05.000000000 -0400 |
5100 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/setup.c linux-2.6.32.39/arch/x86/kernel/setup.c |
5101 |
+--- linux-2.6.32.39/arch/x86/kernel/setup.c 2011-04-17 17:00:52.000000000 -0400 |
5102 |
++++ linux-2.6.32.39/arch/x86/kernel/setup.c 2011-04-17 17:03:05.000000000 -0400 |
5103 |
@@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p) |
5104 |
|
5105 |
if (!boot_params.hdr.root_flags) |
5106 |
@@ -14921,9 +14846,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/setup.c linux-2.6.32.38/arch/x86/kern |
5107 |
data_resource.end = virt_to_phys(_edata)-1; |
5108 |
bss_resource.start = virt_to_phys(&__bss_start); |
5109 |
bss_resource.end = virt_to_phys(&__bss_stop)-1; |
5110 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/setup_percpu.c linux-2.6.32.38/arch/x86/kernel/setup_percpu.c |
5111 |
---- linux-2.6.32.38/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.000000000 -0400 |
5112 |
-+++ linux-2.6.32.38/arch/x86/kernel/setup_percpu.c 2011-04-17 15:56:46.000000000 -0400 |
5113 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/setup_percpu.c linux-2.6.32.39/arch/x86/kernel/setup_percpu.c |
5114 |
+--- linux-2.6.32.39/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.000000000 -0400 |
5115 |
++++ linux-2.6.32.39/arch/x86/kernel/setup_percpu.c 2011-04-17 15:56:46.000000000 -0400 |
5116 |
@@ -25,19 +25,17 @@ |
5117 |
# define DBG(x...) |
5118 |
#endif |
5119 |
@@ -14987,9 +14912,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/setup_percpu.c linux-2.6.32.38/arch/x |
5120 |
/* |
5121 |
* Up to this point, the boot CPU has been using .data.init |
5122 |
* area. Reload any changed state for the boot CPU. |
5123 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/signal.c linux-2.6.32.38/arch/x86/kernel/signal.c |
5124 |
---- linux-2.6.32.38/arch/x86/kernel/signal.c 2011-03-27 14:31:47.000000000 -0400 |
5125 |
-+++ linux-2.6.32.38/arch/x86/kernel/signal.c 2011-04-17 15:56:46.000000000 -0400 |
5126 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/signal.c linux-2.6.32.39/arch/x86/kernel/signal.c |
5127 |
+--- linux-2.6.32.39/arch/x86/kernel/signal.c 2011-03-27 14:31:47.000000000 -0400 |
5128 |
++++ linux-2.6.32.39/arch/x86/kernel/signal.c 2011-04-17 15:56:46.000000000 -0400 |
5129 |
@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi |
5130 |
* Align the stack pointer according to the i386 ABI, |
5131 |
* i.e. so that on function entry ((sp + 4) & 15) == 0. |
5132 |
@@ -15064,9 +14989,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/signal.c linux-2.6.32.38/arch/x86/ker |
5133 |
return; |
5134 |
|
5135 |
if (current_thread_info()->status & TS_RESTORE_SIGMASK) |
5136 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/smpboot.c linux-2.6.32.38/arch/x86/kernel/smpboot.c |
5137 |
---- linux-2.6.32.38/arch/x86/kernel/smpboot.c 2011-03-27 14:31:47.000000000 -0400 |
5138 |
-+++ linux-2.6.32.38/arch/x86/kernel/smpboot.c 2011-04-17 15:56:46.000000000 -0400 |
5139 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/smpboot.c linux-2.6.32.39/arch/x86/kernel/smpboot.c |
5140 |
+--- linux-2.6.32.39/arch/x86/kernel/smpboot.c 2011-03-27 14:31:47.000000000 -0400 |
5141 |
++++ linux-2.6.32.39/arch/x86/kernel/smpboot.c 2011-04-17 15:56:46.000000000 -0400 |
5142 |
@@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct |
5143 |
*/ |
5144 |
static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex); |
5145 |
@@ -15124,9 +15049,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/smpboot.c linux-2.6.32.38/arch/x86/ke |
5146 |
err = do_boot_cpu(apicid, cpu); |
5147 |
|
5148 |
if (err) { |
5149 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/step.c linux-2.6.32.38/arch/x86/kernel/step.c |
5150 |
---- linux-2.6.32.38/arch/x86/kernel/step.c 2011-03-27 14:31:47.000000000 -0400 |
5151 |
-+++ linux-2.6.32.38/arch/x86/kernel/step.c 2011-04-17 15:56:46.000000000 -0400 |
5152 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/step.c linux-2.6.32.39/arch/x86/kernel/step.c |
5153 |
+--- linux-2.6.32.39/arch/x86/kernel/step.c 2011-03-27 14:31:47.000000000 -0400 |
5154 |
++++ linux-2.6.32.39/arch/x86/kernel/step.c 2011-04-17 15:56:46.000000000 -0400 |
5155 |
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc |
5156 |
struct desc_struct *desc; |
5157 |
unsigned long base; |
5158 |
@@ -15169,17 +15094,17 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/step.c linux-2.6.32.38/arch/x86/kerne |
5159 |
/* 32-bit mode: register increment */ |
5160 |
return 0; |
5161 |
/* 64-bit mode: REX prefix */ |
5162 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/syscall_table_32.S linux-2.6.32.38/arch/x86/kernel/syscall_table_32.S |
5163 |
---- linux-2.6.32.38/arch/x86/kernel/syscall_table_32.S 2011-03-27 14:31:47.000000000 -0400 |
5164 |
-+++ linux-2.6.32.38/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:56:46.000000000 -0400 |
5165 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S |
5166 |
+--- linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S 2011-03-27 14:31:47.000000000 -0400 |
5167 |
++++ linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:56:46.000000000 -0400 |
5168 |
@@ -1,3 +1,4 @@ |
5169 |
+.section .rodata,"a",@progbits |
5170 |
ENTRY(sys_call_table) |
5171 |
.long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ |
5172 |
.long sys_exit |
5173 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c |
5174 |
---- linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c 2011-03-27 14:31:47.000000000 -0400 |
5175 |
-+++ linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:56:46.000000000 -0400 |
5176 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c |
5177 |
+--- linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c 2011-03-27 14:31:47.000000000 -0400 |
5178 |
++++ linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:56:46.000000000 -0400 |
5179 |
@@ -24,6 +24,21 @@ |
5180 |
|
5181 |
#include <asm/syscalls.h> |
5182 |
@@ -15451,9 +15376,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_i386_32.c linux-2.6.32.38/arch/x8 |
5183 |
- : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory"); |
5184 |
- return __res; |
5185 |
-} |
5186 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c |
5187 |
---- linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c 2011-03-27 14:31:47.000000000 -0400 |
5188 |
-+++ linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:56:46.000000000 -0400 |
5189 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c |
5190 |
+--- linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c 2011-03-27 14:31:47.000000000 -0400 |
5191 |
++++ linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:56:46.000000000 -0400 |
5192 |
@@ -32,8 +32,8 @@ out: |
5193 |
return error; |
5194 |
} |
5195 |
@@ -15591,9 +15516,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/sys_x86_64.c linux-2.6.32.38/arch/x86 |
5196 |
mm->cached_hole_size = ~0UL; |
5197 |
|
5198 |
return addr; |
5199 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/time.c linux-2.6.32.38/arch/x86/kernel/time.c |
5200 |
---- linux-2.6.32.38/arch/x86/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 |
5201 |
-+++ linux-2.6.32.38/arch/x86/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 |
5202 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/time.c linux-2.6.32.39/arch/x86/kernel/time.c |
5203 |
+--- linux-2.6.32.39/arch/x86/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 |
5204 |
++++ linux-2.6.32.39/arch/x86/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 |
5205 |
@@ -26,17 +26,13 @@ |
5206 |
int timer_ack; |
5207 |
#endif |
5208 |
@@ -15632,9 +15557,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/time.c linux-2.6.32.38/arch/x86/kerne |
5209 |
} |
5210 |
return pc; |
5211 |
} |
5212 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/tls.c linux-2.6.32.38/arch/x86/kernel/tls.c |
5213 |
---- linux-2.6.32.38/arch/x86/kernel/tls.c 2011-03-27 14:31:47.000000000 -0400 |
5214 |
-+++ linux-2.6.32.38/arch/x86/kernel/tls.c 2011-04-17 15:56:46.000000000 -0400 |
5215 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/tls.c linux-2.6.32.39/arch/x86/kernel/tls.c |
5216 |
+--- linux-2.6.32.39/arch/x86/kernel/tls.c 2011-03-27 14:31:47.000000000 -0400 |
5217 |
++++ linux-2.6.32.39/arch/x86/kernel/tls.c 2011-04-17 15:56:46.000000000 -0400 |
5218 |
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc |
5219 |
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) |
5220 |
return -EINVAL; |
5221 |
@@ -15647,9 +15572,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/tls.c linux-2.6.32.38/arch/x86/kernel |
5222 |
set_tls_desc(p, idx, &info, 1); |
5223 |
|
5224 |
return 0; |
5225 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/trampoline_32.S linux-2.6.32.38/arch/x86/kernel/trampoline_32.S |
5226 |
---- linux-2.6.32.38/arch/x86/kernel/trampoline_32.S 2011-03-27 14:31:47.000000000 -0400 |
5227 |
-+++ linux-2.6.32.38/arch/x86/kernel/trampoline_32.S 2011-04-17 15:56:46.000000000 -0400 |
5228 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_32.S linux-2.6.32.39/arch/x86/kernel/trampoline_32.S |
5229 |
+--- linux-2.6.32.39/arch/x86/kernel/trampoline_32.S 2011-03-27 14:31:47.000000000 -0400 |
5230 |
++++ linux-2.6.32.39/arch/x86/kernel/trampoline_32.S 2011-04-17 15:56:46.000000000 -0400 |
5231 |
@@ -32,6 +32,12 @@ |
5232 |
#include <asm/segment.h> |
5233 |
#include <asm/page_types.h> |
5234 |
@@ -15672,9 +15597,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/trampoline_32.S linux-2.6.32.38/arch/ |
5235 |
|
5236 |
# These need to be in the same 64K segment as the above; |
5237 |
# hence we don't use the boot_gdt_descr defined in head.S |
5238 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/trampoline_64.S linux-2.6.32.38/arch/x86/kernel/trampoline_64.S |
5239 |
---- linux-2.6.32.38/arch/x86/kernel/trampoline_64.S 2011-03-27 14:31:47.000000000 -0400 |
5240 |
-+++ linux-2.6.32.38/arch/x86/kernel/trampoline_64.S 2011-04-17 15:56:46.000000000 -0400 |
5241 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_64.S linux-2.6.32.39/arch/x86/kernel/trampoline_64.S |
5242 |
+--- linux-2.6.32.39/arch/x86/kernel/trampoline_64.S 2011-03-27 14:31:47.000000000 -0400 |
5243 |
++++ linux-2.6.32.39/arch/x86/kernel/trampoline_64.S 2011-04-17 15:56:46.000000000 -0400 |
5244 |
@@ -91,7 +91,7 @@ startup_32: |
5245 |
movl $__KERNEL_DS, %eax # Initialize the %ds segment register |
5246 |
movl %eax, %ds |
5247 |
@@ -15693,9 +15618,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/trampoline_64.S linux-2.6.32.38/arch/ |
5248 |
.long tgdt - r_base |
5249 |
.short 0 |
5250 |
.quad 0x00cf9b000000ffff # __KERNEL32_CS |
5251 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/traps.c linux-2.6.32.38/arch/x86/kernel/traps.c |
5252 |
---- linux-2.6.32.38/arch/x86/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 |
5253 |
-+++ linux-2.6.32.38/arch/x86/kernel/traps.c 2011-04-17 15:56:46.000000000 -0400 |
5254 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/traps.c linux-2.6.32.39/arch/x86/kernel/traps.c |
5255 |
+--- linux-2.6.32.39/arch/x86/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 |
5256 |
++++ linux-2.6.32.39/arch/x86/kernel/traps.c 2011-04-17 15:56:46.000000000 -0400 |
5257 |
@@ -69,12 +69,6 @@ asmlinkage int system_call(void); |
5258 |
|
5259 |
/* Do we ignore FPU interrupts ? */ |
5260 |
@@ -15864,21 +15789,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/traps.c linux-2.6.32.38/arch/x86/kern |
5261 |
|
5262 |
if (!tsk_used_math(tsk)) { |
5263 |
local_irq_enable(); |
5264 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/tsc.c linux-2.6.32.38/arch/x86/kernel/tsc.c |
5265 |
---- linux-2.6.32.38/arch/x86/kernel/tsc.c 2011-03-27 14:31:47.000000000 -0400 |
5266 |
-+++ linux-2.6.32.38/arch/x86/kernel/tsc.c 2011-04-17 15:56:46.000000000 -0400 |
5267 |
-@@ -838,7 +838,7 @@ static struct dmi_system_id __initdata b |
5268 |
- DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), |
5269 |
- }, |
5270 |
- }, |
5271 |
-- {} |
5272 |
-+ { NULL, NULL, {{0, {0}}}, NULL} |
5273 |
- }; |
5274 |
- |
5275 |
- static void __init check_system_tsc_reliable(void) |
5276 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/vm86_32.c linux-2.6.32.38/arch/x86/kernel/vm86_32.c |
5277 |
---- linux-2.6.32.38/arch/x86/kernel/vm86_32.c 2011-03-27 14:31:47.000000000 -0400 |
5278 |
-+++ linux-2.6.32.38/arch/x86/kernel/vm86_32.c 2011-04-17 15:56:46.000000000 -0400 |
5279 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/vm86_32.c linux-2.6.32.39/arch/x86/kernel/vm86_32.c |
5280 |
+--- linux-2.6.32.39/arch/x86/kernel/vm86_32.c 2011-03-27 14:31:47.000000000 -0400 |
5281 |
++++ linux-2.6.32.39/arch/x86/kernel/vm86_32.c 2011-04-17 15:56:46.000000000 -0400 |
5282 |
@@ -41,6 +41,7 @@ |
5283 |
#include <linux/ptrace.h> |
5284 |
#include <linux/audit.h> |
5285 |
@@ -15943,9 +15856,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vm86_32.c linux-2.6.32.38/arch/x86/ke |
5286 |
if (get_user(segoffs, intr_ptr)) |
5287 |
goto cannot_handle; |
5288 |
if ((segoffs >> 16) == BIOSSEG) |
5289 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/vmi_32.c linux-2.6.32.38/arch/x86/kernel/vmi_32.c |
5290 |
---- linux-2.6.32.38/arch/x86/kernel/vmi_32.c 2011-03-27 14:31:47.000000000 -0400 |
5291 |
-+++ linux-2.6.32.38/arch/x86/kernel/vmi_32.c 2011-04-17 15:56:46.000000000 -0400 |
5292 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/vmi_32.c linux-2.6.32.39/arch/x86/kernel/vmi_32.c |
5293 |
+--- linux-2.6.32.39/arch/x86/kernel/vmi_32.c 2011-03-27 14:31:47.000000000 -0400 |
5294 |
++++ linux-2.6.32.39/arch/x86/kernel/vmi_32.c 2011-04-17 15:56:46.000000000 -0400 |
5295 |
@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) |
5296 |
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); |
5297 |
|
5298 |
@@ -16108,9 +16021,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vmi_32.c linux-2.6.32.38/arch/x86/ker |
5299 |
return; |
5300 |
|
5301 |
local_irq_save(flags); |
5302 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S |
5303 |
---- linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400 |
5304 |
-+++ linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:56:46.000000000 -0400 |
5305 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S |
5306 |
+--- linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400 |
5307 |
++++ linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:56:46.000000000 -0400 |
5308 |
@@ -26,6 +26,13 @@ |
5309 |
#include <asm/page_types.h> |
5310 |
#include <asm/cache.h> |
5311 |
@@ -16403,9 +16316,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.38/arch/x8 |
5312 |
"kernel image bigger than KERNEL_IMAGE_SIZE"); |
5313 |
|
5314 |
#ifdef CONFIG_SMP |
5315 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c |
5316 |
---- linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c 2011-03-27 14:31:47.000000000 -0400 |
5317 |
-+++ linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c 2011-04-17 15:56:46.000000000 -0400 |
5318 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c |
5319 |
+--- linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c 2011-03-27 14:31:47.000000000 -0400 |
5320 |
++++ linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c 2011-04-23 12:56:10.000000000 -0400 |
5321 |
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa |
5322 |
|
5323 |
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); |
5324 |
@@ -16423,25 +16336,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/vsyscall_64.c linux-2.6.32.38/arch/x8 |
5325 |
p = tcache->blob[1]; |
5326 |
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) { |
5327 |
/* Load per CPU data from RDTSCP */ |
5328 |
-@@ -234,13 +235,13 @@ static ctl_table kernel_table2[] = { |
5329 |
- .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), |
5330 |
- .mode = 0644, |
5331 |
- .proc_handler = proc_dointvec }, |
5332 |
-- {} |
5333 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
5334 |
- }; |
5335 |
- |
5336 |
- static ctl_table kernel_root_table2[] = { |
5337 |
- { .ctl_name = CTL_KERN, .procname = "kernel", .mode = 0555, |
5338 |
- .child = kernel_table2 }, |
5339 |
-- {} |
5340 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
5341 |
- }; |
5342 |
- #endif |
5343 |
- |
5344 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c |
5345 |
---- linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c 2011-03-27 14:31:47.000000000 -0400 |
5346 |
-+++ linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:56:46.000000000 -0400 |
5347 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c |
5348 |
+--- linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c 2011-03-27 14:31:47.000000000 -0400 |
5349 |
++++ linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:56:46.000000000 -0400 |
5350 |
@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); |
5351 |
|
5352 |
EXPORT_SYMBOL(copy_user_generic); |
5353 |
@@ -16451,9 +16348,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.38/arch |
5354 |
EXPORT_SYMBOL(__copy_from_user_inatomic); |
5355 |
|
5356 |
EXPORT_SYMBOL(copy_page); |
5357 |
-diff -urNp linux-2.6.32.38/arch/x86/kernel/xsave.c linux-2.6.32.38/arch/x86/kernel/xsave.c |
5358 |
---- linux-2.6.32.38/arch/x86/kernel/xsave.c 2011-03-27 14:31:47.000000000 -0400 |
5359 |
-+++ linux-2.6.32.38/arch/x86/kernel/xsave.c 2011-04-17 15:56:46.000000000 -0400 |
5360 |
+diff -urNp linux-2.6.32.39/arch/x86/kernel/xsave.c linux-2.6.32.39/arch/x86/kernel/xsave.c |
5361 |
+--- linux-2.6.32.39/arch/x86/kernel/xsave.c 2011-03-27 14:31:47.000000000 -0400 |
5362 |
++++ linux-2.6.32.39/arch/x86/kernel/xsave.c 2011-04-17 15:56:46.000000000 -0400 |
5363 |
@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ |
5364 |
fx_sw_user->xstate_size > fx_sw_user->extended_size) |
5365 |
return -1; |
5366 |
@@ -16481,9 +16378,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kernel/xsave.c linux-2.6.32.38/arch/x86/kern |
5367 |
buf); |
5368 |
if (unlikely(err)) { |
5369 |
/* |
5370 |
-diff -urNp linux-2.6.32.38/arch/x86/kvm/emulate.c linux-2.6.32.38/arch/x86/kvm/emulate.c |
5371 |
---- linux-2.6.32.38/arch/x86/kvm/emulate.c 2011-03-27 14:31:47.000000000 -0400 |
5372 |
-+++ linux-2.6.32.38/arch/x86/kvm/emulate.c 2011-04-17 15:56:46.000000000 -0400 |
5373 |
+diff -urNp linux-2.6.32.39/arch/x86/kvm/emulate.c linux-2.6.32.39/arch/x86/kvm/emulate.c |
5374 |
+--- linux-2.6.32.39/arch/x86/kvm/emulate.c 2011-03-27 14:31:47.000000000 -0400 |
5375 |
++++ linux-2.6.32.39/arch/x86/kvm/emulate.c 2011-04-17 15:56:46.000000000 -0400 |
5376 |
@@ -81,8 +81,8 @@ |
5377 |
#define Src2CL (1<<29) |
5378 |
#define Src2ImmByte (2<<29) |
5379 |
@@ -16520,9 +16417,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/emulate.c linux-2.6.32.38/arch/x86/kvm/e |
5380 |
switch ((_dst).bytes) { \ |
5381 |
case 1: \ |
5382 |
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ |
5383 |
-diff -urNp linux-2.6.32.38/arch/x86/kvm/lapic.c linux-2.6.32.38/arch/x86/kvm/lapic.c |
5384 |
---- linux-2.6.32.38/arch/x86/kvm/lapic.c 2011-03-27 14:31:47.000000000 -0400 |
5385 |
-+++ linux-2.6.32.38/arch/x86/kvm/lapic.c 2011-04-17 15:56:46.000000000 -0400 |
5386 |
+diff -urNp linux-2.6.32.39/arch/x86/kvm/lapic.c linux-2.6.32.39/arch/x86/kvm/lapic.c |
5387 |
+--- linux-2.6.32.39/arch/x86/kvm/lapic.c 2011-03-27 14:31:47.000000000 -0400 |
5388 |
++++ linux-2.6.32.39/arch/x86/kvm/lapic.c 2011-04-17 15:56:46.000000000 -0400 |
5389 |
@@ -52,7 +52,7 @@ |
5390 |
#define APIC_BUS_CYCLE_NS 1 |
5391 |
|
5392 |
@@ -16532,9 +16429,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/lapic.c linux-2.6.32.38/arch/x86/kvm/lap |
5393 |
|
5394 |
#define APIC_LVT_NUM 6 |
5395 |
/* 14 is the version for Xeon and Pentium 8.4.8*/ |
5396 |
-diff -urNp linux-2.6.32.38/arch/x86/kvm/svm.c linux-2.6.32.38/arch/x86/kvm/svm.c |
5397 |
---- linux-2.6.32.38/arch/x86/kvm/svm.c 2011-03-27 14:31:47.000000000 -0400 |
5398 |
-+++ linux-2.6.32.38/arch/x86/kvm/svm.c 2011-04-17 15:56:46.000000000 -0400 |
5399 |
+diff -urNp linux-2.6.32.39/arch/x86/kvm/svm.c linux-2.6.32.39/arch/x86/kvm/svm.c |
5400 |
+--- linux-2.6.32.39/arch/x86/kvm/svm.c 2011-03-27 14:31:47.000000000 -0400 |
5401 |
++++ linux-2.6.32.39/arch/x86/kvm/svm.c 2011-04-17 15:56:46.000000000 -0400 |
5402 |
@@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k |
5403 |
static void reload_tss(struct kvm_vcpu *vcpu) |
5404 |
{ |
5405 |
@@ -16558,9 +16455,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/svm.c linux-2.6.32.38/arch/x86/kvm/svm.c |
5406 |
.cpu_has_kvm_support = has_svm, |
5407 |
.disabled_by_bios = is_disabled, |
5408 |
.hardware_setup = svm_hardware_setup, |
5409 |
-diff -urNp linux-2.6.32.38/arch/x86/kvm/vmx.c linux-2.6.32.38/arch/x86/kvm/vmx.c |
5410 |
---- linux-2.6.32.38/arch/x86/kvm/vmx.c 2011-03-27 14:31:47.000000000 -0400 |
5411 |
-+++ linux-2.6.32.38/arch/x86/kvm/vmx.c 2011-04-17 15:56:46.000000000 -0400 |
5412 |
+diff -urNp linux-2.6.32.39/arch/x86/kvm/vmx.c linux-2.6.32.39/arch/x86/kvm/vmx.c |
5413 |
+--- linux-2.6.32.39/arch/x86/kvm/vmx.c 2011-03-27 14:31:47.000000000 -0400 |
5414 |
++++ linux-2.6.32.39/arch/x86/kvm/vmx.c 2011-04-23 12:56:10.000000000 -0400 |
5415 |
@@ -570,7 +570,11 @@ static void reload_tss(void) |
5416 |
|
5417 |
kvm_get_gdt(&gdt); |
5418 |
@@ -16624,16 +16521,25 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/vmx.c linux-2.6.32.38/arch/x86/kvm/vmx.c |
5419 |
#ifdef CONFIG_X86_64 |
5420 |
, "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" |
5421 |
#endif |
5422 |
-@@ -3781,7 +3799,7 @@ static void vmx_vcpu_run(struct kvm_vcpu |
5423 |
+@@ -3781,7 +3799,16 @@ static void vmx_vcpu_run(struct kvm_vcpu |
5424 |
if (vmx->rmode.irq.pending) |
5425 |
fixup_rmode_irq(vmx); |
5426 |
|
5427 |
- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS)); |
5428 |
+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS)); |
5429 |
++ |
5430 |
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) |
5431 |
++ asm("mov %0, %%fs" : : "r"(__KERNEL_PERCPU)); |
5432 |
++#endif |
5433 |
++ |
5434 |
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) |
5435 |
++ __set_fs(current_thread_info()->addr_limit); |
5436 |
++#endif |
5437 |
++ |
5438 |
vmx->launched = 1; |
5439 |
|
5440 |
vmx_complete_interrupts(vmx); |
5441 |
-@@ -3956,7 +3974,7 @@ static bool vmx_gb_page_enable(void) |
5442 |
+@@ -3956,7 +3983,7 @@ static bool vmx_gb_page_enable(void) |
5443 |
return false; |
5444 |
} |
5445 |
|
5446 |
@@ -16642,10 +16548,10 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/vmx.c linux-2.6.32.38/arch/x86/kvm/vmx.c |
5447 |
.cpu_has_kvm_support = cpu_has_kvm_support, |
5448 |
.disabled_by_bios = vmx_disabled_by_bios, |
5449 |
.hardware_setup = hardware_setup, |
5450 |
-diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c linux-2.6.32.38/arch/x86/kvm/x86.c |
5451 |
---- linux-2.6.32.38/arch/x86/kvm/x86.c 2011-03-27 14:31:47.000000000 -0400 |
5452 |
-+++ linux-2.6.32.38/arch/x86/kvm/x86.c 2011-04-17 15:56:46.000000000 -0400 |
5453 |
-@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct |
5454 |
+diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/kvm/x86.c |
5455 |
+--- linux-2.6.32.39/arch/x86/kvm/x86.c 2011-03-27 14:31:47.000000000 -0400 |
5456 |
++++ linux-2.6.32.39/arch/x86/kvm/x86.c 2011-04-23 12:56:10.000000000 -0400 |
5457 |
+@@ -81,7 +81,7 @@ static void update_cr8_intercept(struct |
5458 |
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, |
5459 |
struct kvm_cpuid_entry2 __user *entries); |
5460 |
|
5461 |
@@ -16654,77 +16560,55 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c linux-2.6.32.38/arch/x86/kvm/x86.c |
5462 |
EXPORT_SYMBOL_GPL(kvm_x86_ops); |
5463 |
|
5464 |
int ignore_msrs = 0; |
5465 |
- module_param_named(ignore_msrs, ignore_msrs, bool, S_IRUGO | S_IWUSR); |
5466 |
- |
5467 |
- struct kvm_stats_debugfs_item debugfs_entries[] = { |
5468 |
-- { "pf_fixed", VCPU_STAT(pf_fixed) }, |
5469 |
-- { "pf_guest", VCPU_STAT(pf_guest) }, |
5470 |
-- { "tlb_flush", VCPU_STAT(tlb_flush) }, |
5471 |
-- { "invlpg", VCPU_STAT(invlpg) }, |
5472 |
-- { "exits", VCPU_STAT(exits) }, |
5473 |
-- { "io_exits", VCPU_STAT(io_exits) }, |
5474 |
-- { "mmio_exits", VCPU_STAT(mmio_exits) }, |
5475 |
-- { "signal_exits", VCPU_STAT(signal_exits) }, |
5476 |
-- { "irq_window", VCPU_STAT(irq_window_exits) }, |
5477 |
-- { "nmi_window", VCPU_STAT(nmi_window_exits) }, |
5478 |
-- { "halt_exits", VCPU_STAT(halt_exits) }, |
5479 |
-- { "halt_wakeup", VCPU_STAT(halt_wakeup) }, |
5480 |
-- { "hypercalls", VCPU_STAT(hypercalls) }, |
5481 |
-- { "request_irq", VCPU_STAT(request_irq_exits) }, |
5482 |
-- { "irq_exits", VCPU_STAT(irq_exits) }, |
5483 |
-- { "host_state_reload", VCPU_STAT(host_state_reload) }, |
5484 |
-- { "efer_reload", VCPU_STAT(efer_reload) }, |
5485 |
-- { "fpu_reload", VCPU_STAT(fpu_reload) }, |
5486 |
-- { "insn_emulation", VCPU_STAT(insn_emulation) }, |
5487 |
-- { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail) }, |
5488 |
-- { "irq_injections", VCPU_STAT(irq_injections) }, |
5489 |
-- { "nmi_injections", VCPU_STAT(nmi_injections) }, |
5490 |
-- { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped) }, |
5491 |
-- { "mmu_pte_write", VM_STAT(mmu_pte_write) }, |
5492 |
-- { "mmu_pte_updated", VM_STAT(mmu_pte_updated) }, |
5493 |
-- { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped) }, |
5494 |
-- { "mmu_flooded", VM_STAT(mmu_flooded) }, |
5495 |
-- { "mmu_recycled", VM_STAT(mmu_recycled) }, |
5496 |
-- { "mmu_cache_miss", VM_STAT(mmu_cache_miss) }, |
5497 |
-- { "mmu_unsync", VM_STAT(mmu_unsync) }, |
5498 |
-- { "remote_tlb_flush", VM_STAT(remote_tlb_flush) }, |
5499 |
-- { "largepages", VM_STAT(lpages) }, |
5500 |
-+ { "pf_fixed", VCPU_STAT(pf_fixed), NULL }, |
5501 |
-+ { "pf_guest", VCPU_STAT(pf_guest), NULL }, |
5502 |
-+ { "tlb_flush", VCPU_STAT(tlb_flush), NULL }, |
5503 |
-+ { "invlpg", VCPU_STAT(invlpg), NULL }, |
5504 |
-+ { "exits", VCPU_STAT(exits), NULL }, |
5505 |
-+ { "io_exits", VCPU_STAT(io_exits), NULL }, |
5506 |
-+ { "mmio_exits", VCPU_STAT(mmio_exits), NULL }, |
5507 |
-+ { "signal_exits", VCPU_STAT(signal_exits), NULL }, |
5508 |
-+ { "irq_window", VCPU_STAT(irq_window_exits), NULL }, |
5509 |
-+ { "nmi_window", VCPU_STAT(nmi_window_exits), NULL }, |
5510 |
-+ { "halt_exits", VCPU_STAT(halt_exits), NULL }, |
5511 |
-+ { "halt_wakeup", VCPU_STAT(halt_wakeup), NULL }, |
5512 |
-+ { "hypercalls", VCPU_STAT(hypercalls), NULL }, |
5513 |
-+ { "request_irq", VCPU_STAT(request_irq_exits), NULL }, |
5514 |
-+ { "irq_exits", VCPU_STAT(irq_exits), NULL }, |
5515 |
-+ { "host_state_reload", VCPU_STAT(host_state_reload), NULL }, |
5516 |
-+ { "efer_reload", VCPU_STAT(efer_reload), NULL }, |
5517 |
-+ { "fpu_reload", VCPU_STAT(fpu_reload), NULL }, |
5518 |
-+ { "insn_emulation", VCPU_STAT(insn_emulation), NULL }, |
5519 |
-+ { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail), NULL }, |
5520 |
-+ { "irq_injections", VCPU_STAT(irq_injections), NULL }, |
5521 |
-+ { "nmi_injections", VCPU_STAT(nmi_injections), NULL }, |
5522 |
-+ { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped), NULL }, |
5523 |
-+ { "mmu_pte_write", VM_STAT(mmu_pte_write), NULL }, |
5524 |
-+ { "mmu_pte_updated", VM_STAT(mmu_pte_updated), NULL }, |
5525 |
-+ { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped), NULL }, |
5526 |
-+ { "mmu_flooded", VM_STAT(mmu_flooded), NULL }, |
5527 |
-+ { "mmu_recycled", VM_STAT(mmu_recycled), NULL }, |
5528 |
-+ { "mmu_cache_miss", VM_STAT(mmu_cache_miss), NULL }, |
5529 |
-+ { "mmu_unsync", VM_STAT(mmu_unsync), NULL }, |
5530 |
-+ { "remote_tlb_flush", VM_STAT(remote_tlb_flush), NULL }, |
5531 |
-+ { "largepages", VM_STAT(lpages), NULL }, |
5532 |
- { NULL } |
5533 |
- }; |
5534 |
- |
5535 |
-@@ -1638,7 +1638,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru |
5536 |
+@@ -1390,15 +1390,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str |
5537 |
+ struct kvm_cpuid2 *cpuid, |
5538 |
+ struct kvm_cpuid_entry2 __user *entries) |
5539 |
+ { |
5540 |
+- int r; |
5541 |
++ int r, i; |
5542 |
+ |
5543 |
+ r = -E2BIG; |
5544 |
+ if (cpuid->nent > KVM_MAX_CPUID_ENTRIES) |
5545 |
+ goto out; |
5546 |
+ r = -EFAULT; |
5547 |
+- if (copy_from_user(&vcpu->arch.cpuid_entries, entries, |
5548 |
+- cpuid->nent * sizeof(struct kvm_cpuid_entry2))) |
5549 |
++ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2))) |
5550 |
+ goto out; |
5551 |
++ for (i = 0; i < cpuid->nent; ++i) { |
5552 |
++ struct kvm_cpuid_entry2 cpuid_entry; |
5553 |
++ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry))) |
5554 |
++ goto out; |
5555 |
++ vcpu->arch.cpuid_entries[i] = cpuid_entry; |
5556 |
++ } |
5557 |
+ vcpu->arch.cpuid_nent = cpuid->nent; |
5558 |
+ kvm_apic_set_version(vcpu); |
5559 |
+ return 0; |
5560 |
+@@ -1411,16 +1416,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(str |
5561 |
+ struct kvm_cpuid2 *cpuid, |
5562 |
+ struct kvm_cpuid_entry2 __user *entries) |
5563 |
+ { |
5564 |
+- int r; |
5565 |
++ int r, i; |
5566 |
+ |
5567 |
+ vcpu_load(vcpu); |
5568 |
+ r = -E2BIG; |
5569 |
+ if (cpuid->nent < vcpu->arch.cpuid_nent) |
5570 |
+ goto out; |
5571 |
+ r = -EFAULT; |
5572 |
+- if (copy_to_user(entries, &vcpu->arch.cpuid_entries, |
5573 |
+- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) |
5574 |
++ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) |
5575 |
+ goto out; |
5576 |
++ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) { |
5577 |
++ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i]; |
5578 |
++ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry))) |
5579 |
++ goto out; |
5580 |
++ } |
5581 |
+ return 0; |
5582 |
+ |
5583 |
+ out: |
5584 |
+@@ -1638,7 +1647,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru |
5585 |
static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, |
5586 |
struct kvm_interrupt *irq) |
5587 |
{ |
5588 |
@@ -16733,7 +16617,7 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c linux-2.6.32.38/arch/x86/kvm/x86.c |
5589 |
return -EINVAL; |
5590 |
if (irqchip_in_kernel(vcpu->kvm)) |
5591 |
return -ENXIO; |
5592 |
-@@ -3220,10 +3220,10 @@ static struct notifier_block kvmclock_cp |
5593 |
+@@ -3220,10 +3229,10 @@ static struct notifier_block kvmclock_cp |
5594 |
.notifier_call = kvmclock_cpufreq_notifier |
5595 |
}; |
5596 |
|
5597 |
@@ -16746,9 +16630,9 @@ diff -urNp linux-2.6.32.38/arch/x86/kvm/x86.c linux-2.6.32.38/arch/x86/kvm/x86.c |
5598 |
|
5599 |
if (kvm_x86_ops) { |
5600 |
printk(KERN_ERR "kvm: already loaded the other module\n"); |
5601 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/checksum_32.S linux-2.6.32.38/arch/x86/lib/checksum_32.S |
5602 |
---- linux-2.6.32.38/arch/x86/lib/checksum_32.S 2011-03-27 14:31:47.000000000 -0400 |
5603 |
-+++ linux-2.6.32.38/arch/x86/lib/checksum_32.S 2011-04-17 15:56:46.000000000 -0400 |
5604 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/checksum_32.S linux-2.6.32.39/arch/x86/lib/checksum_32.S |
5605 |
+--- linux-2.6.32.39/arch/x86/lib/checksum_32.S 2011-03-27 14:31:47.000000000 -0400 |
5606 |
++++ linux-2.6.32.39/arch/x86/lib/checksum_32.S 2011-04-17 15:56:46.000000000 -0400 |
5607 |
@@ -28,7 +28,8 @@ |
5608 |
#include <linux/linkage.h> |
5609 |
#include <asm/dwarf2.h> |
5610 |
@@ -17009,9 +16893,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/checksum_32.S linux-2.6.32.38/arch/x86/l |
5611 |
|
5612 |
#undef ROUND |
5613 |
#undef ROUND1 |
5614 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/clear_page_64.S linux-2.6.32.38/arch/x86/lib/clear_page_64.S |
5615 |
---- linux-2.6.32.38/arch/x86/lib/clear_page_64.S 2011-03-27 14:31:47.000000000 -0400 |
5616 |
-+++ linux-2.6.32.38/arch/x86/lib/clear_page_64.S 2011-04-17 15:56:46.000000000 -0400 |
5617 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/clear_page_64.S linux-2.6.32.39/arch/x86/lib/clear_page_64.S |
5618 |
+--- linux-2.6.32.39/arch/x86/lib/clear_page_64.S 2011-03-27 14:31:47.000000000 -0400 |
5619 |
++++ linux-2.6.32.39/arch/x86/lib/clear_page_64.S 2011-04-17 15:56:46.000000000 -0400 |
5620 |
@@ -43,7 +43,7 @@ ENDPROC(clear_page) |
5621 |
|
5622 |
#include <asm/cpufeature.h> |
5623 |
@@ -17021,9 +16905,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/clear_page_64.S linux-2.6.32.38/arch/x86 |
5624 |
1: .byte 0xeb /* jmp <disp8> */ |
5625 |
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ |
5626 |
2: |
5627 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/copy_page_64.S linux-2.6.32.38/arch/x86/lib/copy_page_64.S |
5628 |
---- linux-2.6.32.38/arch/x86/lib/copy_page_64.S 2011-03-27 14:31:47.000000000 -0400 |
5629 |
-+++ linux-2.6.32.38/arch/x86/lib/copy_page_64.S 2011-04-17 15:56:46.000000000 -0400 |
5630 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/copy_page_64.S linux-2.6.32.39/arch/x86/lib/copy_page_64.S |
5631 |
+--- linux-2.6.32.39/arch/x86/lib/copy_page_64.S 2011-03-27 14:31:47.000000000 -0400 |
5632 |
++++ linux-2.6.32.39/arch/x86/lib/copy_page_64.S 2011-04-17 15:56:46.000000000 -0400 |
5633 |
@@ -104,7 +104,7 @@ ENDPROC(copy_page) |
5634 |
|
5635 |
#include <asm/cpufeature.h> |
5636 |
@@ -17033,9 +16917,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/copy_page_64.S linux-2.6.32.38/arch/x86/ |
5637 |
1: .byte 0xeb /* jmp <disp8> */ |
5638 |
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ |
5639 |
2: |
5640 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user_64.S linux-2.6.32.38/arch/x86/lib/copy_user_64.S |
5641 |
---- linux-2.6.32.38/arch/x86/lib/copy_user_64.S 2011-03-27 14:31:47.000000000 -0400 |
5642 |
-+++ linux-2.6.32.38/arch/x86/lib/copy_user_64.S 2011-04-17 15:56:46.000000000 -0400 |
5643 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_64.S linux-2.6.32.39/arch/x86/lib/copy_user_64.S |
5644 |
+--- linux-2.6.32.39/arch/x86/lib/copy_user_64.S 2011-03-27 14:31:47.000000000 -0400 |
5645 |
++++ linux-2.6.32.39/arch/x86/lib/copy_user_64.S 2011-04-17 15:56:46.000000000 -0400 |
5646 |
@@ -15,13 +15,14 @@ |
5647 |
#include <asm/asm-offsets.h> |
5648 |
#include <asm/thread_info.h> |
5649 |
@@ -17104,9 +16988,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user_64.S linux-2.6.32.38/arch/x86/ |
5650 |
movl %edx,%ecx |
5651 |
xorl %eax,%eax |
5652 |
rep |
5653 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S |
5654 |
---- linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S 2011-03-27 14:31:47.000000000 -0400 |
5655 |
-+++ linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:56:46.000000000 -0400 |
5656 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S |
5657 |
+--- linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S 2011-03-27 14:31:47.000000000 -0400 |
5658 |
++++ linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:56:46.000000000 -0400 |
5659 |
@@ -14,6 +14,7 @@ |
5660 |
#include <asm/current.h> |
5661 |
#include <asm/asm-offsets.h> |
5662 |
@@ -17131,9 +17015,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.38/a |
5663 |
cmpl $8,%edx |
5664 |
jb 20f /* less then 8 bytes, go to byte copy loop */ |
5665 |
ALIGN_DESTINATION |
5666 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c |
5667 |
---- linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c 2011-03-27 14:31:47.000000000 -0400 |
5668 |
-+++ linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:56:46.000000000 -0400 |
5669 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c |
5670 |
+--- linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c 2011-03-27 14:31:47.000000000 -0400 |
5671 |
++++ linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:56:46.000000000 -0400 |
5672 |
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ |
5673 |
len -= 2; |
5674 |
} |
5675 |
@@ -17152,9 +17036,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.38/arch/ |
5676 |
return csum_partial_copy_generic(src, (void __force *)dst, |
5677 |
len, isum, NULL, errp); |
5678 |
} |
5679 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/getuser.S linux-2.6.32.38/arch/x86/lib/getuser.S |
5680 |
---- linux-2.6.32.38/arch/x86/lib/getuser.S 2011-03-27 14:31:47.000000000 -0400 |
5681 |
-+++ linux-2.6.32.38/arch/x86/lib/getuser.S 2011-04-17 15:56:46.000000000 -0400 |
5682 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/getuser.S linux-2.6.32.39/arch/x86/lib/getuser.S |
5683 |
+--- linux-2.6.32.39/arch/x86/lib/getuser.S 2011-03-27 14:31:47.000000000 -0400 |
5684 |
++++ linux-2.6.32.39/arch/x86/lib/getuser.S 2011-04-17 15:56:46.000000000 -0400 |
5685 |
@@ -33,14 +33,35 @@ |
5686 |
#include <asm/asm-offsets.h> |
5687 |
#include <asm/thread_info.h> |
5688 |
@@ -17260,9 +17144,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/getuser.S linux-2.6.32.38/arch/x86/lib/g |
5689 |
4: movq -7(%_ASM_AX),%_ASM_DX |
5690 |
xor %eax,%eax |
5691 |
ret |
5692 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/memcpy_64.S linux-2.6.32.38/arch/x86/lib/memcpy_64.S |
5693 |
---- linux-2.6.32.38/arch/x86/lib/memcpy_64.S 2011-03-27 14:31:47.000000000 -0400 |
5694 |
-+++ linux-2.6.32.38/arch/x86/lib/memcpy_64.S 2011-04-17 15:56:46.000000000 -0400 |
5695 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/memcpy_64.S linux-2.6.32.39/arch/x86/lib/memcpy_64.S |
5696 |
+--- linux-2.6.32.39/arch/x86/lib/memcpy_64.S 2011-03-27 14:31:47.000000000 -0400 |
5697 |
++++ linux-2.6.32.39/arch/x86/lib/memcpy_64.S 2011-04-17 15:56:46.000000000 -0400 |
5698 |
@@ -128,7 +128,7 @@ ENDPROC(__memcpy) |
5699 |
* It is also a lot simpler. Use this when possible: |
5700 |
*/ |
5701 |
@@ -17272,9 +17156,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/memcpy_64.S linux-2.6.32.38/arch/x86/lib |
5702 |
1: .byte 0xeb /* jmp <disp8> */ |
5703 |
.byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ |
5704 |
2: |
5705 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/memset_64.S linux-2.6.32.38/arch/x86/lib/memset_64.S |
5706 |
---- linux-2.6.32.38/arch/x86/lib/memset_64.S 2011-03-27 14:31:47.000000000 -0400 |
5707 |
-+++ linux-2.6.32.38/arch/x86/lib/memset_64.S 2011-04-17 15:56:46.000000000 -0400 |
5708 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/memset_64.S linux-2.6.32.39/arch/x86/lib/memset_64.S |
5709 |
+--- linux-2.6.32.39/arch/x86/lib/memset_64.S 2011-03-27 14:31:47.000000000 -0400 |
5710 |
++++ linux-2.6.32.39/arch/x86/lib/memset_64.S 2011-04-17 15:56:46.000000000 -0400 |
5711 |
@@ -118,7 +118,7 @@ ENDPROC(__memset) |
5712 |
|
5713 |
#include <asm/cpufeature.h> |
5714 |
@@ -17284,9 +17168,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/memset_64.S linux-2.6.32.38/arch/x86/lib |
5715 |
1: .byte 0xeb /* jmp <disp8> */ |
5716 |
.byte (memset_c - memset) - (2f - 1b) /* offset */ |
5717 |
2: |
5718 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/mmx_32.c linux-2.6.32.38/arch/x86/lib/mmx_32.c |
5719 |
---- linux-2.6.32.38/arch/x86/lib/mmx_32.c 2011-03-27 14:31:47.000000000 -0400 |
5720 |
-+++ linux-2.6.32.38/arch/x86/lib/mmx_32.c 2011-04-17 15:56:46.000000000 -0400 |
5721 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/mmx_32.c linux-2.6.32.39/arch/x86/lib/mmx_32.c |
5722 |
+--- linux-2.6.32.39/arch/x86/lib/mmx_32.c 2011-03-27 14:31:47.000000000 -0400 |
5723 |
++++ linux-2.6.32.39/arch/x86/lib/mmx_32.c 2011-04-17 15:56:46.000000000 -0400 |
5724 |
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * |
5725 |
{ |
5726 |
void *p; |
5727 |
@@ -17602,9 +17486,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/mmx_32.c linux-2.6.32.38/arch/x86/lib/mm |
5728 |
|
5729 |
from += 64; |
5730 |
to += 64; |
5731 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/putuser.S linux-2.6.32.38/arch/x86/lib/putuser.S |
5732 |
---- linux-2.6.32.38/arch/x86/lib/putuser.S 2011-03-27 14:31:47.000000000 -0400 |
5733 |
-+++ linux-2.6.32.38/arch/x86/lib/putuser.S 2011-04-17 15:56:46.000000000 -0400 |
5734 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/putuser.S linux-2.6.32.39/arch/x86/lib/putuser.S |
5735 |
+--- linux-2.6.32.39/arch/x86/lib/putuser.S 2011-03-27 14:31:47.000000000 -0400 |
5736 |
++++ linux-2.6.32.39/arch/x86/lib/putuser.S 2011-04-17 15:56:46.000000000 -0400 |
5737 |
@@ -15,7 +15,8 @@ |
5738 |
#include <asm/thread_info.h> |
5739 |
#include <asm/errno.h> |
5740 |
@@ -17742,9 +17626,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/putuser.S linux-2.6.32.38/arch/x86/lib/p |
5741 |
#endif |
5742 |
xor %eax,%eax |
5743 |
EXIT |
5744 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_32.c linux-2.6.32.38/arch/x86/lib/usercopy_32.c |
5745 |
---- linux-2.6.32.38/arch/x86/lib/usercopy_32.c 2011-03-27 14:31:47.000000000 -0400 |
5746 |
-+++ linux-2.6.32.38/arch/x86/lib/usercopy_32.c 2011-04-17 15:56:46.000000000 -0400 |
5747 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_32.c linux-2.6.32.39/arch/x86/lib/usercopy_32.c |
5748 |
+--- linux-2.6.32.39/arch/x86/lib/usercopy_32.c 2011-03-27 14:31:47.000000000 -0400 |
5749 |
++++ linux-2.6.32.39/arch/x86/lib/usercopy_32.c 2011-04-23 21:12:28.000000000 -0400 |
5750 |
@@ -43,7 +43,7 @@ do { \ |
5751 |
__asm__ __volatile__( \ |
5752 |
" testl %1,%1\n" \ |
5753 |
@@ -18266,7 +18150,7 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_32.c linux-2.6.32.38/arch/x86/l |
5754 |
return n; |
5755 |
} |
5756 |
EXPORT_SYMBOL(__copy_from_user_ll_nozero); |
5757 |
-@@ -827,59 +943,37 @@ unsigned long __copy_from_user_ll_nocach |
5758 |
+@@ -827,59 +943,38 @@ unsigned long __copy_from_user_ll_nocach |
5759 |
if (n > 64 && cpu_has_xmm2) |
5760 |
n = __copy_user_intel_nocache(to, from, n); |
5761 |
else |
5762 |
@@ -18317,6 +18201,7 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_32.c linux-2.6.32.38/arch/x86/l |
5763 |
+ return; |
5764 |
} |
5765 |
-EXPORT_SYMBOL(copy_to_user); |
5766 |
++EXPORT_SYMBOL(__set_fs); |
5767 |
|
5768 |
-/** |
5769 |
- * copy_from_user: - Copy a block of data from user space. |
5770 |
@@ -18349,9 +18234,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_32.c linux-2.6.32.38/arch/x86/l |
5771 |
-EXPORT_SYMBOL(copy_from_user); |
5772 |
+EXPORT_SYMBOL(set_fs); |
5773 |
+#endif |
5774 |
-diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_64.c linux-2.6.32.38/arch/x86/lib/usercopy_64.c |
5775 |
---- linux-2.6.32.38/arch/x86/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400 |
5776 |
-+++ linux-2.6.32.38/arch/x86/lib/usercopy_64.c 2011-04-17 15:56:46.000000000 -0400 |
5777 |
+diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_64.c linux-2.6.32.39/arch/x86/lib/usercopy_64.c |
5778 |
+--- linux-2.6.32.39/arch/x86/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400 |
5779 |
++++ linux-2.6.32.39/arch/x86/lib/usercopy_64.c 2011-04-17 15:56:46.000000000 -0400 |
5780 |
@@ -42,6 +42,8 @@ long |
5781 |
__strncpy_from_user(char *dst, const char __user *src, long count) |
5782 |
{ |
5783 |
@@ -18388,9 +18273,9 @@ diff -urNp linux-2.6.32.38/arch/x86/lib/usercopy_64.c linux-2.6.32.38/arch/x86/l |
5784 |
} |
5785 |
EXPORT_SYMBOL(copy_in_user); |
5786 |
|
5787 |
-diff -urNp linux-2.6.32.38/arch/x86/Makefile linux-2.6.32.38/arch/x86/Makefile |
5788 |
---- linux-2.6.32.38/arch/x86/Makefile 2011-03-27 14:31:47.000000000 -0400 |
5789 |
-+++ linux-2.6.32.38/arch/x86/Makefile 2011-04-17 15:56:46.000000000 -0400 |
5790 |
+diff -urNp linux-2.6.32.39/arch/x86/Makefile linux-2.6.32.39/arch/x86/Makefile |
5791 |
+--- linux-2.6.32.39/arch/x86/Makefile 2011-03-27 14:31:47.000000000 -0400 |
5792 |
++++ linux-2.6.32.39/arch/x86/Makefile 2011-04-17 15:56:46.000000000 -0400 |
5793 |
@@ -189,3 +189,12 @@ define archhelp |
5794 |
echo ' FDARGS="..." arguments for the booted kernel' |
5795 |
echo ' FDINITRD=file initrd for the booted kernel' |
5796 |
@@ -18404,9 +18289,9 @@ diff -urNp linux-2.6.32.38/arch/x86/Makefile linux-2.6.32.38/arch/x86/Makefile |
5797 |
+ |
5798 |
+archprepare: |
5799 |
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) |
5800 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/extable.c linux-2.6.32.38/arch/x86/mm/extable.c |
5801 |
---- linux-2.6.32.38/arch/x86/mm/extable.c 2011-03-27 14:31:47.000000000 -0400 |
5802 |
-+++ linux-2.6.32.38/arch/x86/mm/extable.c 2011-04-17 15:56:46.000000000 -0400 |
5803 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/extable.c linux-2.6.32.39/arch/x86/mm/extable.c |
5804 |
+--- linux-2.6.32.39/arch/x86/mm/extable.c 2011-03-27 14:31:47.000000000 -0400 |
5805 |
++++ linux-2.6.32.39/arch/x86/mm/extable.c 2011-04-17 15:56:46.000000000 -0400 |
5806 |
@@ -1,14 +1,71 @@ |
5807 |
#include <linux/module.h> |
5808 |
#include <linux/spinlock.h> |
5809 |
@@ -18480,9 +18365,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/extable.c linux-2.6.32.38/arch/x86/mm/ext |
5810 |
extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; |
5811 |
extern u32 pnp_bios_is_utter_crap; |
5812 |
pnp_bios_is_utter_crap = 1; |
5813 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/fault.c linux-2.6.32.38/arch/x86/mm/fault.c |
5814 |
---- linux-2.6.32.38/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
5815 |
-+++ linux-2.6.32.38/arch/x86/mm/fault.c 2011-04-17 15:56:46.000000000 -0400 |
5816 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/fault.c linux-2.6.32.39/arch/x86/mm/fault.c |
5817 |
+--- linux-2.6.32.39/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 |
5818 |
++++ linux-2.6.32.39/arch/x86/mm/fault.c 2011-04-17 15:56:46.000000000 -0400 |
5819 |
@@ -11,10 +11,19 @@ |
5820 |
#include <linux/kprobes.h> /* __kprobes, ... */ |
5821 |
#include <linux/mmiotrace.h> /* kmmio_handler, ... */ |
5822 |
@@ -19167,9 +19052,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/fault.c linux-2.6.32.38/arch/x86/mm/fault |
5823 |
+ |
5824 |
+ return ret ? -EFAULT : 0; |
5825 |
+} |
5826 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/gup.c linux-2.6.32.38/arch/x86/mm/gup.c |
5827 |
---- linux-2.6.32.38/arch/x86/mm/gup.c 2011-03-27 14:31:47.000000000 -0400 |
5828 |
-+++ linux-2.6.32.38/arch/x86/mm/gup.c 2011-04-17 15:56:46.000000000 -0400 |
5829 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/gup.c linux-2.6.32.39/arch/x86/mm/gup.c |
5830 |
+--- linux-2.6.32.39/arch/x86/mm/gup.c 2011-03-27 14:31:47.000000000 -0400 |
5831 |
++++ linux-2.6.32.39/arch/x86/mm/gup.c 2011-04-17 15:56:46.000000000 -0400 |
5832 |
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long |
5833 |
addr = start; |
5834 |
len = (unsigned long) nr_pages << PAGE_SHIFT; |
5835 |
@@ -19179,9 +19064,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/gup.c linux-2.6.32.38/arch/x86/mm/gup.c |
5836 |
(void __user *)start, len))) |
5837 |
return 0; |
5838 |
|
5839 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/highmem_32.c linux-2.6.32.38/arch/x86/mm/highmem_32.c |
5840 |
---- linux-2.6.32.38/arch/x86/mm/highmem_32.c 2011-03-27 14:31:47.000000000 -0400 |
5841 |
-+++ linux-2.6.32.38/arch/x86/mm/highmem_32.c 2011-04-17 15:56:46.000000000 -0400 |
5842 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/highmem_32.c linux-2.6.32.39/arch/x86/mm/highmem_32.c |
5843 |
+--- linux-2.6.32.39/arch/x86/mm/highmem_32.c 2011-03-27 14:31:47.000000000 -0400 |
5844 |
++++ linux-2.6.32.39/arch/x86/mm/highmem_32.c 2011-04-17 15:56:46.000000000 -0400 |
5845 |
@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page |
5846 |
idx = type + KM_TYPE_NR*smp_processor_id(); |
5847 |
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
5848 |
@@ -19193,9 +19078,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/highmem_32.c linux-2.6.32.38/arch/x86/mm/ |
5849 |
|
5850 |
return (void *)vaddr; |
5851 |
} |
5852 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/hugetlbpage.c linux-2.6.32.38/arch/x86/mm/hugetlbpage.c |
5853 |
---- linux-2.6.32.38/arch/x86/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 |
5854 |
-+++ linux-2.6.32.38/arch/x86/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400 |
5855 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/hugetlbpage.c linux-2.6.32.39/arch/x86/mm/hugetlbpage.c |
5856 |
+--- linux-2.6.32.39/arch/x86/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 |
5857 |
++++ linux-2.6.32.39/arch/x86/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400 |
5858 |
@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe |
5859 |
struct hstate *h = hstate_file(file); |
5860 |
struct mm_struct *mm = current->mm; |
5861 |
@@ -19403,9 +19288,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/hugetlbpage.c linux-2.6.32.38/arch/x86/mm |
5862 |
return addr; |
5863 |
} |
5864 |
if (mm->get_unmapped_area == arch_get_unmapped_area) |
5865 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/init_32.c linux-2.6.32.38/arch/x86/mm/init_32.c |
5866 |
---- linux-2.6.32.38/arch/x86/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400 |
5867 |
-+++ linux-2.6.32.38/arch/x86/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400 |
5868 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/init_32.c linux-2.6.32.39/arch/x86/mm/init_32.c |
5869 |
+--- linux-2.6.32.39/arch/x86/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400 |
5870 |
++++ linux-2.6.32.39/arch/x86/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400 |
5871 |
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) |
5872 |
} |
5873 |
|
5874 |
@@ -19709,9 +19594,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/init_32.c linux-2.6.32.38/arch/x86/mm/ini |
5875 |
set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); |
5876 |
printk(KERN_INFO "Write protecting the kernel text: %luk\n", |
5877 |
size >> 10); |
5878 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/init_64.c linux-2.6.32.38/arch/x86/mm/init_64.c |
5879 |
---- linux-2.6.32.38/arch/x86/mm/init_64.c 2011-04-17 17:00:52.000000000 -0400 |
5880 |
-+++ linux-2.6.32.38/arch/x86/mm/init_64.c 2011-04-17 17:03:05.000000000 -0400 |
5881 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/init_64.c linux-2.6.32.39/arch/x86/mm/init_64.c |
5882 |
+--- linux-2.6.32.39/arch/x86/mm/init_64.c 2011-04-17 17:00:52.000000000 -0400 |
5883 |
++++ linux-2.6.32.39/arch/x86/mm/init_64.c 2011-04-17 17:03:05.000000000 -0400 |
5884 |
@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, |
5885 |
pmd = fill_pmd(pud, vaddr); |
5886 |
pte = fill_pte(pmd, vaddr); |
5887 |
@@ -19772,9 +19657,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/init_64.c linux-2.6.32.38/arch/x86/mm/ini |
5888 |
return "[vdso]"; |
5889 |
if (vma == &gate_vma) |
5890 |
return "[vsyscall]"; |
5891 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/init.c linux-2.6.32.38/arch/x86/mm/init.c |
5892 |
---- linux-2.6.32.38/arch/x86/mm/init.c 2011-04-17 17:00:52.000000000 -0400 |
5893 |
-+++ linux-2.6.32.38/arch/x86/mm/init.c 2011-04-17 17:03:05.000000000 -0400 |
5894 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/init.c linux-2.6.32.39/arch/x86/mm/init.c |
5895 |
+--- linux-2.6.32.39/arch/x86/mm/init.c 2011-04-17 17:00:52.000000000 -0400 |
5896 |
++++ linux-2.6.32.39/arch/x86/mm/init.c 2011-04-17 17:03:05.000000000 -0400 |
5897 |
@@ -69,11 +69,7 @@ static void __init find_early_table_spac |
5898 |
* cause a hotspot and fill up ZONE_DMA. The page tables |
5899 |
* need roughly 0.5KB per GB. |
5900 |
@@ -19902,9 +19787,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/init.c linux-2.6.32.38/arch/x86/mm/init.c |
5901 |
free_init_pages("unused kernel memory", |
5902 |
(unsigned long)(&__init_begin), |
5903 |
(unsigned long)(&__init_end)); |
5904 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/iomap_32.c linux-2.6.32.38/arch/x86/mm/iomap_32.c |
5905 |
---- linux-2.6.32.38/arch/x86/mm/iomap_32.c 2011-03-27 14:31:47.000000000 -0400 |
5906 |
-+++ linux-2.6.32.38/arch/x86/mm/iomap_32.c 2011-04-17 15:56:46.000000000 -0400 |
5907 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/iomap_32.c linux-2.6.32.39/arch/x86/mm/iomap_32.c |
5908 |
+--- linux-2.6.32.39/arch/x86/mm/iomap_32.c 2011-03-27 14:31:47.000000000 -0400 |
5909 |
++++ linux-2.6.32.39/arch/x86/mm/iomap_32.c 2011-04-17 15:56:46.000000000 -0400 |
5910 |
@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long |
5911 |
debug_kmap_atomic(type); |
5912 |
idx = type + KM_TYPE_NR * smp_processor_id(); |
5913 |
@@ -19917,9 +19802,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/iomap_32.c linux-2.6.32.38/arch/x86/mm/io |
5914 |
arch_flush_lazy_mmu_mode(); |
5915 |
|
5916 |
return (void *)vaddr; |
5917 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/ioremap.c linux-2.6.32.38/arch/x86/mm/ioremap.c |
5918 |
---- linux-2.6.32.38/arch/x86/mm/ioremap.c 2011-03-27 14:31:47.000000000 -0400 |
5919 |
-+++ linux-2.6.32.38/arch/x86/mm/ioremap.c 2011-04-17 15:56:46.000000000 -0400 |
5920 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/ioremap.c linux-2.6.32.39/arch/x86/mm/ioremap.c |
5921 |
+--- linux-2.6.32.39/arch/x86/mm/ioremap.c 2011-03-27 14:31:47.000000000 -0400 |
5922 |
++++ linux-2.6.32.39/arch/x86/mm/ioremap.c 2011-04-17 15:56:46.000000000 -0400 |
5923 |
@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) |
5924 |
* Second special case: Some BIOSen report the PC BIOS |
5925 |
* area (640->1Mb) as ram even though it is not. |
5926 |
@@ -19966,9 +19851,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/ioremap.c linux-2.6.32.38/arch/x86/mm/ior |
5927 |
|
5928 |
/* |
5929 |
* The boot-ioremap range spans multiple pmds, for which |
5930 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c |
5931 |
---- linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-27 14:31:47.000000000 -0400 |
5932 |
-+++ linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:56:46.000000000 -0400 |
5933 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c |
5934 |
+--- linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-27 14:31:47.000000000 -0400 |
5935 |
++++ linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:56:46.000000000 -0400 |
5936 |
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg |
5937 |
* memory (e.g. tracked pages)? For now, we need this to avoid |
5938 |
* invoking kmemcheck for PnP BIOS calls. |
5939 |
@@ -19981,9 +19866,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.38/arc |
5940 |
return false; |
5941 |
|
5942 |
pte = kmemcheck_pte_lookup(address); |
5943 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/mmap.c linux-2.6.32.38/arch/x86/mm/mmap.c |
5944 |
---- linux-2.6.32.38/arch/x86/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
5945 |
-+++ linux-2.6.32.38/arch/x86/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 |
5946 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/mmap.c linux-2.6.32.39/arch/x86/mm/mmap.c |
5947 |
+--- linux-2.6.32.39/arch/x86/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
5948 |
++++ linux-2.6.32.39/arch/x86/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 |
5949 |
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size |
5950 |
* Leave an at least ~128 MB hole with possible stack randomization. |
5951 |
*/ |
5952 |
@@ -20065,9 +19950,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/mmap.c linux-2.6.32.38/arch/x86/mm/mmap.c |
5953 |
mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
5954 |
mm->unmap_area = arch_unmap_area_topdown; |
5955 |
} |
5956 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/numa_32.c linux-2.6.32.38/arch/x86/mm/numa_32.c |
5957 |
---- linux-2.6.32.38/arch/x86/mm/numa_32.c 2011-03-27 14:31:47.000000000 -0400 |
5958 |
-+++ linux-2.6.32.38/arch/x86/mm/numa_32.c 2011-04-17 15:56:46.000000000 -0400 |
5959 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/numa_32.c linux-2.6.32.39/arch/x86/mm/numa_32.c |
5960 |
+--- linux-2.6.32.39/arch/x86/mm/numa_32.c 2011-03-27 14:31:47.000000000 -0400 |
5961 |
++++ linux-2.6.32.39/arch/x86/mm/numa_32.c 2011-04-17 15:56:46.000000000 -0400 |
5962 |
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int |
5963 |
} |
5964 |
#endif |
5965 |
@@ -20076,9 +19961,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/numa_32.c linux-2.6.32.38/arch/x86/mm/num |
5966 |
extern unsigned long highend_pfn, highstart_pfn; |
5967 |
|
5968 |
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) |
5969 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr.c linux-2.6.32.38/arch/x86/mm/pageattr.c |
5970 |
---- linux-2.6.32.38/arch/x86/mm/pageattr.c 2011-03-27 14:31:47.000000000 -0400 |
5971 |
-+++ linux-2.6.32.38/arch/x86/mm/pageattr.c 2011-04-17 15:56:46.000000000 -0400 |
5972 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr.c linux-2.6.32.39/arch/x86/mm/pageattr.c |
5973 |
+--- linux-2.6.32.39/arch/x86/mm/pageattr.c 2011-03-27 14:31:47.000000000 -0400 |
5974 |
++++ linux-2.6.32.39/arch/x86/mm/pageattr.c 2011-04-17 15:56:46.000000000 -0400 |
5975 |
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection |
5976 |
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. |
5977 |
*/ |
5978 |
@@ -20155,9 +20040,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr.c linux-2.6.32.38/arch/x86/mm/pa |
5979 |
} |
5980 |
|
5981 |
static int |
5982 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr-test.c linux-2.6.32.38/arch/x86/mm/pageattr-test.c |
5983 |
---- linux-2.6.32.38/arch/x86/mm/pageattr-test.c 2011-03-27 14:31:47.000000000 -0400 |
5984 |
-+++ linux-2.6.32.38/arch/x86/mm/pageattr-test.c 2011-04-17 15:56:46.000000000 -0400 |
5985 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr-test.c linux-2.6.32.39/arch/x86/mm/pageattr-test.c |
5986 |
+--- linux-2.6.32.39/arch/x86/mm/pageattr-test.c 2011-03-27 14:31:47.000000000 -0400 |
5987 |
++++ linux-2.6.32.39/arch/x86/mm/pageattr-test.c 2011-04-17 15:56:46.000000000 -0400 |
5988 |
@@ -36,7 +36,7 @@ enum { |
5989 |
|
5990 |
static int pte_testbit(pte_t pte) |
5991 |
@@ -20167,9 +20052,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pageattr-test.c linux-2.6.32.38/arch/x86/ |
5992 |
} |
5993 |
|
5994 |
struct split_state { |
5995 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/pat.c linux-2.6.32.38/arch/x86/mm/pat.c |
5996 |
---- linux-2.6.32.38/arch/x86/mm/pat.c 2011-03-27 14:31:47.000000000 -0400 |
5997 |
-+++ linux-2.6.32.38/arch/x86/mm/pat.c 2011-04-17 15:56:46.000000000 -0400 |
5998 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/pat.c linux-2.6.32.39/arch/x86/mm/pat.c |
5999 |
+--- linux-2.6.32.39/arch/x86/mm/pat.c 2011-03-27 14:31:47.000000000 -0400 |
6000 |
++++ linux-2.6.32.39/arch/x86/mm/pat.c 2011-04-17 15:56:46.000000000 -0400 |
6001 |
@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct |
6002 |
|
6003 |
conflict: |
6004 |
@@ -20217,9 +20102,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pat.c linux-2.6.32.38/arch/x86/mm/pat.c |
6005 |
cattr_name(want_flags), |
6006 |
(unsigned long long)paddr, |
6007 |
(unsigned long long)(paddr + size), |
6008 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable_32.c linux-2.6.32.38/arch/x86/mm/pgtable_32.c |
6009 |
---- linux-2.6.32.38/arch/x86/mm/pgtable_32.c 2011-03-27 14:31:47.000000000 -0400 |
6010 |
-+++ linux-2.6.32.38/arch/x86/mm/pgtable_32.c 2011-04-17 15:56:46.000000000 -0400 |
6011 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable_32.c linux-2.6.32.39/arch/x86/mm/pgtable_32.c |
6012 |
+--- linux-2.6.32.39/arch/x86/mm/pgtable_32.c 2011-03-27 14:31:47.000000000 -0400 |
6013 |
++++ linux-2.6.32.39/arch/x86/mm/pgtable_32.c 2011-04-17 15:56:46.000000000 -0400 |
6014 |
@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, |
6015 |
return; |
6016 |
} |
6017 |
@@ -20234,9 +20119,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable_32.c linux-2.6.32.38/arch/x86/mm/ |
6018 |
|
6019 |
/* |
6020 |
* It's enough to flush this one mapping. |
6021 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable.c linux-2.6.32.38/arch/x86/mm/pgtable.c |
6022 |
---- linux-2.6.32.38/arch/x86/mm/pgtable.c 2011-03-27 14:31:47.000000000 -0400 |
6023 |
-+++ linux-2.6.32.38/arch/x86/mm/pgtable.c 2011-04-17 15:56:46.000000000 -0400 |
6024 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgtable.c |
6025 |
+--- linux-2.6.32.39/arch/x86/mm/pgtable.c 2011-03-27 14:31:47.000000000 -0400 |
6026 |
++++ linux-2.6.32.39/arch/x86/mm/pgtable.c 2011-04-17 15:56:46.000000000 -0400 |
6027 |
@@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p |
6028 |
list_del(&page->lru); |
6029 |
} |
6030 |
@@ -20489,9 +20374,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/pgtable.c linux-2.6.32.38/arch/x86/mm/pgt |
6031 |
pgd_dtor(pgd); |
6032 |
paravirt_pgd_free(mm, pgd); |
6033 |
free_page((unsigned long)pgd); |
6034 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/setup_nx.c linux-2.6.32.38/arch/x86/mm/setup_nx.c |
6035 |
---- linux-2.6.32.38/arch/x86/mm/setup_nx.c 2011-03-27 14:31:47.000000000 -0400 |
6036 |
-+++ linux-2.6.32.38/arch/x86/mm/setup_nx.c 2011-04-17 15:56:46.000000000 -0400 |
6037 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/setup_nx.c linux-2.6.32.39/arch/x86/mm/setup_nx.c |
6038 |
+--- linux-2.6.32.39/arch/x86/mm/setup_nx.c 2011-03-27 14:31:47.000000000 -0400 |
6039 |
++++ linux-2.6.32.39/arch/x86/mm/setup_nx.c 2011-04-17 15:56:46.000000000 -0400 |
6040 |
@@ -4,11 +4,10 @@ |
6041 |
|
6042 |
#include <asm/pgtable.h> |
6043 |
@@ -20557,18 +20442,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/setup_nx.c linux-2.6.32.38/arch/x86/mm/se |
6044 |
__supported_pte_mask &= ~_PAGE_NX; |
6045 |
} |
6046 |
#endif |
6047 |
-diff -urNp linux-2.6.32.38/arch/x86/mm/tlb.c linux-2.6.32.38/arch/x86/mm/tlb.c |
6048 |
---- linux-2.6.32.38/arch/x86/mm/tlb.c 2011-03-27 14:31:47.000000000 -0400 |
6049 |
-+++ linux-2.6.32.38/arch/x86/mm/tlb.c 2011-04-17 15:56:46.000000000 -0400 |
6050 |
-@@ -12,7 +12,7 @@ |
6051 |
- #include <asm/uv/uv.h> |
6052 |
- |
6053 |
- DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) |
6054 |
-- = { &init_mm, 0, }; |
6055 |
-+ = { &init_mm, 0 }; |
6056 |
- |
6057 |
- /* |
6058 |
- * Smarter SMP flushing macros. |
6059 |
+diff -urNp linux-2.6.32.39/arch/x86/mm/tlb.c linux-2.6.32.39/arch/x86/mm/tlb.c |
6060 |
+--- linux-2.6.32.39/arch/x86/mm/tlb.c 2011-03-27 14:31:47.000000000 -0400 |
6061 |
++++ linux-2.6.32.39/arch/x86/mm/tlb.c 2011-04-23 12:56:10.000000000 -0400 |
6062 |
@@ -61,7 +61,11 @@ void leave_mm(int cpu) |
6063 |
BUG(); |
6064 |
cpumask_clear_cpu(cpu, |
6065 |
@@ -20581,9 +20457,9 @@ diff -urNp linux-2.6.32.38/arch/x86/mm/tlb.c linux-2.6.32.38/arch/x86/mm/tlb.c |
6066 |
} |
6067 |
EXPORT_SYMBOL_GPL(leave_mm); |
6068 |
|
6069 |
-diff -urNp linux-2.6.32.38/arch/x86/oprofile/backtrace.c linux-2.6.32.38/arch/x86/oprofile/backtrace.c |
6070 |
---- linux-2.6.32.38/arch/x86/oprofile/backtrace.c 2011-03-27 14:31:47.000000000 -0400 |
6071 |
-+++ linux-2.6.32.38/arch/x86/oprofile/backtrace.c 2011-04-17 15:56:46.000000000 -0400 |
6072 |
+diff -urNp linux-2.6.32.39/arch/x86/oprofile/backtrace.c linux-2.6.32.39/arch/x86/oprofile/backtrace.c |
6073 |
+--- linux-2.6.32.39/arch/x86/oprofile/backtrace.c 2011-03-27 14:31:47.000000000 -0400 |
6074 |
++++ linux-2.6.32.39/arch/x86/oprofile/backtrace.c 2011-04-17 15:56:46.000000000 -0400 |
6075 |
@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back |
6076 |
struct frame_head bufhead[2]; |
6077 |
|
6078 |
@@ -20602,9 +20478,9 @@ diff -urNp linux-2.6.32.38/arch/x86/oprofile/backtrace.c linux-2.6.32.38/arch/x8 |
6079 |
unsigned long stack = kernel_stack_pointer(regs); |
6080 |
if (depth) |
6081 |
dump_trace(NULL, regs, (unsigned long *)stack, 0, |
6082 |
-diff -urNp linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c |
6083 |
---- linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c 2011-03-27 14:31:47.000000000 -0400 |
6084 |
-+++ linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:56:46.000000000 -0400 |
6085 |
+diff -urNp linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c |
6086 |
+--- linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c 2011-03-27 14:31:47.000000000 -0400 |
6087 |
++++ linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:56:46.000000000 -0400 |
6088 |
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo |
6089 |
#endif |
6090 |
} |
6091 |
@@ -20614,9 +20490,9 @@ diff -urNp linux-2.6.32.38/arch/x86/oprofile/op_model_p4.c linux-2.6.32.38/arch/ |
6092 |
{ |
6093 |
#ifdef CONFIG_SMP |
6094 |
return smp_num_siblings == 2 ? 2 : 1; |
6095 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/common.c linux-2.6.32.38/arch/x86/pci/common.c |
6096 |
---- linux-2.6.32.38/arch/x86/pci/common.c 2011-03-27 14:31:47.000000000 -0400 |
6097 |
-+++ linux-2.6.32.38/arch/x86/pci/common.c 2011-04-17 15:56:46.000000000 -0400 |
6098 |
+diff -urNp linux-2.6.32.39/arch/x86/pci/common.c linux-2.6.32.39/arch/x86/pci/common.c |
6099 |
+--- linux-2.6.32.39/arch/x86/pci/common.c 2011-03-27 14:31:47.000000000 -0400 |
6100 |
++++ linux-2.6.32.39/arch/x86/pci/common.c 2011-04-23 12:56:10.000000000 -0400 |
6101 |
@@ -31,8 +31,8 @@ int noioapicreroute = 1; |
6102 |
int pcibios_last_bus = -1; |
6103 |
unsigned long pirq_table_addr; |
6104 |
@@ -20628,18 +20504,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/common.c linux-2.6.32.38/arch/x86/pci/co |
6105 |
|
6106 |
int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, |
6107 |
int reg, int len, u32 *val) |
6108 |
-@@ -370,7 +370,7 @@ static const struct dmi_system_id __devi |
6109 |
- DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), |
6110 |
- }, |
6111 |
- }, |
6112 |
-- {} |
6113 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} |
6114 |
- }; |
6115 |
- |
6116 |
- void __init dmi_check_pciprobe(void) |
6117 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/direct.c linux-2.6.32.38/arch/x86/pci/direct.c |
6118 |
---- linux-2.6.32.38/arch/x86/pci/direct.c 2011-03-27 14:31:47.000000000 -0400 |
6119 |
-+++ linux-2.6.32.38/arch/x86/pci/direct.c 2011-04-17 15:56:46.000000000 -0400 |
6120 |
+diff -urNp linux-2.6.32.39/arch/x86/pci/direct.c linux-2.6.32.39/arch/x86/pci/direct.c |
6121 |
+--- linux-2.6.32.39/arch/x86/pci/direct.c 2011-03-27 14:31:47.000000000 -0400 |
6122 |
++++ linux-2.6.32.39/arch/x86/pci/direct.c 2011-04-17 15:56:46.000000000 -0400 |
6123 |
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int |
6124 |
|
6125 |
#undef PCI_CONF1_ADDRESS |
6126 |
@@ -20667,51 +20534,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/direct.c linux-2.6.32.38/arch/x86/pci/di |
6127 |
{ |
6128 |
u32 x = 0; |
6129 |
int year, devfn; |
6130 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/fixup.c linux-2.6.32.38/arch/x86/pci/fixup.c |
6131 |
---- linux-2.6.32.38/arch/x86/pci/fixup.c 2011-03-27 14:31:47.000000000 -0400 |
6132 |
-+++ linux-2.6.32.38/arch/x86/pci/fixup.c 2011-04-17 15:56:46.000000000 -0400 |
6133 |
-@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi |
6134 |
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), |
6135 |
- }, |
6136 |
- }, |
6137 |
-- {} |
6138 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
6139 |
- }; |
6140 |
- |
6141 |
- /* |
6142 |
-@@ -435,7 +435,7 @@ static const struct dmi_system_id __devi |
6143 |
- DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), |
6144 |
- }, |
6145 |
- }, |
6146 |
-- { } |
6147 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
6148 |
- }; |
6149 |
- |
6150 |
- static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) |
6151 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/irq.c linux-2.6.32.38/arch/x86/pci/irq.c |
6152 |
---- linux-2.6.32.38/arch/x86/pci/irq.c 2011-03-27 14:31:47.000000000 -0400 |
6153 |
-+++ linux-2.6.32.38/arch/x86/pci/irq.c 2011-04-17 15:56:46.000000000 -0400 |
6154 |
-@@ -543,7 +543,7 @@ static __init int intel_router_probe(str |
6155 |
- static struct pci_device_id __initdata pirq_440gx[] = { |
6156 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, |
6157 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) }, |
6158 |
-- { }, |
6159 |
-+ { PCI_DEVICE(0, 0) } |
6160 |
- }; |
6161 |
- |
6162 |
- /* 440GX has a proprietary PIRQ router -- don't use it */ |
6163 |
-@@ -1109,7 +1109,7 @@ static struct dmi_system_id __initdata p |
6164 |
- DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), |
6165 |
- }, |
6166 |
- }, |
6167 |
-- { } |
6168 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
6169 |
- }; |
6170 |
- |
6171 |
- int __init pcibios_irq_init(void) |
6172 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_32.c linux-2.6.32.38/arch/x86/pci/mmconfig_32.c |
6173 |
---- linux-2.6.32.38/arch/x86/pci/mmconfig_32.c 2011-03-27 14:31:47.000000000 -0400 |
6174 |
-+++ linux-2.6.32.38/arch/x86/pci/mmconfig_32.c 2011-04-17 15:56:46.000000000 -0400 |
6175 |
+diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_32.c linux-2.6.32.39/arch/x86/pci/mmconfig_32.c |
6176 |
+--- linux-2.6.32.39/arch/x86/pci/mmconfig_32.c 2011-03-27 14:31:47.000000000 -0400 |
6177 |
++++ linux-2.6.32.39/arch/x86/pci/mmconfig_32.c 2011-04-17 15:56:46.000000000 -0400 |
6178 |
@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int |
6179 |
return 0; |
6180 |
} |
6181 |
@@ -20721,9 +20546,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_32.c linux-2.6.32.38/arch/x86/p |
6182 |
.read = pci_mmcfg_read, |
6183 |
.write = pci_mmcfg_write, |
6184 |
}; |
6185 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_64.c linux-2.6.32.38/arch/x86/pci/mmconfig_64.c |
6186 |
---- linux-2.6.32.38/arch/x86/pci/mmconfig_64.c 2011-03-27 14:31:47.000000000 -0400 |
6187 |
-+++ linux-2.6.32.38/arch/x86/pci/mmconfig_64.c 2011-04-17 15:56:46.000000000 -0400 |
6188 |
+diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_64.c linux-2.6.32.39/arch/x86/pci/mmconfig_64.c |
6189 |
+--- linux-2.6.32.39/arch/x86/pci/mmconfig_64.c 2011-03-27 14:31:47.000000000 -0400 |
6190 |
++++ linux-2.6.32.39/arch/x86/pci/mmconfig_64.c 2011-04-17 15:56:46.000000000 -0400 |
6191 |
@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int |
6192 |
return 0; |
6193 |
} |
6194 |
@@ -20733,9 +20558,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/mmconfig_64.c linux-2.6.32.38/arch/x86/p |
6195 |
.read = pci_mmcfg_read, |
6196 |
.write = pci_mmcfg_write, |
6197 |
}; |
6198 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/numaq_32.c linux-2.6.32.38/arch/x86/pci/numaq_32.c |
6199 |
---- linux-2.6.32.38/arch/x86/pci/numaq_32.c 2011-03-27 14:31:47.000000000 -0400 |
6200 |
-+++ linux-2.6.32.38/arch/x86/pci/numaq_32.c 2011-04-17 15:56:46.000000000 -0400 |
6201 |
+diff -urNp linux-2.6.32.39/arch/x86/pci/numaq_32.c linux-2.6.32.39/arch/x86/pci/numaq_32.c |
6202 |
+--- linux-2.6.32.39/arch/x86/pci/numaq_32.c 2011-03-27 14:31:47.000000000 -0400 |
6203 |
++++ linux-2.6.32.39/arch/x86/pci/numaq_32.c 2011-04-17 15:56:46.000000000 -0400 |
6204 |
@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i |
6205 |
|
6206 |
#undef PCI_CONF1_MQ_ADDRESS |
6207 |
@@ -20745,9 +20570,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/numaq_32.c linux-2.6.32.38/arch/x86/pci/ |
6208 |
.read = pci_conf1_mq_read, |
6209 |
.write = pci_conf1_mq_write |
6210 |
}; |
6211 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/olpc.c linux-2.6.32.38/arch/x86/pci/olpc.c |
6212 |
---- linux-2.6.32.38/arch/x86/pci/olpc.c 2011-03-27 14:31:47.000000000 -0400 |
6213 |
-+++ linux-2.6.32.38/arch/x86/pci/olpc.c 2011-04-17 15:56:46.000000000 -0400 |
6214 |
+diff -urNp linux-2.6.32.39/arch/x86/pci/olpc.c linux-2.6.32.39/arch/x86/pci/olpc.c |
6215 |
+--- linux-2.6.32.39/arch/x86/pci/olpc.c 2011-03-27 14:31:47.000000000 -0400 |
6216 |
++++ linux-2.6.32.39/arch/x86/pci/olpc.c 2011-04-17 15:56:46.000000000 -0400 |
6217 |
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s |
6218 |
return 0; |
6219 |
} |
6220 |
@@ -20757,9 +20582,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/olpc.c linux-2.6.32.38/arch/x86/pci/olpc |
6221 |
.read = pci_olpc_read, |
6222 |
.write = pci_olpc_write, |
6223 |
}; |
6224 |
-diff -urNp linux-2.6.32.38/arch/x86/pci/pcbios.c linux-2.6.32.38/arch/x86/pci/pcbios.c |
6225 |
---- linux-2.6.32.38/arch/x86/pci/pcbios.c 2011-03-27 14:31:47.000000000 -0400 |
6226 |
-+++ linux-2.6.32.38/arch/x86/pci/pcbios.c 2011-04-17 15:56:46.000000000 -0400 |
6227 |
+diff -urNp linux-2.6.32.39/arch/x86/pci/pcbios.c linux-2.6.32.39/arch/x86/pci/pcbios.c |
6228 |
+--- linux-2.6.32.39/arch/x86/pci/pcbios.c 2011-03-27 14:31:47.000000000 -0400 |
6229 |
++++ linux-2.6.32.39/arch/x86/pci/pcbios.c 2011-04-17 15:56:46.000000000 -0400 |
6230 |
@@ -56,50 +56,93 @@ union bios32 { |
6231 |
static struct { |
6232 |
unsigned long address; |
6233 |
@@ -21082,9 +20907,9 @@ diff -urNp linux-2.6.32.38/arch/x86/pci/pcbios.c linux-2.6.32.38/arch/x86/pci/pc |
6234 |
return !(ret & 0xff00); |
6235 |
} |
6236 |
EXPORT_SYMBOL(pcibios_set_irq_routing); |
6237 |
-diff -urNp linux-2.6.32.38/arch/x86/power/cpu.c linux-2.6.32.38/arch/x86/power/cpu.c |
6238 |
---- linux-2.6.32.38/arch/x86/power/cpu.c 2011-03-27 14:31:47.000000000 -0400 |
6239 |
-+++ linux-2.6.32.38/arch/x86/power/cpu.c 2011-04-17 15:56:46.000000000 -0400 |
6240 |
+diff -urNp linux-2.6.32.39/arch/x86/power/cpu.c linux-2.6.32.39/arch/x86/power/cpu.c |
6241 |
+--- linux-2.6.32.39/arch/x86/power/cpu.c 2011-03-27 14:31:47.000000000 -0400 |
6242 |
++++ linux-2.6.32.39/arch/x86/power/cpu.c 2011-04-17 15:56:46.000000000 -0400 |
6243 |
@@ -129,7 +129,7 @@ static void do_fpu_end(void) |
6244 |
static void fix_processor_context(void) |
6245 |
{ |
6246 |
@@ -21104,9 +20929,9 @@ diff -urNp linux-2.6.32.38/arch/x86/power/cpu.c linux-2.6.32.38/arch/x86/power/c |
6247 |
|
6248 |
syscall_init(); /* This sets MSR_*STAR and related */ |
6249 |
#endif |
6250 |
-diff -urNp linux-2.6.32.38/arch/x86/vdso/Makefile linux-2.6.32.38/arch/x86/vdso/Makefile |
6251 |
---- linux-2.6.32.38/arch/x86/vdso/Makefile 2011-03-27 14:31:47.000000000 -0400 |
6252 |
-+++ linux-2.6.32.38/arch/x86/vdso/Makefile 2011-04-17 15:56:46.000000000 -0400 |
6253 |
+diff -urNp linux-2.6.32.39/arch/x86/vdso/Makefile linux-2.6.32.39/arch/x86/vdso/Makefile |
6254 |
+--- linux-2.6.32.39/arch/x86/vdso/Makefile 2011-03-27 14:31:47.000000000 -0400 |
6255 |
++++ linux-2.6.32.39/arch/x86/vdso/Makefile 2011-04-17 15:56:46.000000000 -0400 |
6256 |
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ |
6257 |
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ |
6258 |
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) |
6259 |
@@ -21116,9 +20941,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/Makefile linux-2.6.32.38/arch/x86/vdso/ |
6260 |
GCOV_PROFILE := n |
6261 |
|
6262 |
# |
6263 |
-diff -urNp linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c |
6264 |
---- linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c 2011-03-27 14:31:47.000000000 -0400 |
6265 |
-+++ linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:56:46.000000000 -0400 |
6266 |
+diff -urNp linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c |
6267 |
+--- linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c 2011-03-27 14:31:47.000000000 -0400 |
6268 |
++++ linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:56:46.000000000 -0400 |
6269 |
@@ -22,24 +22,48 @@ |
6270 |
#include <asm/hpet.h> |
6271 |
#include <asm/unistd.h> |
6272 |
@@ -21217,9 +21042,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vclock_gettime.c linux-2.6.32.38/arch/x |
6273 |
} |
6274 |
int gettimeofday(struct timeval *, struct timezone *) |
6275 |
__attribute__((weak, alias("__vdso_gettimeofday"))); |
6276 |
-diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c |
6277 |
---- linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c 2011-03-27 14:31:47.000000000 -0400 |
6278 |
-+++ linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c 2011-04-17 15:56:46.000000000 -0400 |
6279 |
+diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c |
6280 |
+--- linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c 2011-03-27 14:31:47.000000000 -0400 |
6281 |
++++ linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c 2011-04-23 12:56:10.000000000 -0400 |
6282 |
@@ -25,6 +25,7 @@ |
6283 |
#include <asm/tlbflush.h> |
6284 |
#include <asm/vdso.h> |
6285 |
@@ -21277,24 +21102,6 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c linux-2.6.32.38/arch/x86 |
6286 |
|
6287 |
up_write(&mm->mmap_sem); |
6288 |
|
6289 |
-@@ -388,7 +389,7 @@ static ctl_table abi_table2[] = { |
6290 |
- .mode = 0644, |
6291 |
- .proc_handler = proc_dointvec |
6292 |
- }, |
6293 |
-- {} |
6294 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
6295 |
- }; |
6296 |
- |
6297 |
- static ctl_table abi_root_table2[] = { |
6298 |
-@@ -398,7 +399,7 @@ static ctl_table abi_root_table2[] = { |
6299 |
- .mode = 0555, |
6300 |
- .child = abi_table2 |
6301 |
- }, |
6302 |
-- {} |
6303 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
6304 |
- }; |
6305 |
- |
6306 |
- static __init int ia32_binfmt_init(void) |
6307 |
@@ -413,8 +414,14 @@ __initcall(ia32_binfmt_init); |
6308 |
|
6309 |
const char *arch_vma_name(struct vm_area_struct *vma) |
6310 |
@@ -21320,9 +21127,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso32-setup.c linux-2.6.32.38/arch/x86 |
6311 |
return &gate_vma; |
6312 |
return NULL; |
6313 |
} |
6314 |
-diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso.lds.S linux-2.6.32.38/arch/x86/vdso/vdso.lds.S |
6315 |
---- linux-2.6.32.38/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.000000000 -0400 |
6316 |
-+++ linux-2.6.32.38/arch/x86/vdso/vdso.lds.S 2011-04-17 15:56:46.000000000 -0400 |
6317 |
+diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso.lds.S linux-2.6.32.39/arch/x86/vdso/vdso.lds.S |
6318 |
+--- linux-2.6.32.39/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.000000000 -0400 |
6319 |
++++ linux-2.6.32.39/arch/x86/vdso/vdso.lds.S 2011-04-17 15:56:46.000000000 -0400 |
6320 |
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; |
6321 |
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; |
6322 |
#include "vextern.h" |
6323 |
@@ -21333,9 +21140,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vdso.lds.S linux-2.6.32.38/arch/x86/vds |
6324 |
+VEXTERN(fallback_time) |
6325 |
+VEXTERN(getcpu) |
6326 |
+#undef VEXTERN |
6327 |
-diff -urNp linux-2.6.32.38/arch/x86/vdso/vextern.h linux-2.6.32.38/arch/x86/vdso/vextern.h |
6328 |
---- linux-2.6.32.38/arch/x86/vdso/vextern.h 2011-03-27 14:31:47.000000000 -0400 |
6329 |
-+++ linux-2.6.32.38/arch/x86/vdso/vextern.h 2011-04-17 15:56:46.000000000 -0400 |
6330 |
+diff -urNp linux-2.6.32.39/arch/x86/vdso/vextern.h linux-2.6.32.39/arch/x86/vdso/vextern.h |
6331 |
+--- linux-2.6.32.39/arch/x86/vdso/vextern.h 2011-03-27 14:31:47.000000000 -0400 |
6332 |
++++ linux-2.6.32.39/arch/x86/vdso/vextern.h 2011-04-17 15:56:46.000000000 -0400 |
6333 |
@@ -11,6 +11,5 @@ |
6334 |
put into vextern.h and be referenced as a pointer with vdso prefix. |
6335 |
The main kernel later fills in the values. */ |
6336 |
@@ -21343,9 +21150,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vextern.h linux-2.6.32.38/arch/x86/vdso |
6337 |
-VEXTERN(jiffies) |
6338 |
VEXTERN(vgetcpu_mode) |
6339 |
VEXTERN(vsyscall_gtod_data) |
6340 |
-diff -urNp linux-2.6.32.38/arch/x86/vdso/vma.c linux-2.6.32.38/arch/x86/vdso/vma.c |
6341 |
---- linux-2.6.32.38/arch/x86/vdso/vma.c 2011-03-27 14:31:47.000000000 -0400 |
6342 |
-+++ linux-2.6.32.38/arch/x86/vdso/vma.c 2011-04-17 15:56:46.000000000 -0400 |
6343 |
+diff -urNp linux-2.6.32.39/arch/x86/vdso/vma.c linux-2.6.32.39/arch/x86/vdso/vma.c |
6344 |
+--- linux-2.6.32.39/arch/x86/vdso/vma.c 2011-03-27 14:31:47.000000000 -0400 |
6345 |
++++ linux-2.6.32.39/arch/x86/vdso/vma.c 2011-04-17 15:56:46.000000000 -0400 |
6346 |
@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) |
6347 |
if (!vbase) |
6348 |
goto oom; |
6349 |
@@ -21392,9 +21199,9 @@ diff -urNp linux-2.6.32.38/arch/x86/vdso/vma.c linux-2.6.32.38/arch/x86/vdso/vma |
6350 |
- return 0; |
6351 |
-} |
6352 |
-__setup("vdso=", vdso_setup); |
6353 |
-diff -urNp linux-2.6.32.38/arch/x86/xen/enlighten.c linux-2.6.32.38/arch/x86/xen/enlighten.c |
6354 |
---- linux-2.6.32.38/arch/x86/xen/enlighten.c 2011-03-27 14:31:47.000000000 -0400 |
6355 |
-+++ linux-2.6.32.38/arch/x86/xen/enlighten.c 2011-04-17 15:56:46.000000000 -0400 |
6356 |
+diff -urNp linux-2.6.32.39/arch/x86/xen/enlighten.c linux-2.6.32.39/arch/x86/xen/enlighten.c |
6357 |
+--- linux-2.6.32.39/arch/x86/xen/enlighten.c 2011-03-27 14:31:47.000000000 -0400 |
6358 |
++++ linux-2.6.32.39/arch/x86/xen/enlighten.c 2011-04-17 15:56:46.000000000 -0400 |
6359 |
@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); |
6360 |
|
6361 |
struct shared_info xen_dummy_shared_info; |
6362 |
@@ -21450,9 +21257,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/enlighten.c linux-2.6.32.38/arch/x86/xen |
6363 |
xen_smp_init(); |
6364 |
|
6365 |
pgd = (pgd_t *)xen_start_info->pt_base; |
6366 |
-diff -urNp linux-2.6.32.38/arch/x86/xen/mmu.c linux-2.6.32.38/arch/x86/xen/mmu.c |
6367 |
---- linux-2.6.32.38/arch/x86/xen/mmu.c 2011-03-27 14:31:47.000000000 -0400 |
6368 |
-+++ linux-2.6.32.38/arch/x86/xen/mmu.c 2011-04-17 15:56:46.000000000 -0400 |
6369 |
+diff -urNp linux-2.6.32.39/arch/x86/xen/mmu.c linux-2.6.32.39/arch/x86/xen/mmu.c |
6370 |
+--- linux-2.6.32.39/arch/x86/xen/mmu.c 2011-03-27 14:31:47.000000000 -0400 |
6371 |
++++ linux-2.6.32.39/arch/x86/xen/mmu.c 2011-04-17 15:56:46.000000000 -0400 |
6372 |
@@ -1714,6 +1714,8 @@ __init pgd_t *xen_setup_kernel_pagetable |
6373 |
convert_pfn_mfn(init_level4_pgt); |
6374 |
convert_pfn_mfn(level3_ident_pgt); |
6375 |
@@ -21473,9 +21280,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/mmu.c linux-2.6.32.38/arch/x86/xen/mmu.c |
6376 |
set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); |
6377 |
set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); |
6378 |
|
6379 |
-diff -urNp linux-2.6.32.38/arch/x86/xen/smp.c linux-2.6.32.38/arch/x86/xen/smp.c |
6380 |
---- linux-2.6.32.38/arch/x86/xen/smp.c 2011-03-27 14:31:47.000000000 -0400 |
6381 |
-+++ linux-2.6.32.38/arch/x86/xen/smp.c 2011-04-17 15:56:46.000000000 -0400 |
6382 |
+diff -urNp linux-2.6.32.39/arch/x86/xen/smp.c linux-2.6.32.39/arch/x86/xen/smp.c |
6383 |
+--- linux-2.6.32.39/arch/x86/xen/smp.c 2011-03-27 14:31:47.000000000 -0400 |
6384 |
++++ linux-2.6.32.39/arch/x86/xen/smp.c 2011-04-17 15:56:46.000000000 -0400 |
6385 |
@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ |
6386 |
{ |
6387 |
BUG_ON(smp_processor_id() != 0); |
6388 |
@@ -21520,9 +21327,33 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/smp.c linux-2.6.32.38/arch/x86/xen/smp.c |
6389 |
#endif |
6390 |
xen_setup_runstate_info(cpu); |
6391 |
xen_setup_timer(cpu); |
6392 |
-diff -urNp linux-2.6.32.38/arch/x86/xen/xen-head.S linux-2.6.32.38/arch/x86/xen/xen-head.S |
6393 |
---- linux-2.6.32.38/arch/x86/xen/xen-head.S 2011-03-27 14:31:47.000000000 -0400 |
6394 |
-+++ linux-2.6.32.38/arch/x86/xen/xen-head.S 2011-04-17 15:56:46.000000000 -0400 |
6395 |
+diff -urNp linux-2.6.32.39/arch/x86/xen/xen-asm_32.S linux-2.6.32.39/arch/x86/xen/xen-asm_32.S |
6396 |
+--- linux-2.6.32.39/arch/x86/xen/xen-asm_32.S 2011-03-27 14:31:47.000000000 -0400 |
6397 |
++++ linux-2.6.32.39/arch/x86/xen/xen-asm_32.S 2011-04-22 19:13:13.000000000 -0400 |
6398 |
+@@ -83,14 +83,14 @@ ENTRY(xen_iret) |
6399 |
+ ESP_OFFSET=4 # bytes pushed onto stack |
6400 |
+ |
6401 |
+ /* |
6402 |
+- * Store vcpu_info pointer for easy access. Do it this way to |
6403 |
+- * avoid having to reload %fs |
6404 |
++ * Store vcpu_info pointer for easy access. |
6405 |
+ */ |
6406 |
+ #ifdef CONFIG_SMP |
6407 |
+- GET_THREAD_INFO(%eax) |
6408 |
+- movl TI_cpu(%eax), %eax |
6409 |
+- movl __per_cpu_offset(,%eax,4), %eax |
6410 |
+- mov per_cpu__xen_vcpu(%eax), %eax |
6411 |
++ push %fs |
6412 |
++ mov $(__KERNEL_PERCPU), %eax |
6413 |
++ mov %eax, %fs |
6414 |
++ mov PER_CPU_VAR(xen_vcpu), %eax |
6415 |
++ pop %fs |
6416 |
+ #else |
6417 |
+ movl per_cpu__xen_vcpu, %eax |
6418 |
+ #endif |
6419 |
+diff -urNp linux-2.6.32.39/arch/x86/xen/xen-head.S linux-2.6.32.39/arch/x86/xen/xen-head.S |
6420 |
+--- linux-2.6.32.39/arch/x86/xen/xen-head.S 2011-03-27 14:31:47.000000000 -0400 |
6421 |
++++ linux-2.6.32.39/arch/x86/xen/xen-head.S 2011-04-17 15:56:46.000000000 -0400 |
6422 |
@@ -19,6 +19,17 @@ ENTRY(startup_xen) |
6423 |
#ifdef CONFIG_X86_32 |
6424 |
mov %esi,xen_start_info |
6425 |
@@ -21541,9 +21372,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/xen-head.S linux-2.6.32.38/arch/x86/xen/ |
6426 |
#else |
6427 |
mov %rsi,xen_start_info |
6428 |
mov $init_thread_union+THREAD_SIZE,%rsp |
6429 |
-diff -urNp linux-2.6.32.38/arch/x86/xen/xen-ops.h linux-2.6.32.38/arch/x86/xen/xen-ops.h |
6430 |
---- linux-2.6.32.38/arch/x86/xen/xen-ops.h 2011-03-27 14:31:47.000000000 -0400 |
6431 |
-+++ linux-2.6.32.38/arch/x86/xen/xen-ops.h 2011-04-17 15:56:46.000000000 -0400 |
6432 |
+diff -urNp linux-2.6.32.39/arch/x86/xen/xen-ops.h linux-2.6.32.39/arch/x86/xen/xen-ops.h |
6433 |
+--- linux-2.6.32.39/arch/x86/xen/xen-ops.h 2011-03-27 14:31:47.000000000 -0400 |
6434 |
++++ linux-2.6.32.39/arch/x86/xen/xen-ops.h 2011-04-17 15:56:46.000000000 -0400 |
6435 |
@@ -10,8 +10,6 @@ |
6436 |
extern const char xen_hypervisor_callback[]; |
6437 |
extern const char xen_failsafe_callback[]; |
6438 |
@@ -21553,9 +21384,9 @@ diff -urNp linux-2.6.32.38/arch/x86/xen/xen-ops.h linux-2.6.32.38/arch/x86/xen/x |
6439 |
struct trap_info; |
6440 |
void xen_copy_trap_info(struct trap_info *traps); |
6441 |
|
6442 |
-diff -urNp linux-2.6.32.38/block/blk-integrity.c linux-2.6.32.38/block/blk-integrity.c |
6443 |
---- linux-2.6.32.38/block/blk-integrity.c 2011-03-27 14:31:47.000000000 -0400 |
6444 |
-+++ linux-2.6.32.38/block/blk-integrity.c 2011-04-17 15:56:46.000000000 -0400 |
6445 |
+diff -urNp linux-2.6.32.39/block/blk-integrity.c linux-2.6.32.39/block/blk-integrity.c |
6446 |
+--- linux-2.6.32.39/block/blk-integrity.c 2011-03-27 14:31:47.000000000 -0400 |
6447 |
++++ linux-2.6.32.39/block/blk-integrity.c 2011-04-17 15:56:46.000000000 -0400 |
6448 |
@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs |
6449 |
NULL, |
6450 |
}; |
6451 |
@@ -21565,9 +21396,9 @@ diff -urNp linux-2.6.32.38/block/blk-integrity.c linux-2.6.32.38/block/blk-integ |
6452 |
.show = &integrity_attr_show, |
6453 |
.store = &integrity_attr_store, |
6454 |
}; |
6455 |
-diff -urNp linux-2.6.32.38/block/blk-iopoll.c linux-2.6.32.38/block/blk-iopoll.c |
6456 |
---- linux-2.6.32.38/block/blk-iopoll.c 2011-03-27 14:31:47.000000000 -0400 |
6457 |
-+++ linux-2.6.32.38/block/blk-iopoll.c 2011-04-17 15:56:46.000000000 -0400 |
6458 |
+diff -urNp linux-2.6.32.39/block/blk-iopoll.c linux-2.6.32.39/block/blk-iopoll.c |
6459 |
+--- linux-2.6.32.39/block/blk-iopoll.c 2011-03-27 14:31:47.000000000 -0400 |
6460 |
++++ linux-2.6.32.39/block/blk-iopoll.c 2011-04-17 15:56:46.000000000 -0400 |
6461 |
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo |
6462 |
} |
6463 |
EXPORT_SYMBOL(blk_iopoll_complete); |
6464 |
@@ -21577,9 +21408,9 @@ diff -urNp linux-2.6.32.38/block/blk-iopoll.c linux-2.6.32.38/block/blk-iopoll.c |
6465 |
{ |
6466 |
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); |
6467 |
int rearm = 0, budget = blk_iopoll_budget; |
6468 |
-diff -urNp linux-2.6.32.38/block/blk-map.c linux-2.6.32.38/block/blk-map.c |
6469 |
---- linux-2.6.32.38/block/blk-map.c 2011-03-27 14:31:47.000000000 -0400 |
6470 |
-+++ linux-2.6.32.38/block/blk-map.c 2011-04-18 16:57:33.000000000 -0400 |
6471 |
+diff -urNp linux-2.6.32.39/block/blk-map.c linux-2.6.32.39/block/blk-map.c |
6472 |
+--- linux-2.6.32.39/block/blk-map.c 2011-03-27 14:31:47.000000000 -0400 |
6473 |
++++ linux-2.6.32.39/block/blk-map.c 2011-04-18 16:57:33.000000000 -0400 |
6474 |
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ |
6475 |
* direct dma. else, set up kernel bounce buffers |
6476 |
*/ |
6477 |
@@ -21614,9 +21445,9 @@ diff -urNp linux-2.6.32.38/block/blk-map.c linux-2.6.32.38/block/blk-map.c |
6478 |
if (do_copy) |
6479 |
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); |
6480 |
else |
6481 |
-diff -urNp linux-2.6.32.38/block/blk-softirq.c linux-2.6.32.38/block/blk-softirq.c |
6482 |
---- linux-2.6.32.38/block/blk-softirq.c 2011-03-27 14:31:47.000000000 -0400 |
6483 |
-+++ linux-2.6.32.38/block/blk-softirq.c 2011-04-17 15:56:46.000000000 -0400 |
6484 |
+diff -urNp linux-2.6.32.39/block/blk-softirq.c linux-2.6.32.39/block/blk-softirq.c |
6485 |
+--- linux-2.6.32.39/block/blk-softirq.c 2011-03-27 14:31:47.000000000 -0400 |
6486 |
++++ linux-2.6.32.39/block/blk-softirq.c 2011-04-17 15:56:46.000000000 -0400 |
6487 |
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, |
6488 |
* Softirq action handler - move entries to local list and loop over them |
6489 |
* while passing them to the queue registered handler. |
6490 |
@@ -21626,9 +21457,9 @@ diff -urNp linux-2.6.32.38/block/blk-softirq.c linux-2.6.32.38/block/blk-softirq |
6491 |
{ |
6492 |
struct list_head *cpu_list, local_list; |
6493 |
|
6494 |
-diff -urNp linux-2.6.32.38/block/blk-sysfs.c linux-2.6.32.38/block/blk-sysfs.c |
6495 |
---- linux-2.6.32.38/block/blk-sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
6496 |
-+++ linux-2.6.32.38/block/blk-sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
6497 |
+diff -urNp linux-2.6.32.39/block/blk-sysfs.c linux-2.6.32.39/block/blk-sysfs.c |
6498 |
+--- linux-2.6.32.39/block/blk-sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
6499 |
++++ linux-2.6.32.39/block/blk-sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
6500 |
@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob |
6501 |
kmem_cache_free(blk_requestq_cachep, q); |
6502 |
} |
6503 |
@@ -21638,9 +21469,9 @@ diff -urNp linux-2.6.32.38/block/blk-sysfs.c linux-2.6.32.38/block/blk-sysfs.c |
6504 |
.show = queue_attr_show, |
6505 |
.store = queue_attr_store, |
6506 |
}; |
6507 |
-diff -urNp linux-2.6.32.38/block/bsg.c linux-2.6.32.38/block/bsg.c |
6508 |
---- linux-2.6.32.38/block/bsg.c 2011-03-27 14:31:47.000000000 -0400 |
6509 |
-+++ linux-2.6.32.38/block/bsg.c 2011-04-17 15:56:46.000000000 -0400 |
6510 |
+diff -urNp linux-2.6.32.39/block/bsg.c linux-2.6.32.39/block/bsg.c |
6511 |
+--- linux-2.6.32.39/block/bsg.c 2011-03-27 14:31:47.000000000 -0400 |
6512 |
++++ linux-2.6.32.39/block/bsg.c 2011-04-17 15:56:46.000000000 -0400 |
6513 |
@@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r |
6514 |
struct sg_io_v4 *hdr, struct bsg_device *bd, |
6515 |
fmode_t has_write_perm) |
6516 |
@@ -21668,9 +21499,9 @@ diff -urNp linux-2.6.32.38/block/bsg.c linux-2.6.32.38/block/bsg.c |
6517 |
if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { |
6518 |
if (blk_verify_command(rq->cmd, has_write_perm)) |
6519 |
return -EPERM; |
6520 |
-diff -urNp linux-2.6.32.38/block/elevator.c linux-2.6.32.38/block/elevator.c |
6521 |
---- linux-2.6.32.38/block/elevator.c 2011-03-27 14:31:47.000000000 -0400 |
6522 |
-+++ linux-2.6.32.38/block/elevator.c 2011-04-17 15:56:46.000000000 -0400 |
6523 |
+diff -urNp linux-2.6.32.39/block/elevator.c linux-2.6.32.39/block/elevator.c |
6524 |
+--- linux-2.6.32.39/block/elevator.c 2011-03-27 14:31:47.000000000 -0400 |
6525 |
++++ linux-2.6.32.39/block/elevator.c 2011-04-17 15:56:46.000000000 -0400 |
6526 |
@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str |
6527 |
return error; |
6528 |
} |
6529 |
@@ -21680,10 +21511,10 @@ diff -urNp linux-2.6.32.38/block/elevator.c linux-2.6.32.38/block/elevator.c |
6530 |
.show = elv_attr_show, |
6531 |
.store = elv_attr_store, |
6532 |
}; |
6533 |
-diff -urNp linux-2.6.32.38/block/scsi_ioctl.c linux-2.6.32.38/block/scsi_ioctl.c |
6534 |
---- linux-2.6.32.38/block/scsi_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
6535 |
-+++ linux-2.6.32.38/block/scsi_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
6536 |
-@@ -220,8 +220,21 @@ EXPORT_SYMBOL(blk_verify_command); |
6537 |
+diff -urNp linux-2.6.32.39/block/scsi_ioctl.c linux-2.6.32.39/block/scsi_ioctl.c |
6538 |
+--- linux-2.6.32.39/block/scsi_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
6539 |
++++ linux-2.6.32.39/block/scsi_ioctl.c 2011-04-23 13:28:22.000000000 -0400 |
6540 |
+@@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command); |
6541 |
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, |
6542 |
struct sg_io_hdr *hdr, fmode_t mode) |
6543 |
{ |
6544 |
@@ -21702,21 +21533,19 @@ diff -urNp linux-2.6.32.38/block/scsi_ioctl.c linux-2.6.32.38/block/scsi_ioctl.c |
6545 |
+ if (cmdptr != rq->cmd) |
6546 |
+ memcpy(rq->cmd, cmdptr, hdr->cmd_len); |
6547 |
+ |
6548 |
-+ |
6549 |
if (blk_verify_command(rq->cmd, mode & FMODE_WRITE)) |
6550 |
return -EPERM; |
6551 |
|
6552 |
-@@ -430,6 +443,9 @@ int sg_scsi_ioctl(struct request_queue * |
6553 |
+@@ -430,6 +442,8 @@ int sg_scsi_ioctl(struct request_queue * |
6554 |
int err; |
6555 |
unsigned int in_len, out_len, bytes, opcode, cmdlen; |
6556 |
char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; |
6557 |
+ unsigned char tmpcmd[sizeof(rq->__cmd)]; |
6558 |
+ unsigned char *cmdptr; |
6559 |
-+ |
6560 |
|
6561 |
if (!sic) |
6562 |
return -EINVAL; |
6563 |
-@@ -463,9 +479,18 @@ int sg_scsi_ioctl(struct request_queue * |
6564 |
+@@ -463,9 +477,18 @@ int sg_scsi_ioctl(struct request_queue * |
6565 |
*/ |
6566 |
err = -EFAULT; |
6567 |
rq->cmd_len = cmdlen; |
6568 |
@@ -21736,21 +21565,9 @@ diff -urNp linux-2.6.32.38/block/scsi_ioctl.c linux-2.6.32.38/block/scsi_ioctl.c |
6569 |
if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) |
6570 |
goto error; |
6571 |
|
6572 |
-diff -urNp linux-2.6.32.38/crypto/lrw.c linux-2.6.32.38/crypto/lrw.c |
6573 |
---- linux-2.6.32.38/crypto/lrw.c 2011-03-27 14:31:47.000000000 -0400 |
6574 |
-+++ linux-2.6.32.38/crypto/lrw.c 2011-04-17 15:56:46.000000000 -0400 |
6575 |
-@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par |
6576 |
- struct priv *ctx = crypto_tfm_ctx(parent); |
6577 |
- struct crypto_cipher *child = ctx->child; |
6578 |
- int err, i; |
6579 |
-- be128 tmp = { 0 }; |
6580 |
-+ be128 tmp = { 0, 0 }; |
6581 |
- int bsize = crypto_cipher_blocksize(child); |
6582 |
- |
6583 |
- crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); |
6584 |
-diff -urNp linux-2.6.32.38/Documentation/dontdiff linux-2.6.32.38/Documentation/dontdiff |
6585 |
---- linux-2.6.32.38/Documentation/dontdiff 2011-03-27 14:31:47.000000000 -0400 |
6586 |
-+++ linux-2.6.32.38/Documentation/dontdiff 2011-04-17 15:56:45.000000000 -0400 |
6587 |
+diff -urNp linux-2.6.32.39/Documentation/dontdiff linux-2.6.32.39/Documentation/dontdiff |
6588 |
+--- linux-2.6.32.39/Documentation/dontdiff 2011-03-27 14:31:47.000000000 -0400 |
6589 |
++++ linux-2.6.32.39/Documentation/dontdiff 2011-04-17 15:56:45.000000000 -0400 |
6590 |
@@ -3,6 +3,7 @@ |
6591 |
*.bin |
6592 |
*.cpio |
6593 |
@@ -21868,9 +21685,9 @@ diff -urNp linux-2.6.32.38/Documentation/dontdiff linux-2.6.32.38/Documentation/ |
6594 |
zImage* |
6595 |
zconf.hash.c |
6596 |
+zoffset.h |
6597 |
-diff -urNp linux-2.6.32.38/Documentation/kernel-parameters.txt linux-2.6.32.38/Documentation/kernel-parameters.txt |
6598 |
---- linux-2.6.32.38/Documentation/kernel-parameters.txt 2011-03-27 14:31:47.000000000 -0400 |
6599 |
-+++ linux-2.6.32.38/Documentation/kernel-parameters.txt 2011-04-17 15:56:45.000000000 -0400 |
6600 |
+diff -urNp linux-2.6.32.39/Documentation/kernel-parameters.txt linux-2.6.32.39/Documentation/kernel-parameters.txt |
6601 |
+--- linux-2.6.32.39/Documentation/kernel-parameters.txt 2011-03-27 14:31:47.000000000 -0400 |
6602 |
++++ linux-2.6.32.39/Documentation/kernel-parameters.txt 2011-04-17 15:56:45.000000000 -0400 |
6603 |
@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters. |
6604 |
the specified number of seconds. This is to be used if |
6605 |
your oopses keep scrolling off the screen. |
6606 |
@@ -21885,9 +21702,9 @@ diff -urNp linux-2.6.32.38/Documentation/kernel-parameters.txt linux-2.6.32.38/D |
6607 |
pcbit= [HW,ISDN] |
6608 |
|
6609 |
pcd. [PARIDE] |
6610 |
-diff -urNp linux-2.6.32.38/drivers/acpi/acpi_pad.c linux-2.6.32.38/drivers/acpi/acpi_pad.c |
6611 |
---- linux-2.6.32.38/drivers/acpi/acpi_pad.c 2011-03-27 14:31:47.000000000 -0400 |
6612 |
-+++ linux-2.6.32.38/drivers/acpi/acpi_pad.c 2011-04-17 15:56:46.000000000 -0400 |
6613 |
+diff -urNp linux-2.6.32.39/drivers/acpi/acpi_pad.c linux-2.6.32.39/drivers/acpi/acpi_pad.c |
6614 |
+--- linux-2.6.32.39/drivers/acpi/acpi_pad.c 2011-03-27 14:31:47.000000000 -0400 |
6615 |
++++ linux-2.6.32.39/drivers/acpi/acpi_pad.c 2011-04-17 15:56:46.000000000 -0400 |
6616 |
@@ -30,7 +30,7 @@ |
6617 |
#include <acpi/acpi_bus.h> |
6618 |
#include <acpi/acpi_drivers.h> |
6619 |
@@ -21897,9 +21714,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/acpi_pad.c linux-2.6.32.38/drivers/acpi/ |
6620 |
#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" |
6621 |
#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 |
6622 |
static DEFINE_MUTEX(isolated_cpus_lock); |
6623 |
-diff -urNp linux-2.6.32.38/drivers/acpi/battery.c linux-2.6.32.38/drivers/acpi/battery.c |
6624 |
---- linux-2.6.32.38/drivers/acpi/battery.c 2011-03-27 14:31:47.000000000 -0400 |
6625 |
-+++ linux-2.6.32.38/drivers/acpi/battery.c 2011-04-17 15:56:46.000000000 -0400 |
6626 |
+diff -urNp linux-2.6.32.39/drivers/acpi/battery.c linux-2.6.32.39/drivers/acpi/battery.c |
6627 |
+--- linux-2.6.32.39/drivers/acpi/battery.c 2011-03-27 14:31:47.000000000 -0400 |
6628 |
++++ linux-2.6.32.39/drivers/acpi/battery.c 2011-04-17 15:56:46.000000000 -0400 |
6629 |
@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); |
6630 |
} |
6631 |
|
6632 |
@@ -21909,21 +21726,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/battery.c linux-2.6.32.38/drivers/acpi/b |
6633 |
mode_t mode; |
6634 |
const char *name; |
6635 |
} acpi_battery_file[] = { |
6636 |
-diff -urNp linux-2.6.32.38/drivers/acpi/blacklist.c linux-2.6.32.38/drivers/acpi/blacklist.c |
6637 |
---- linux-2.6.32.38/drivers/acpi/blacklist.c 2011-03-27 14:31:47.000000000 -0400 |
6638 |
-+++ linux-2.6.32.38/drivers/acpi/blacklist.c 2011-04-17 15:56:46.000000000 -0400 |
6639 |
-@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b |
6640 |
- {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, |
6641 |
- "Incorrect _ADR", 1}, |
6642 |
- |
6643 |
-- {""} |
6644 |
-+ {"", "", 0, NULL, all_versions, NULL, 0} |
6645 |
- }; |
6646 |
- |
6647 |
- #if CONFIG_ACPI_BLACKLIST_YEAR |
6648 |
-diff -urNp linux-2.6.32.38/drivers/acpi/dock.c linux-2.6.32.38/drivers/acpi/dock.c |
6649 |
---- linux-2.6.32.38/drivers/acpi/dock.c 2011-03-27 14:31:47.000000000 -0400 |
6650 |
-+++ linux-2.6.32.38/drivers/acpi/dock.c 2011-04-17 15:56:46.000000000 -0400 |
6651 |
+diff -urNp linux-2.6.32.39/drivers/acpi/dock.c linux-2.6.32.39/drivers/acpi/dock.c |
6652 |
+--- linux-2.6.32.39/drivers/acpi/dock.c 2011-03-27 14:31:47.000000000 -0400 |
6653 |
++++ linux-2.6.32.39/drivers/acpi/dock.c 2011-04-17 15:56:46.000000000 -0400 |
6654 |
@@ -77,7 +77,7 @@ struct dock_dependent_device { |
6655 |
struct list_head list; |
6656 |
struct list_head hotplug_list; |
6657 |
@@ -21942,9 +21747,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/dock.c linux-2.6.32.38/drivers/acpi/dock |
6658 |
void *context) |
6659 |
{ |
6660 |
struct dock_dependent_device *dd; |
6661 |
-diff -urNp linux-2.6.32.38/drivers/acpi/osl.c linux-2.6.32.38/drivers/acpi/osl.c |
6662 |
---- linux-2.6.32.38/drivers/acpi/osl.c 2011-03-27 14:31:47.000000000 -0400 |
6663 |
-+++ linux-2.6.32.38/drivers/acpi/osl.c 2011-04-17 15:56:46.000000000 -0400 |
6664 |
+diff -urNp linux-2.6.32.39/drivers/acpi/osl.c linux-2.6.32.39/drivers/acpi/osl.c |
6665 |
+--- linux-2.6.32.39/drivers/acpi/osl.c 2011-03-27 14:31:47.000000000 -0400 |
6666 |
++++ linux-2.6.32.39/drivers/acpi/osl.c 2011-04-17 15:56:46.000000000 -0400 |
6667 |
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres |
6668 |
void __iomem *virt_addr; |
6669 |
|
6670 |
@@ -21963,9 +21768,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/osl.c linux-2.6.32.38/drivers/acpi/osl.c |
6671 |
|
6672 |
switch (width) { |
6673 |
case 8: |
6674 |
-diff -urNp linux-2.6.32.38/drivers/acpi/power_meter.c linux-2.6.32.38/drivers/acpi/power_meter.c |
6675 |
---- linux-2.6.32.38/drivers/acpi/power_meter.c 2011-03-27 14:31:47.000000000 -0400 |
6676 |
-+++ linux-2.6.32.38/drivers/acpi/power_meter.c 2011-04-17 15:56:46.000000000 -0400 |
6677 |
+diff -urNp linux-2.6.32.39/drivers/acpi/power_meter.c linux-2.6.32.39/drivers/acpi/power_meter.c |
6678 |
+--- linux-2.6.32.39/drivers/acpi/power_meter.c 2011-03-27 14:31:47.000000000 -0400 |
6679 |
++++ linux-2.6.32.39/drivers/acpi/power_meter.c 2011-04-17 15:56:46.000000000 -0400 |
6680 |
@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d |
6681 |
return res; |
6682 |
|
6683 |
@@ -21975,9 +21780,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/power_meter.c linux-2.6.32.38/drivers/ac |
6684 |
|
6685 |
mutex_lock(&resource->lock); |
6686 |
resource->trip[attr->index - 7] = temp; |
6687 |
-diff -urNp linux-2.6.32.38/drivers/acpi/proc.c linux-2.6.32.38/drivers/acpi/proc.c |
6688 |
---- linux-2.6.32.38/drivers/acpi/proc.c 2011-03-27 14:31:47.000000000 -0400 |
6689 |
-+++ linux-2.6.32.38/drivers/acpi/proc.c 2011-04-17 15:56:46.000000000 -0400 |
6690 |
+diff -urNp linux-2.6.32.39/drivers/acpi/proc.c linux-2.6.32.39/drivers/acpi/proc.c |
6691 |
+--- linux-2.6.32.39/drivers/acpi/proc.c 2011-03-27 14:31:47.000000000 -0400 |
6692 |
++++ linux-2.6.32.39/drivers/acpi/proc.c 2011-04-17 15:56:46.000000000 -0400 |
6693 |
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f |
6694 |
size_t count, loff_t * ppos) |
6695 |
{ |
6696 |
@@ -22013,9 +21818,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/proc.c linux-2.6.32.38/drivers/acpi/proc |
6697 |
dev->wakeup.state.enabled = |
6698 |
dev->wakeup.state.enabled ? 0 : 1; |
6699 |
found_dev = dev; |
6700 |
-diff -urNp linux-2.6.32.38/drivers/acpi/processor_core.c linux-2.6.32.38/drivers/acpi/processor_core.c |
6701 |
---- linux-2.6.32.38/drivers/acpi/processor_core.c 2011-03-27 14:31:47.000000000 -0400 |
6702 |
-+++ linux-2.6.32.38/drivers/acpi/processor_core.c 2011-04-17 15:56:46.000000000 -0400 |
6703 |
+diff -urNp linux-2.6.32.39/drivers/acpi/processor_core.c linux-2.6.32.39/drivers/acpi/processor_core.c |
6704 |
+--- linux-2.6.32.39/drivers/acpi/processor_core.c 2011-03-27 14:31:47.000000000 -0400 |
6705 |
++++ linux-2.6.32.39/drivers/acpi/processor_core.c 2011-04-17 15:56:46.000000000 -0400 |
6706 |
@@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add( |
6707 |
return 0; |
6708 |
} |
6709 |
@@ -22025,21 +21830,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/processor_core.c linux-2.6.32.38/drivers |
6710 |
|
6711 |
/* |
6712 |
* Buggy BIOS check |
6713 |
-diff -urNp linux-2.6.32.38/drivers/acpi/processor_idle.c linux-2.6.32.38/drivers/acpi/processor_idle.c |
6714 |
---- linux-2.6.32.38/drivers/acpi/processor_idle.c 2011-03-27 14:31:47.000000000 -0400 |
6715 |
-+++ linux-2.6.32.38/drivers/acpi/processor_idle.c 2011-04-17 15:56:46.000000000 -0400 |
6716 |
-@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat |
6717 |
- DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), |
6718 |
- DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, |
6719 |
- (void *)1}, |
6720 |
-- {}, |
6721 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}, |
6722 |
- }; |
6723 |
- |
6724 |
- |
6725 |
-diff -urNp linux-2.6.32.38/drivers/acpi/sbshc.c linux-2.6.32.38/drivers/acpi/sbshc.c |
6726 |
---- linux-2.6.32.38/drivers/acpi/sbshc.c 2011-03-27 14:31:47.000000000 -0400 |
6727 |
-+++ linux-2.6.32.38/drivers/acpi/sbshc.c 2011-04-17 15:56:46.000000000 -0400 |
6728 |
+diff -urNp linux-2.6.32.39/drivers/acpi/sbshc.c linux-2.6.32.39/drivers/acpi/sbshc.c |
6729 |
+--- linux-2.6.32.39/drivers/acpi/sbshc.c 2011-03-27 14:31:47.000000000 -0400 |
6730 |
++++ linux-2.6.32.39/drivers/acpi/sbshc.c 2011-04-17 15:56:46.000000000 -0400 |
6731 |
@@ -17,7 +17,7 @@ |
6732 |
|
6733 |
#define PREFIX "ACPI: " |
6734 |
@@ -22049,9 +21842,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/sbshc.c linux-2.6.32.38/drivers/acpi/sbs |
6735 |
#define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" |
6736 |
|
6737 |
struct acpi_smb_hc { |
6738 |
-diff -urNp linux-2.6.32.38/drivers/acpi/sleep.c linux-2.6.32.38/drivers/acpi/sleep.c |
6739 |
---- linux-2.6.32.38/drivers/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400 |
6740 |
-+++ linux-2.6.32.38/drivers/acpi/sleep.c 2011-04-17 15:56:46.000000000 -0400 |
6741 |
+diff -urNp linux-2.6.32.39/drivers/acpi/sleep.c linux-2.6.32.39/drivers/acpi/sleep.c |
6742 |
+--- linux-2.6.32.39/drivers/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400 |
6743 |
++++ linux-2.6.32.39/drivers/acpi/sleep.c 2011-04-17 15:56:46.000000000 -0400 |
6744 |
@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp |
6745 |
} |
6746 |
} |
6747 |
@@ -22088,9 +21881,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/sleep.c linux-2.6.32.38/drivers/acpi/sle |
6748 |
.begin = acpi_hibernation_begin_old, |
6749 |
.end = acpi_pm_end, |
6750 |
.pre_snapshot = acpi_hibernation_pre_snapshot_old, |
6751 |
-diff -urNp linux-2.6.32.38/drivers/acpi/video.c linux-2.6.32.38/drivers/acpi/video.c |
6752 |
---- linux-2.6.32.38/drivers/acpi/video.c 2011-03-27 14:31:47.000000000 -0400 |
6753 |
-+++ linux-2.6.32.38/drivers/acpi/video.c 2011-04-17 15:56:46.000000000 -0400 |
6754 |
+diff -urNp linux-2.6.32.39/drivers/acpi/video.c linux-2.6.32.39/drivers/acpi/video.c |
6755 |
+--- linux-2.6.32.39/drivers/acpi/video.c 2011-03-27 14:31:47.000000000 -0400 |
6756 |
++++ linux-2.6.32.39/drivers/acpi/video.c 2011-04-17 15:56:46.000000000 -0400 |
6757 |
@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str |
6758 |
vd->brightness->levels[request_level]); |
6759 |
} |
6760 |
@@ -22100,9 +21893,9 @@ diff -urNp linux-2.6.32.38/drivers/acpi/video.c linux-2.6.32.38/drivers/acpi/vid |
6761 |
.get_brightness = acpi_video_get_brightness, |
6762 |
.update_status = acpi_video_set_brightness, |
6763 |
}; |
6764 |
-diff -urNp linux-2.6.32.38/drivers/ata/ahci.c linux-2.6.32.38/drivers/ata/ahci.c |
6765 |
---- linux-2.6.32.38/drivers/ata/ahci.c 2011-03-27 14:31:47.000000000 -0400 |
6766 |
-+++ linux-2.6.32.38/drivers/ata/ahci.c 2011-04-17 15:56:46.000000000 -0400 |
6767 |
+diff -urNp linux-2.6.32.39/drivers/ata/ahci.c linux-2.6.32.39/drivers/ata/ahci.c |
6768 |
+--- linux-2.6.32.39/drivers/ata/ahci.c 2011-03-27 14:31:47.000000000 -0400 |
6769 |
++++ linux-2.6.32.39/drivers/ata/ahci.c 2011-04-23 12:56:10.000000000 -0400 |
6770 |
@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh |
6771 |
.sdev_attrs = ahci_sdev_attrs, |
6772 |
}; |
6773 |
@@ -22133,18 +21926,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/ahci.c linux-2.6.32.38/drivers/ata/ahci.c |
6774 |
.inherits = &ahci_ops, |
6775 |
.softreset = ahci_sb600_softreset, |
6776 |
.pmp_softreset = ahci_sb600_softreset, |
6777 |
-@@ -692,7 +692,7 @@ static const struct pci_device_id ahci_p |
6778 |
- { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
6779 |
- PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, |
6780 |
- |
6781 |
-- { } /* terminate list */ |
6782 |
-+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ |
6783 |
- }; |
6784 |
- |
6785 |
- |
6786 |
-diff -urNp linux-2.6.32.38/drivers/ata/ata_generic.c linux-2.6.32.38/drivers/ata/ata_generic.c |
6787 |
---- linux-2.6.32.38/drivers/ata/ata_generic.c 2011-03-27 14:31:47.000000000 -0400 |
6788 |
-+++ linux-2.6.32.38/drivers/ata/ata_generic.c 2011-04-17 15:56:46.000000000 -0400 |
6789 |
+diff -urNp linux-2.6.32.39/drivers/ata/ata_generic.c linux-2.6.32.39/drivers/ata/ata_generic.c |
6790 |
+--- linux-2.6.32.39/drivers/ata/ata_generic.c 2011-03-27 14:31:47.000000000 -0400 |
6791 |
++++ linux-2.6.32.39/drivers/ata/ata_generic.c 2011-04-17 15:56:46.000000000 -0400 |
6792 |
@@ -104,7 +104,7 @@ static struct scsi_host_template generic |
6793 |
ATA_BMDMA_SHT(DRV_NAME), |
6794 |
}; |
6795 |
@@ -22154,18 +21938,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/ata_generic.c linux-2.6.32.38/drivers/ata |
6796 |
.inherits = &ata_bmdma_port_ops, |
6797 |
.cable_detect = ata_cable_unknown, |
6798 |
.set_mode = generic_set_mode, |
6799 |
-diff -urNp linux-2.6.32.38/drivers/ata/ata_piix.c linux-2.6.32.38/drivers/ata/ata_piix.c |
6800 |
---- linux-2.6.32.38/drivers/ata/ata_piix.c 2011-03-27 14:31:47.000000000 -0400 |
6801 |
-+++ linux-2.6.32.38/drivers/ata/ata_piix.c 2011-04-17 15:56:46.000000000 -0400 |
6802 |
-@@ -300,7 +300,7 @@ static const struct pci_device_id piix_p |
6803 |
- { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, |
6804 |
- /* SATA Controller IDE (CPT) */ |
6805 |
- { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, |
6806 |
-- { } /* terminate list */ |
6807 |
-+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ |
6808 |
- }; |
6809 |
- |
6810 |
- static struct pci_driver piix_pci_driver = { |
6811 |
+diff -urNp linux-2.6.32.39/drivers/ata/ata_piix.c linux-2.6.32.39/drivers/ata/ata_piix.c |
6812 |
+--- linux-2.6.32.39/drivers/ata/ata_piix.c 2011-03-27 14:31:47.000000000 -0400 |
6813 |
++++ linux-2.6.32.39/drivers/ata/ata_piix.c 2011-04-23 12:56:10.000000000 -0400 |
6814 |
@@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh |
6815 |
ATA_BMDMA_SHT(DRV_NAME), |
6816 |
}; |
6817 |
@@ -22202,27 +21977,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/ata_piix.c linux-2.6.32.38/drivers/ata/at |
6818 |
.inherits = &piix_sata_ops, |
6819 |
.hardreset = sata_std_hardreset, |
6820 |
.scr_read = piix_sidpr_scr_read, |
6821 |
-@@ -617,7 +617,7 @@ static const struct ich_laptop ich_lapto |
6822 |
- { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ |
6823 |
- { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ |
6824 |
- /* end marker */ |
6825 |
-- { 0, } |
6826 |
-+ { 0, 0, 0 } |
6827 |
- }; |
6828 |
- |
6829 |
- /** |
6830 |
-@@ -1101,7 +1101,7 @@ static int piix_broken_suspend(void) |
6831 |
- }, |
6832 |
- }, |
6833 |
- |
6834 |
-- { } /* terminate list */ |
6835 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } /* terminate list */ |
6836 |
- }; |
6837 |
- static const char *oemstrs[] = { |
6838 |
- "Tecra M3,", |
6839 |
-diff -urNp linux-2.6.32.38/drivers/ata/libata-acpi.c linux-2.6.32.38/drivers/ata/libata-acpi.c |
6840 |
---- linux-2.6.32.38/drivers/ata/libata-acpi.c 2011-03-27 14:31:47.000000000 -0400 |
6841 |
-+++ linux-2.6.32.38/drivers/ata/libata-acpi.c 2011-04-17 15:56:46.000000000 -0400 |
6842 |
+diff -urNp linux-2.6.32.39/drivers/ata/libata-acpi.c linux-2.6.32.39/drivers/ata/libata-acpi.c |
6843 |
+--- linux-2.6.32.39/drivers/ata/libata-acpi.c 2011-03-27 14:31:47.000000000 -0400 |
6844 |
++++ linux-2.6.32.39/drivers/ata/libata-acpi.c 2011-04-17 15:56:46.000000000 -0400 |
6845 |
@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han |
6846 |
ata_acpi_uevent(dev->link->ap, dev, event); |
6847 |
} |
6848 |
@@ -22238,36 +21995,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-acpi.c linux-2.6.32.38/drivers/ata |
6849 |
.handler = ata_acpi_ap_notify_dock, |
6850 |
.uevent = ata_acpi_ap_uevent, |
6851 |
}; |
6852 |
-diff -urNp linux-2.6.32.38/drivers/ata/libata-core.c linux-2.6.32.38/drivers/ata/libata-core.c |
6853 |
---- linux-2.6.32.38/drivers/ata/libata-core.c 2011-03-27 14:31:47.000000000 -0400 |
6854 |
-+++ linux-2.6.32.38/drivers/ata/libata-core.c 2011-04-17 15:56:46.000000000 -0400 |
6855 |
-@@ -900,7 +900,7 @@ static const struct ata_xfer_ent { |
6856 |
- { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, |
6857 |
- { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, |
6858 |
- { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 }, |
6859 |
-- { -1, }, |
6860 |
-+ { -1, 0, 0 } |
6861 |
- }; |
6862 |
- |
6863 |
- /** |
6864 |
-@@ -3168,7 +3168,7 @@ static const struct ata_timing ata_timin |
6865 |
- { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, |
6866 |
- { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, |
6867 |
- |
6868 |
-- { 0xFF } |
6869 |
-+ { 0xFF, 0, 0, 0, 0, 0, 0, 0, 0 } |
6870 |
- }; |
6871 |
- |
6872 |
- #define ENOUGH(v, unit) (((v)-1)/(unit)+1) |
6873 |
-@@ -4393,7 +4393,7 @@ static const struct ata_blacklist_entry |
6874 |
- { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, |
6875 |
- |
6876 |
- /* End Marker */ |
6877 |
-- { } |
6878 |
-+ { NULL, NULL, 0 } |
6879 |
- }; |
6880 |
- |
6881 |
- static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) |
6882 |
+diff -urNp linux-2.6.32.39/drivers/ata/libata-core.c linux-2.6.32.39/drivers/ata/libata-core.c |
6883 |
+--- linux-2.6.32.39/drivers/ata/libata-core.c 2011-03-27 14:31:47.000000000 -0400 |
6884 |
++++ linux-2.6.32.39/drivers/ata/libata-core.c 2011-04-23 12:56:10.000000000 -0400 |
6885 |
@@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd * |
6886 |
struct ata_port *ap; |
6887 |
unsigned int tag; |
6888 |
@@ -22332,9 +22062,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-core.c linux-2.6.32.38/drivers/ata |
6889 |
.qc_prep = ata_noop_qc_prep, |
6890 |
.qc_issue = ata_dummy_qc_issue, |
6891 |
.error_handler = ata_dummy_error_handler, |
6892 |
-diff -urNp linux-2.6.32.38/drivers/ata/libata-eh.c linux-2.6.32.38/drivers/ata/libata-eh.c |
6893 |
---- linux-2.6.32.38/drivers/ata/libata-eh.c 2011-03-27 14:31:47.000000000 -0400 |
6894 |
-+++ linux-2.6.32.38/drivers/ata/libata-eh.c 2011-04-17 15:56:46.000000000 -0400 |
6895 |
+diff -urNp linux-2.6.32.39/drivers/ata/libata-eh.c linux-2.6.32.39/drivers/ata/libata-eh.c |
6896 |
+--- linux-2.6.32.39/drivers/ata/libata-eh.c 2011-03-27 14:31:47.000000000 -0400 |
6897 |
++++ linux-2.6.32.39/drivers/ata/libata-eh.c 2011-04-17 15:56:46.000000000 -0400 |
6898 |
@@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_ |
6899 |
*/ |
6900 |
void ata_std_error_handler(struct ata_port *ap) |
6901 |
@@ -22344,9 +22074,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-eh.c linux-2.6.32.38/drivers/ata/l |
6902 |
ata_reset_fn_t hardreset = ops->hardreset; |
6903 |
|
6904 |
/* ignore built-in hardreset if SCR access is not available */ |
6905 |
-diff -urNp linux-2.6.32.38/drivers/ata/libata-pmp.c linux-2.6.32.38/drivers/ata/libata-pmp.c |
6906 |
---- linux-2.6.32.38/drivers/ata/libata-pmp.c 2011-03-27 14:31:47.000000000 -0400 |
6907 |
-+++ linux-2.6.32.38/drivers/ata/libata-pmp.c 2011-04-17 15:56:46.000000000 -0400 |
6908 |
+diff -urNp linux-2.6.32.39/drivers/ata/libata-pmp.c linux-2.6.32.39/drivers/ata/libata-pmp.c |
6909 |
+--- linux-2.6.32.39/drivers/ata/libata-pmp.c 2011-03-27 14:31:47.000000000 -0400 |
6910 |
++++ linux-2.6.32.39/drivers/ata/libata-pmp.c 2011-04-17 15:56:46.000000000 -0400 |
6911 |
@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str |
6912 |
*/ |
6913 |
static int sata_pmp_eh_recover(struct ata_port *ap) |
6914 |
@@ -22356,9 +22086,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/libata-pmp.c linux-2.6.32.38/drivers/ata/ |
6915 |
int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; |
6916 |
struct ata_link *pmp_link = &ap->link; |
6917 |
struct ata_device *pmp_dev = pmp_link->device; |
6918 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_acpi.c linux-2.6.32.38/drivers/ata/pata_acpi.c |
6919 |
---- linux-2.6.32.38/drivers/ata/pata_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
6920 |
-+++ linux-2.6.32.38/drivers/ata/pata_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
6921 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_acpi.c linux-2.6.32.39/drivers/ata/pata_acpi.c |
6922 |
+--- linux-2.6.32.39/drivers/ata/pata_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
6923 |
++++ linux-2.6.32.39/drivers/ata/pata_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
6924 |
@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s |
6925 |
ATA_BMDMA_SHT(DRV_NAME), |
6926 |
}; |
6927 |
@@ -22368,9 +22098,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_acpi.c linux-2.6.32.38/drivers/ata/p |
6928 |
.inherits = &ata_bmdma_port_ops, |
6929 |
.qc_issue = pacpi_qc_issue, |
6930 |
.cable_detect = pacpi_cable_detect, |
6931 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_ali.c linux-2.6.32.38/drivers/ata/pata_ali.c |
6932 |
---- linux-2.6.32.38/drivers/ata/pata_ali.c 2011-03-27 14:31:47.000000000 -0400 |
6933 |
-+++ linux-2.6.32.38/drivers/ata/pata_ali.c 2011-04-17 15:56:46.000000000 -0400 |
6934 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_ali.c linux-2.6.32.39/drivers/ata/pata_ali.c |
6935 |
+--- linux-2.6.32.39/drivers/ata/pata_ali.c 2011-03-27 14:31:47.000000000 -0400 |
6936 |
++++ linux-2.6.32.39/drivers/ata/pata_ali.c 2011-04-17 15:56:46.000000000 -0400 |
6937 |
@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht |
6938 |
* Port operations for PIO only ALi |
6939 |
*/ |
6940 |
@@ -22416,9 +22146,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ali.c linux-2.6.32.38/drivers/ata/pa |
6941 |
.inherits = &ali_dma_base_ops, |
6942 |
.check_atapi_dma = ali_check_atapi_dma, |
6943 |
.dev_config = ali_warn_atapi_dma, |
6944 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_amd.c linux-2.6.32.38/drivers/ata/pata_amd.c |
6945 |
---- linux-2.6.32.38/drivers/ata/pata_amd.c 2011-03-27 14:31:47.000000000 -0400 |
6946 |
-+++ linux-2.6.32.38/drivers/ata/pata_amd.c 2011-04-17 15:56:46.000000000 -0400 |
6947 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_amd.c linux-2.6.32.39/drivers/ata/pata_amd.c |
6948 |
+--- linux-2.6.32.39/drivers/ata/pata_amd.c 2011-03-27 14:31:47.000000000 -0400 |
6949 |
++++ linux-2.6.32.39/drivers/ata/pata_amd.c 2011-04-17 15:56:46.000000000 -0400 |
6950 |
@@ -397,28 +397,28 @@ static const struct ata_port_operations |
6951 |
.prereset = amd_pre_reset, |
6952 |
}; |
6953 |
@@ -22468,9 +22198,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_amd.c linux-2.6.32.38/drivers/ata/pa |
6954 |
.inherits = &nv_base_port_ops, |
6955 |
.set_piomode = nv133_set_piomode, |
6956 |
.set_dmamode = nv133_set_dmamode, |
6957 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_artop.c linux-2.6.32.38/drivers/ata/pata_artop.c |
6958 |
---- linux-2.6.32.38/drivers/ata/pata_artop.c 2011-03-27 14:31:47.000000000 -0400 |
6959 |
-+++ linux-2.6.32.38/drivers/ata/pata_artop.c 2011-04-17 15:56:46.000000000 -0400 |
6960 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_artop.c linux-2.6.32.39/drivers/ata/pata_artop.c |
6961 |
+--- linux-2.6.32.39/drivers/ata/pata_artop.c 2011-03-27 14:31:47.000000000 -0400 |
6962 |
++++ linux-2.6.32.39/drivers/ata/pata_artop.c 2011-04-17 15:56:46.000000000 -0400 |
6963 |
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s |
6964 |
ATA_BMDMA_SHT(DRV_NAME), |
6965 |
}; |
6966 |
@@ -22489,9 +22219,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_artop.c linux-2.6.32.38/drivers/ata/ |
6967 |
.inherits = &ata_bmdma_port_ops, |
6968 |
.cable_detect = artop6260_cable_detect, |
6969 |
.set_piomode = artop6260_set_piomode, |
6970 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_at32.c linux-2.6.32.38/drivers/ata/pata_at32.c |
6971 |
---- linux-2.6.32.38/drivers/ata/pata_at32.c 2011-03-27 14:31:47.000000000 -0400 |
6972 |
-+++ linux-2.6.32.38/drivers/ata/pata_at32.c 2011-04-17 15:56:46.000000000 -0400 |
6973 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_at32.c linux-2.6.32.39/drivers/ata/pata_at32.c |
6974 |
+--- linux-2.6.32.39/drivers/ata/pata_at32.c 2011-03-27 14:31:47.000000000 -0400 |
6975 |
++++ linux-2.6.32.39/drivers/ata/pata_at32.c 2011-04-17 15:56:46.000000000 -0400 |
6976 |
@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh |
6977 |
ATA_PIO_SHT(DRV_NAME), |
6978 |
}; |
6979 |
@@ -22501,9 +22231,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_at32.c linux-2.6.32.38/drivers/ata/p |
6980 |
.inherits = &ata_sff_port_ops, |
6981 |
.cable_detect = ata_cable_40wire, |
6982 |
.set_piomode = pata_at32_set_piomode, |
6983 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_at91.c linux-2.6.32.38/drivers/ata/pata_at91.c |
6984 |
---- linux-2.6.32.38/drivers/ata/pata_at91.c 2011-03-27 14:31:47.000000000 -0400 |
6985 |
-+++ linux-2.6.32.38/drivers/ata/pata_at91.c 2011-04-17 15:56:46.000000000 -0400 |
6986 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_at91.c linux-2.6.32.39/drivers/ata/pata_at91.c |
6987 |
+--- linux-2.6.32.39/drivers/ata/pata_at91.c 2011-03-27 14:31:47.000000000 -0400 |
6988 |
++++ linux-2.6.32.39/drivers/ata/pata_at91.c 2011-04-17 15:56:46.000000000 -0400 |
6989 |
@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at |
6990 |
ATA_PIO_SHT(DRV_NAME), |
6991 |
}; |
6992 |
@@ -22513,9 +22243,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_at91.c linux-2.6.32.38/drivers/ata/p |
6993 |
.inherits = &ata_sff_port_ops, |
6994 |
|
6995 |
.sff_data_xfer = pata_at91_data_xfer_noirq, |
6996 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_atiixp.c linux-2.6.32.38/drivers/ata/pata_atiixp.c |
6997 |
---- linux-2.6.32.38/drivers/ata/pata_atiixp.c 2011-03-27 14:31:47.000000000 -0400 |
6998 |
-+++ linux-2.6.32.38/drivers/ata/pata_atiixp.c 2011-04-17 15:56:46.000000000 -0400 |
6999 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_atiixp.c linux-2.6.32.39/drivers/ata/pata_atiixp.c |
7000 |
+--- linux-2.6.32.39/drivers/ata/pata_atiixp.c 2011-03-27 14:31:47.000000000 -0400 |
7001 |
++++ linux-2.6.32.39/drivers/ata/pata_atiixp.c 2011-04-17 15:56:46.000000000 -0400 |
7002 |
@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ |
7003 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
7004 |
}; |
7005 |
@@ -22525,9 +22255,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_atiixp.c linux-2.6.32.38/drivers/ata |
7006 |
.inherits = &ata_bmdma_port_ops, |
7007 |
|
7008 |
.qc_prep = ata_sff_dumb_qc_prep, |
7009 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_atp867x.c linux-2.6.32.38/drivers/ata/pata_atp867x.c |
7010 |
---- linux-2.6.32.38/drivers/ata/pata_atp867x.c 2011-03-27 14:31:47.000000000 -0400 |
7011 |
-+++ linux-2.6.32.38/drivers/ata/pata_atp867x.c 2011-04-17 15:56:46.000000000 -0400 |
7012 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_atp867x.c linux-2.6.32.39/drivers/ata/pata_atp867x.c |
7013 |
+--- linux-2.6.32.39/drivers/ata/pata_atp867x.c 2011-03-27 14:31:47.000000000 -0400 |
7014 |
++++ linux-2.6.32.39/drivers/ata/pata_atp867x.c 2011-04-17 15:56:46.000000000 -0400 |
7015 |
@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x |
7016 |
ATA_BMDMA_SHT(DRV_NAME), |
7017 |
}; |
7018 |
@@ -22537,9 +22267,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_atp867x.c linux-2.6.32.38/drivers/at |
7019 |
.inherits = &ata_bmdma_port_ops, |
7020 |
.cable_detect = atp867x_cable_detect, |
7021 |
.set_piomode = atp867x_set_piomode, |
7022 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_bf54x.c linux-2.6.32.38/drivers/ata/pata_bf54x.c |
7023 |
---- linux-2.6.32.38/drivers/ata/pata_bf54x.c 2011-03-27 14:31:47.000000000 -0400 |
7024 |
-+++ linux-2.6.32.38/drivers/ata/pata_bf54x.c 2011-04-17 15:56:46.000000000 -0400 |
7025 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_bf54x.c linux-2.6.32.39/drivers/ata/pata_bf54x.c |
7026 |
+--- linux-2.6.32.39/drivers/ata/pata_bf54x.c 2011-03-27 14:31:47.000000000 -0400 |
7027 |
++++ linux-2.6.32.39/drivers/ata/pata_bf54x.c 2011-04-17 15:56:46.000000000 -0400 |
7028 |
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh |
7029 |
.dma_boundary = ATA_DMA_BOUNDARY, |
7030 |
}; |
7031 |
@@ -22549,9 +22279,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_bf54x.c linux-2.6.32.38/drivers/ata/ |
7032 |
.inherits = &ata_sff_port_ops, |
7033 |
|
7034 |
.set_piomode = bfin_set_piomode, |
7035 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd640.c linux-2.6.32.38/drivers/ata/pata_cmd640.c |
7036 |
---- linux-2.6.32.38/drivers/ata/pata_cmd640.c 2011-03-27 14:31:47.000000000 -0400 |
7037 |
-+++ linux-2.6.32.38/drivers/ata/pata_cmd640.c 2011-04-17 15:56:46.000000000 -0400 |
7038 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd640.c linux-2.6.32.39/drivers/ata/pata_cmd640.c |
7039 |
+--- linux-2.6.32.39/drivers/ata/pata_cmd640.c 2011-03-27 14:31:47.000000000 -0400 |
7040 |
++++ linux-2.6.32.39/drivers/ata/pata_cmd640.c 2011-04-17 15:56:46.000000000 -0400 |
7041 |
@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ |
7042 |
ATA_BMDMA_SHT(DRV_NAME), |
7043 |
}; |
7044 |
@@ -22561,9 +22291,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd640.c linux-2.6.32.38/drivers/ata |
7045 |
.inherits = &ata_bmdma_port_ops, |
7046 |
/* In theory xfer_noirq is not needed once we kill the prefetcher */ |
7047 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
7048 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd64x.c linux-2.6.32.38/drivers/ata/pata_cmd64x.c |
7049 |
---- linux-2.6.32.38/drivers/ata/pata_cmd64x.c 2011-03-27 14:31:47.000000000 -0400 |
7050 |
-+++ linux-2.6.32.38/drivers/ata/pata_cmd64x.c 2011-04-17 15:56:46.000000000 -0400 |
7051 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd64x.c linux-2.6.32.39/drivers/ata/pata_cmd64x.c |
7052 |
+--- linux-2.6.32.39/drivers/ata/pata_cmd64x.c 2011-03-27 14:31:47.000000000 -0400 |
7053 |
++++ linux-2.6.32.39/drivers/ata/pata_cmd64x.c 2011-04-17 15:56:46.000000000 -0400 |
7054 |
@@ -275,18 +275,18 @@ static const struct ata_port_operations |
7055 |
.set_dmamode = cmd64x_set_dmamode, |
7056 |
}; |
7057 |
@@ -22586,9 +22316,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cmd64x.c linux-2.6.32.38/drivers/ata |
7058 |
.inherits = &cmd64x_base_ops, |
7059 |
.bmdma_stop = cmd648_bmdma_stop, |
7060 |
.cable_detect = cmd648_cable_detect, |
7061 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5520.c linux-2.6.32.38/drivers/ata/pata_cs5520.c |
7062 |
---- linux-2.6.32.38/drivers/ata/pata_cs5520.c 2011-03-27 14:31:47.000000000 -0400 |
7063 |
-+++ linux-2.6.32.38/drivers/ata/pata_cs5520.c 2011-04-17 15:56:46.000000000 -0400 |
7064 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5520.c linux-2.6.32.39/drivers/ata/pata_cs5520.c |
7065 |
+--- linux-2.6.32.39/drivers/ata/pata_cs5520.c 2011-03-27 14:31:47.000000000 -0400 |
7066 |
++++ linux-2.6.32.39/drivers/ata/pata_cs5520.c 2011-04-17 15:56:46.000000000 -0400 |
7067 |
@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ |
7068 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
7069 |
}; |
7070 |
@@ -22598,9 +22328,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5520.c linux-2.6.32.38/drivers/ata |
7071 |
.inherits = &ata_bmdma_port_ops, |
7072 |
.qc_prep = ata_sff_dumb_qc_prep, |
7073 |
.cable_detect = ata_cable_40wire, |
7074 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5530.c linux-2.6.32.38/drivers/ata/pata_cs5530.c |
7075 |
---- linux-2.6.32.38/drivers/ata/pata_cs5530.c 2011-03-27 14:31:47.000000000 -0400 |
7076 |
-+++ linux-2.6.32.38/drivers/ata/pata_cs5530.c 2011-04-17 15:56:46.000000000 -0400 |
7077 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5530.c linux-2.6.32.39/drivers/ata/pata_cs5530.c |
7078 |
+--- linux-2.6.32.39/drivers/ata/pata_cs5530.c 2011-03-27 14:31:47.000000000 -0400 |
7079 |
++++ linux-2.6.32.39/drivers/ata/pata_cs5530.c 2011-04-17 15:56:46.000000000 -0400 |
7080 |
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ |
7081 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
7082 |
}; |
7083 |
@@ -22610,9 +22340,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5530.c linux-2.6.32.38/drivers/ata |
7084 |
.inherits = &ata_bmdma_port_ops, |
7085 |
|
7086 |
.qc_prep = ata_sff_dumb_qc_prep, |
7087 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5535.c linux-2.6.32.38/drivers/ata/pata_cs5535.c |
7088 |
---- linux-2.6.32.38/drivers/ata/pata_cs5535.c 2011-03-27 14:31:47.000000000 -0400 |
7089 |
-+++ linux-2.6.32.38/drivers/ata/pata_cs5535.c 2011-04-17 15:56:46.000000000 -0400 |
7090 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5535.c linux-2.6.32.39/drivers/ata/pata_cs5535.c |
7091 |
+--- linux-2.6.32.39/drivers/ata/pata_cs5535.c 2011-03-27 14:31:47.000000000 -0400 |
7092 |
++++ linux-2.6.32.39/drivers/ata/pata_cs5535.c 2011-04-17 15:56:46.000000000 -0400 |
7093 |
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ |
7094 |
ATA_BMDMA_SHT(DRV_NAME), |
7095 |
}; |
7096 |
@@ -22622,9 +22352,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5535.c linux-2.6.32.38/drivers/ata |
7097 |
.inherits = &ata_bmdma_port_ops, |
7098 |
.cable_detect = cs5535_cable_detect, |
7099 |
.set_piomode = cs5535_set_piomode, |
7100 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5536.c linux-2.6.32.38/drivers/ata/pata_cs5536.c |
7101 |
---- linux-2.6.32.38/drivers/ata/pata_cs5536.c 2011-03-27 14:31:47.000000000 -0400 |
7102 |
-+++ linux-2.6.32.38/drivers/ata/pata_cs5536.c 2011-04-17 15:56:46.000000000 -0400 |
7103 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5536.c linux-2.6.32.39/drivers/ata/pata_cs5536.c |
7104 |
+--- linux-2.6.32.39/drivers/ata/pata_cs5536.c 2011-03-27 14:31:47.000000000 -0400 |
7105 |
++++ linux-2.6.32.39/drivers/ata/pata_cs5536.c 2011-04-17 15:56:46.000000000 -0400 |
7106 |
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ |
7107 |
ATA_BMDMA_SHT(DRV_NAME), |
7108 |
}; |
7109 |
@@ -22634,9 +22364,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cs5536.c linux-2.6.32.38/drivers/ata |
7110 |
.inherits = &ata_bmdma_port_ops, |
7111 |
.cable_detect = cs5536_cable_detect, |
7112 |
.set_piomode = cs5536_set_piomode, |
7113 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_cypress.c linux-2.6.32.38/drivers/ata/pata_cypress.c |
7114 |
---- linux-2.6.32.38/drivers/ata/pata_cypress.c 2011-03-27 14:31:47.000000000 -0400 |
7115 |
-+++ linux-2.6.32.38/drivers/ata/pata_cypress.c 2011-04-17 15:56:46.000000000 -0400 |
7116 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_cypress.c linux-2.6.32.39/drivers/ata/pata_cypress.c |
7117 |
+--- linux-2.6.32.39/drivers/ata/pata_cypress.c 2011-03-27 14:31:47.000000000 -0400 |
7118 |
++++ linux-2.6.32.39/drivers/ata/pata_cypress.c 2011-04-17 15:56:46.000000000 -0400 |
7119 |
@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 |
7120 |
ATA_BMDMA_SHT(DRV_NAME), |
7121 |
}; |
7122 |
@@ -22646,9 +22376,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_cypress.c linux-2.6.32.38/drivers/at |
7123 |
.inherits = &ata_bmdma_port_ops, |
7124 |
.cable_detect = ata_cable_40wire, |
7125 |
.set_piomode = cy82c693_set_piomode, |
7126 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_efar.c linux-2.6.32.38/drivers/ata/pata_efar.c |
7127 |
---- linux-2.6.32.38/drivers/ata/pata_efar.c 2011-03-27 14:31:47.000000000 -0400 |
7128 |
-+++ linux-2.6.32.38/drivers/ata/pata_efar.c 2011-04-17 15:56:46.000000000 -0400 |
7129 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_efar.c linux-2.6.32.39/drivers/ata/pata_efar.c |
7130 |
+--- linux-2.6.32.39/drivers/ata/pata_efar.c 2011-03-27 14:31:47.000000000 -0400 |
7131 |
++++ linux-2.6.32.39/drivers/ata/pata_efar.c 2011-04-17 15:56:46.000000000 -0400 |
7132 |
@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh |
7133 |
ATA_BMDMA_SHT(DRV_NAME), |
7134 |
}; |
7135 |
@@ -22658,9 +22388,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_efar.c linux-2.6.32.38/drivers/ata/p |
7136 |
.inherits = &ata_bmdma_port_ops, |
7137 |
.cable_detect = efar_cable_detect, |
7138 |
.set_piomode = efar_set_piomode, |
7139 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt366.c linux-2.6.32.38/drivers/ata/pata_hpt366.c |
7140 |
---- linux-2.6.32.38/drivers/ata/pata_hpt366.c 2011-03-27 14:31:47.000000000 -0400 |
7141 |
-+++ linux-2.6.32.38/drivers/ata/pata_hpt366.c 2011-04-17 15:56:46.000000000 -0400 |
7142 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt366.c linux-2.6.32.39/drivers/ata/pata_hpt366.c |
7143 |
+--- linux-2.6.32.39/drivers/ata/pata_hpt366.c 2011-03-27 14:31:47.000000000 -0400 |
7144 |
++++ linux-2.6.32.39/drivers/ata/pata_hpt366.c 2011-04-17 15:56:46.000000000 -0400 |
7145 |
@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ |
7146 |
* Configuration for HPT366/68 |
7147 |
*/ |
7148 |
@@ -22670,9 +22400,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt366.c linux-2.6.32.38/drivers/ata |
7149 |
.inherits = &ata_bmdma_port_ops, |
7150 |
.cable_detect = hpt36x_cable_detect, |
7151 |
.mode_filter = hpt366_filter, |
7152 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt37x.c linux-2.6.32.38/drivers/ata/pata_hpt37x.c |
7153 |
---- linux-2.6.32.38/drivers/ata/pata_hpt37x.c 2011-03-27 14:31:47.000000000 -0400 |
7154 |
-+++ linux-2.6.32.38/drivers/ata/pata_hpt37x.c 2011-04-17 15:56:46.000000000 -0400 |
7155 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt37x.c linux-2.6.32.39/drivers/ata/pata_hpt37x.c |
7156 |
+--- linux-2.6.32.39/drivers/ata/pata_hpt37x.c 2011-03-27 14:31:47.000000000 -0400 |
7157 |
++++ linux-2.6.32.39/drivers/ata/pata_hpt37x.c 2011-04-17 15:56:46.000000000 -0400 |
7158 |
@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ |
7159 |
* Configuration for HPT370 |
7160 |
*/ |
7161 |
@@ -22709,9 +22439,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt37x.c linux-2.6.32.38/drivers/ata |
7162 |
.inherits = &hpt372_port_ops, |
7163 |
.prereset = hpt374_fn1_pre_reset, |
7164 |
}; |
7165 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c |
7166 |
---- linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c 2011-03-27 14:31:47.000000000 -0400 |
7167 |
-+++ linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:56:46.000000000 -0400 |
7168 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c |
7169 |
+--- linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c 2011-03-27 14:31:47.000000000 -0400 |
7170 |
++++ linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:56:46.000000000 -0400 |
7171 |
@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n |
7172 |
* Configuration for HPT3x2n. |
7173 |
*/ |
7174 |
@@ -22721,9 +22451,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x2n.c linux-2.6.32.38/drivers/at |
7175 |
.inherits = &ata_bmdma_port_ops, |
7176 |
|
7177 |
.bmdma_stop = hpt3x2n_bmdma_stop, |
7178 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x3.c linux-2.6.32.38/drivers/ata/pata_hpt3x3.c |
7179 |
---- linux-2.6.32.38/drivers/ata/pata_hpt3x3.c 2011-03-27 14:31:47.000000000 -0400 |
7180 |
-+++ linux-2.6.32.38/drivers/ata/pata_hpt3x3.c 2011-04-17 15:56:46.000000000 -0400 |
7181 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x3.c linux-2.6.32.39/drivers/ata/pata_hpt3x3.c |
7182 |
+--- linux-2.6.32.39/drivers/ata/pata_hpt3x3.c 2011-03-27 14:31:47.000000000 -0400 |
7183 |
++++ linux-2.6.32.39/drivers/ata/pata_hpt3x3.c 2011-04-17 15:56:46.000000000 -0400 |
7184 |
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ |
7185 |
ATA_BMDMA_SHT(DRV_NAME), |
7186 |
}; |
7187 |
@@ -22733,9 +22463,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_hpt3x3.c linux-2.6.32.38/drivers/ata |
7188 |
.inherits = &ata_bmdma_port_ops, |
7189 |
.cable_detect = ata_cable_40wire, |
7190 |
.set_piomode = hpt3x3_set_piomode, |
7191 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_icside.c linux-2.6.32.38/drivers/ata/pata_icside.c |
7192 |
---- linux-2.6.32.38/drivers/ata/pata_icside.c 2011-03-27 14:31:47.000000000 -0400 |
7193 |
-+++ linux-2.6.32.38/drivers/ata/pata_icside.c 2011-04-17 15:56:46.000000000 -0400 |
7194 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_icside.c linux-2.6.32.39/drivers/ata/pata_icside.c |
7195 |
+--- linux-2.6.32.39/drivers/ata/pata_icside.c 2011-03-27 14:31:47.000000000 -0400 |
7196 |
++++ linux-2.6.32.39/drivers/ata/pata_icside.c 2011-04-17 15:56:46.000000000 -0400 |
7197 |
@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct |
7198 |
} |
7199 |
} |
7200 |
@@ -22745,9 +22475,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_icside.c linux-2.6.32.38/drivers/ata |
7201 |
.inherits = &ata_sff_port_ops, |
7202 |
/* no need to build any PRD tables for DMA */ |
7203 |
.qc_prep = ata_noop_qc_prep, |
7204 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_isapnp.c linux-2.6.32.38/drivers/ata/pata_isapnp.c |
7205 |
---- linux-2.6.32.38/drivers/ata/pata_isapnp.c 2011-03-27 14:31:47.000000000 -0400 |
7206 |
-+++ linux-2.6.32.38/drivers/ata/pata_isapnp.c 2011-04-17 15:56:46.000000000 -0400 |
7207 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_isapnp.c linux-2.6.32.39/drivers/ata/pata_isapnp.c |
7208 |
+--- linux-2.6.32.39/drivers/ata/pata_isapnp.c 2011-03-27 14:31:47.000000000 -0400 |
7209 |
++++ linux-2.6.32.39/drivers/ata/pata_isapnp.c 2011-04-17 15:56:46.000000000 -0400 |
7210 |
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ |
7211 |
ATA_PIO_SHT(DRV_NAME), |
7212 |
}; |
7213 |
@@ -22763,9 +22493,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_isapnp.c linux-2.6.32.38/drivers/ata |
7214 |
.inherits = &ata_sff_port_ops, |
7215 |
.cable_detect = ata_cable_40wire, |
7216 |
/* No altstatus so we don't want to use the lost interrupt poll */ |
7217 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_it8213.c linux-2.6.32.38/drivers/ata/pata_it8213.c |
7218 |
---- linux-2.6.32.38/drivers/ata/pata_it8213.c 2011-03-27 14:31:47.000000000 -0400 |
7219 |
-+++ linux-2.6.32.38/drivers/ata/pata_it8213.c 2011-04-17 15:56:46.000000000 -0400 |
7220 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_it8213.c linux-2.6.32.39/drivers/ata/pata_it8213.c |
7221 |
+--- linux-2.6.32.39/drivers/ata/pata_it8213.c 2011-03-27 14:31:47.000000000 -0400 |
7222 |
++++ linux-2.6.32.39/drivers/ata/pata_it8213.c 2011-04-17 15:56:46.000000000 -0400 |
7223 |
@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ |
7224 |
}; |
7225 |
|
7226 |
@@ -22775,9 +22505,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_it8213.c linux-2.6.32.38/drivers/ata |
7227 |
.inherits = &ata_bmdma_port_ops, |
7228 |
.cable_detect = it8213_cable_detect, |
7229 |
.set_piomode = it8213_set_piomode, |
7230 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_it821x.c linux-2.6.32.38/drivers/ata/pata_it821x.c |
7231 |
---- linux-2.6.32.38/drivers/ata/pata_it821x.c 2011-03-27 14:31:47.000000000 -0400 |
7232 |
-+++ linux-2.6.32.38/drivers/ata/pata_it821x.c 2011-04-17 15:56:46.000000000 -0400 |
7233 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_it821x.c linux-2.6.32.39/drivers/ata/pata_it821x.c |
7234 |
+--- linux-2.6.32.39/drivers/ata/pata_it821x.c 2011-03-27 14:31:47.000000000 -0400 |
7235 |
++++ linux-2.6.32.39/drivers/ata/pata_it821x.c 2011-04-17 15:56:46.000000000 -0400 |
7236 |
@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ |
7237 |
ATA_BMDMA_SHT(DRV_NAME), |
7238 |
}; |
7239 |
@@ -22805,9 +22535,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_it821x.c linux-2.6.32.38/drivers/ata |
7240 |
.inherits = &ata_bmdma_port_ops, |
7241 |
|
7242 |
.check_atapi_dma= it821x_check_atapi_dma, |
7243 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c |
7244 |
---- linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c 2011-03-27 14:31:47.000000000 -0400 |
7245 |
-+++ linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:56:46.000000000 -0400 |
7246 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c |
7247 |
+--- linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c 2011-03-27 14:31:47.000000000 -0400 |
7248 |
++++ linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:56:46.000000000 -0400 |
7249 |
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ |
7250 |
ATA_PIO_SHT(DRV_NAME), |
7251 |
}; |
7252 |
@@ -22817,9 +22547,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.38/drivers/ |
7253 |
.inherits = &ata_sff_port_ops, |
7254 |
.sff_data_xfer = ixp4xx_mmio_data_xfer, |
7255 |
.cable_detect = ata_cable_40wire, |
7256 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_jmicron.c linux-2.6.32.38/drivers/ata/pata_jmicron.c |
7257 |
---- linux-2.6.32.38/drivers/ata/pata_jmicron.c 2011-03-27 14:31:47.000000000 -0400 |
7258 |
-+++ linux-2.6.32.38/drivers/ata/pata_jmicron.c 2011-04-17 15:56:46.000000000 -0400 |
7259 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_jmicron.c linux-2.6.32.39/drivers/ata/pata_jmicron.c |
7260 |
+--- linux-2.6.32.39/drivers/ata/pata_jmicron.c 2011-03-27 14:31:47.000000000 -0400 |
7261 |
++++ linux-2.6.32.39/drivers/ata/pata_jmicron.c 2011-04-17 15:56:46.000000000 -0400 |
7262 |
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron |
7263 |
ATA_BMDMA_SHT(DRV_NAME), |
7264 |
}; |
7265 |
@@ -22829,9 +22559,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_jmicron.c linux-2.6.32.38/drivers/at |
7266 |
.inherits = &ata_bmdma_port_ops, |
7267 |
.prereset = jmicron_pre_reset, |
7268 |
}; |
7269 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_legacy.c linux-2.6.32.38/drivers/ata/pata_legacy.c |
7270 |
---- linux-2.6.32.38/drivers/ata/pata_legacy.c 2011-03-27 14:31:47.000000000 -0400 |
7271 |
-+++ linux-2.6.32.38/drivers/ata/pata_legacy.c 2011-04-17 15:56:46.000000000 -0400 |
7272 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_legacy.c linux-2.6.32.39/drivers/ata/pata_legacy.c |
7273 |
+--- linux-2.6.32.39/drivers/ata/pata_legacy.c 2011-03-27 14:31:47.000000000 -0400 |
7274 |
++++ linux-2.6.32.39/drivers/ata/pata_legacy.c 2011-04-17 15:56:46.000000000 -0400 |
7275 |
@@ -106,7 +106,7 @@ struct legacy_probe { |
7276 |
|
7277 |
struct legacy_controller { |
7278 |
@@ -22943,9 +22673,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_legacy.c linux-2.6.32.38/drivers/ata |
7279 |
struct legacy_data *ld = &legacy_data[probe->slot]; |
7280 |
struct ata_host *host = NULL; |
7281 |
struct ata_port *ap; |
7282 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_marvell.c linux-2.6.32.38/drivers/ata/pata_marvell.c |
7283 |
---- linux-2.6.32.38/drivers/ata/pata_marvell.c 2011-03-27 14:31:47.000000000 -0400 |
7284 |
-+++ linux-2.6.32.38/drivers/ata/pata_marvell.c 2011-04-17 15:56:46.000000000 -0400 |
7285 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_marvell.c linux-2.6.32.39/drivers/ata/pata_marvell.c |
7286 |
+--- linux-2.6.32.39/drivers/ata/pata_marvell.c 2011-03-27 14:31:47.000000000 -0400 |
7287 |
++++ linux-2.6.32.39/drivers/ata/pata_marvell.c 2011-04-17 15:56:46.000000000 -0400 |
7288 |
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell |
7289 |
ATA_BMDMA_SHT(DRV_NAME), |
7290 |
}; |
7291 |
@@ -22955,9 +22685,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_marvell.c linux-2.6.32.38/drivers/at |
7292 |
.inherits = &ata_bmdma_port_ops, |
7293 |
.cable_detect = marvell_cable_detect, |
7294 |
.prereset = marvell_pre_reset, |
7295 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_mpc52xx.c linux-2.6.32.38/drivers/ata/pata_mpc52xx.c |
7296 |
---- linux-2.6.32.38/drivers/ata/pata_mpc52xx.c 2011-03-27 14:31:47.000000000 -0400 |
7297 |
-+++ linux-2.6.32.38/drivers/ata/pata_mpc52xx.c 2011-04-17 15:56:46.000000000 -0400 |
7298 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_mpc52xx.c linux-2.6.32.39/drivers/ata/pata_mpc52xx.c |
7299 |
+--- linux-2.6.32.39/drivers/ata/pata_mpc52xx.c 2011-03-27 14:31:47.000000000 -0400 |
7300 |
++++ linux-2.6.32.39/drivers/ata/pata_mpc52xx.c 2011-04-17 15:56:46.000000000 -0400 |
7301 |
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx |
7302 |
ATA_PIO_SHT(DRV_NAME), |
7303 |
}; |
7304 |
@@ -22967,9 +22697,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_mpc52xx.c linux-2.6.32.38/drivers/at |
7305 |
.inherits = &ata_bmdma_port_ops, |
7306 |
.sff_dev_select = mpc52xx_ata_dev_select, |
7307 |
.set_piomode = mpc52xx_ata_set_piomode, |
7308 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_mpiix.c linux-2.6.32.38/drivers/ata/pata_mpiix.c |
7309 |
---- linux-2.6.32.38/drivers/ata/pata_mpiix.c 2011-03-27 14:31:47.000000000 -0400 |
7310 |
-+++ linux-2.6.32.38/drivers/ata/pata_mpiix.c 2011-04-17 15:56:46.000000000 -0400 |
7311 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_mpiix.c linux-2.6.32.39/drivers/ata/pata_mpiix.c |
7312 |
+--- linux-2.6.32.39/drivers/ata/pata_mpiix.c 2011-03-27 14:31:47.000000000 -0400 |
7313 |
++++ linux-2.6.32.39/drivers/ata/pata_mpiix.c 2011-04-17 15:56:46.000000000 -0400 |
7314 |
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s |
7315 |
ATA_PIO_SHT(DRV_NAME), |
7316 |
}; |
7317 |
@@ -22979,9 +22709,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_mpiix.c linux-2.6.32.38/drivers/ata/ |
7318 |
.inherits = &ata_sff_port_ops, |
7319 |
.qc_issue = mpiix_qc_issue, |
7320 |
.cable_detect = ata_cable_40wire, |
7321 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_netcell.c linux-2.6.32.38/drivers/ata/pata_netcell.c |
7322 |
---- linux-2.6.32.38/drivers/ata/pata_netcell.c 2011-03-27 14:31:47.000000000 -0400 |
7323 |
-+++ linux-2.6.32.38/drivers/ata/pata_netcell.c 2011-04-17 15:56:46.000000000 -0400 |
7324 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_netcell.c linux-2.6.32.39/drivers/ata/pata_netcell.c |
7325 |
+--- linux-2.6.32.39/drivers/ata/pata_netcell.c 2011-03-27 14:31:47.000000000 -0400 |
7326 |
++++ linux-2.6.32.39/drivers/ata/pata_netcell.c 2011-04-17 15:56:46.000000000 -0400 |
7327 |
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell |
7328 |
ATA_BMDMA_SHT(DRV_NAME), |
7329 |
}; |
7330 |
@@ -22991,9 +22721,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_netcell.c linux-2.6.32.38/drivers/at |
7331 |
.inherits = &ata_bmdma_port_ops, |
7332 |
.cable_detect = ata_cable_80wire, |
7333 |
.read_id = netcell_read_id, |
7334 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_ninja32.c linux-2.6.32.38/drivers/ata/pata_ninja32.c |
7335 |
---- linux-2.6.32.38/drivers/ata/pata_ninja32.c 2011-03-27 14:31:47.000000000 -0400 |
7336 |
-+++ linux-2.6.32.38/drivers/ata/pata_ninja32.c 2011-04-17 15:56:46.000000000 -0400 |
7337 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_ninja32.c linux-2.6.32.39/drivers/ata/pata_ninja32.c |
7338 |
+--- linux-2.6.32.39/drivers/ata/pata_ninja32.c 2011-03-27 14:31:47.000000000 -0400 |
7339 |
++++ linux-2.6.32.39/drivers/ata/pata_ninja32.c 2011-04-17 15:56:46.000000000 -0400 |
7340 |
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 |
7341 |
ATA_BMDMA_SHT(DRV_NAME), |
7342 |
}; |
7343 |
@@ -23003,9 +22733,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ninja32.c linux-2.6.32.38/drivers/at |
7344 |
.inherits = &ata_bmdma_port_ops, |
7345 |
.sff_dev_select = ninja32_dev_select, |
7346 |
.cable_detect = ata_cable_40wire, |
7347 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_ns87410.c linux-2.6.32.38/drivers/ata/pata_ns87410.c |
7348 |
---- linux-2.6.32.38/drivers/ata/pata_ns87410.c 2011-03-27 14:31:47.000000000 -0400 |
7349 |
-+++ linux-2.6.32.38/drivers/ata/pata_ns87410.c 2011-04-17 15:56:46.000000000 -0400 |
7350 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87410.c linux-2.6.32.39/drivers/ata/pata_ns87410.c |
7351 |
+--- linux-2.6.32.39/drivers/ata/pata_ns87410.c 2011-03-27 14:31:47.000000000 -0400 |
7352 |
++++ linux-2.6.32.39/drivers/ata/pata_ns87410.c 2011-04-17 15:56:46.000000000 -0400 |
7353 |
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 |
7354 |
ATA_PIO_SHT(DRV_NAME), |
7355 |
}; |
7356 |
@@ -23015,9 +22745,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ns87410.c linux-2.6.32.38/drivers/at |
7357 |
.inherits = &ata_sff_port_ops, |
7358 |
.qc_issue = ns87410_qc_issue, |
7359 |
.cable_detect = ata_cable_40wire, |
7360 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_ns87415.c linux-2.6.32.38/drivers/ata/pata_ns87415.c |
7361 |
---- linux-2.6.32.38/drivers/ata/pata_ns87415.c 2011-03-27 14:31:47.000000000 -0400 |
7362 |
-+++ linux-2.6.32.38/drivers/ata/pata_ns87415.c 2011-04-17 15:56:46.000000000 -0400 |
7363 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87415.c linux-2.6.32.39/drivers/ata/pata_ns87415.c |
7364 |
+--- linux-2.6.32.39/drivers/ata/pata_ns87415.c 2011-03-27 14:31:47.000000000 -0400 |
7365 |
++++ linux-2.6.32.39/drivers/ata/pata_ns87415.c 2011-04-17 15:56:46.000000000 -0400 |
7366 |
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at |
7367 |
} |
7368 |
#endif /* 87560 SuperIO Support */ |
7369 |
@@ -23036,9 +22766,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_ns87415.c linux-2.6.32.38/drivers/at |
7370 |
.inherits = &ns87415_pata_ops, |
7371 |
.sff_tf_read = ns87560_tf_read, |
7372 |
.sff_check_status = ns87560_check_status, |
7373 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_octeon_cf.c linux-2.6.32.38/drivers/ata/pata_octeon_cf.c |
7374 |
---- linux-2.6.32.38/drivers/ata/pata_octeon_cf.c 2011-03-27 14:31:47.000000000 -0400 |
7375 |
-+++ linux-2.6.32.38/drivers/ata/pata_octeon_cf.c 2011-04-17 15:56:46.000000000 -0400 |
7376 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_octeon_cf.c linux-2.6.32.39/drivers/ata/pata_octeon_cf.c |
7377 |
+--- linux-2.6.32.39/drivers/ata/pata_octeon_cf.c 2011-03-27 14:31:47.000000000 -0400 |
7378 |
++++ linux-2.6.32.39/drivers/ata/pata_octeon_cf.c 2011-04-17 15:56:46.000000000 -0400 |
7379 |
@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s |
7380 |
return 0; |
7381 |
} |
7382 |
@@ -23047,9 +22777,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_octeon_cf.c linux-2.6.32.38/drivers/ |
7383 |
static struct ata_port_operations octeon_cf_ops = { |
7384 |
.inherits = &ata_sff_port_ops, |
7385 |
.check_atapi_dma = octeon_cf_check_atapi_dma, |
7386 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_oldpiix.c linux-2.6.32.38/drivers/ata/pata_oldpiix.c |
7387 |
---- linux-2.6.32.38/drivers/ata/pata_oldpiix.c 2011-03-27 14:31:47.000000000 -0400 |
7388 |
-+++ linux-2.6.32.38/drivers/ata/pata_oldpiix.c 2011-04-17 15:56:46.000000000 -0400 |
7389 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_oldpiix.c linux-2.6.32.39/drivers/ata/pata_oldpiix.c |
7390 |
+--- linux-2.6.32.39/drivers/ata/pata_oldpiix.c 2011-03-27 14:31:47.000000000 -0400 |
7391 |
++++ linux-2.6.32.39/drivers/ata/pata_oldpiix.c 2011-04-17 15:56:46.000000000 -0400 |
7392 |
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix |
7393 |
ATA_BMDMA_SHT(DRV_NAME), |
7394 |
}; |
7395 |
@@ -23059,9 +22789,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_oldpiix.c linux-2.6.32.38/drivers/at |
7396 |
.inherits = &ata_bmdma_port_ops, |
7397 |
.qc_issue = oldpiix_qc_issue, |
7398 |
.cable_detect = ata_cable_40wire, |
7399 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_opti.c linux-2.6.32.38/drivers/ata/pata_opti.c |
7400 |
---- linux-2.6.32.38/drivers/ata/pata_opti.c 2011-03-27 14:31:47.000000000 -0400 |
7401 |
-+++ linux-2.6.32.38/drivers/ata/pata_opti.c 2011-04-17 15:56:46.000000000 -0400 |
7402 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_opti.c linux-2.6.32.39/drivers/ata/pata_opti.c |
7403 |
+--- linux-2.6.32.39/drivers/ata/pata_opti.c 2011-03-27 14:31:47.000000000 -0400 |
7404 |
++++ linux-2.6.32.39/drivers/ata/pata_opti.c 2011-04-17 15:56:46.000000000 -0400 |
7405 |
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh |
7406 |
ATA_PIO_SHT(DRV_NAME), |
7407 |
}; |
7408 |
@@ -23071,9 +22801,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_opti.c linux-2.6.32.38/drivers/ata/p |
7409 |
.inherits = &ata_sff_port_ops, |
7410 |
.cable_detect = ata_cable_40wire, |
7411 |
.set_piomode = opti_set_piomode, |
7412 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_optidma.c linux-2.6.32.38/drivers/ata/pata_optidma.c |
7413 |
---- linux-2.6.32.38/drivers/ata/pata_optidma.c 2011-03-27 14:31:47.000000000 -0400 |
7414 |
-+++ linux-2.6.32.38/drivers/ata/pata_optidma.c 2011-04-17 15:56:46.000000000 -0400 |
7415 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_optidma.c linux-2.6.32.39/drivers/ata/pata_optidma.c |
7416 |
+--- linux-2.6.32.39/drivers/ata/pata_optidma.c 2011-03-27 14:31:47.000000000 -0400 |
7417 |
++++ linux-2.6.32.39/drivers/ata/pata_optidma.c 2011-04-17 15:56:46.000000000 -0400 |
7418 |
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma |
7419 |
ATA_BMDMA_SHT(DRV_NAME), |
7420 |
}; |
7421 |
@@ -23092,9 +22822,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_optidma.c linux-2.6.32.38/drivers/at |
7422 |
.inherits = &optidma_port_ops, |
7423 |
.set_piomode = optiplus_set_pio_mode, |
7424 |
.set_dmamode = optiplus_set_dma_mode, |
7425 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_palmld.c linux-2.6.32.38/drivers/ata/pata_palmld.c |
7426 |
---- linux-2.6.32.38/drivers/ata/pata_palmld.c 2011-03-27 14:31:47.000000000 -0400 |
7427 |
-+++ linux-2.6.32.38/drivers/ata/pata_palmld.c 2011-04-17 15:56:46.000000000 -0400 |
7428 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_palmld.c linux-2.6.32.39/drivers/ata/pata_palmld.c |
7429 |
+--- linux-2.6.32.39/drivers/ata/pata_palmld.c 2011-03-27 14:31:47.000000000 -0400 |
7430 |
++++ linux-2.6.32.39/drivers/ata/pata_palmld.c 2011-04-17 15:56:46.000000000 -0400 |
7431 |
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ |
7432 |
ATA_PIO_SHT(DRV_NAME), |
7433 |
}; |
7434 |
@@ -23104,9 +22834,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_palmld.c linux-2.6.32.38/drivers/ata |
7435 |
.inherits = &ata_sff_port_ops, |
7436 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
7437 |
.cable_detect = ata_cable_40wire, |
7438 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_pcmcia.c linux-2.6.32.38/drivers/ata/pata_pcmcia.c |
7439 |
---- linux-2.6.32.38/drivers/ata/pata_pcmcia.c 2011-03-27 14:31:47.000000000 -0400 |
7440 |
-+++ linux-2.6.32.38/drivers/ata/pata_pcmcia.c 2011-04-17 15:56:46.000000000 -0400 |
7441 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_pcmcia.c linux-2.6.32.39/drivers/ata/pata_pcmcia.c |
7442 |
+--- linux-2.6.32.39/drivers/ata/pata_pcmcia.c 2011-03-27 14:31:47.000000000 -0400 |
7443 |
++++ linux-2.6.32.39/drivers/ata/pata_pcmcia.c 2011-04-17 15:56:46.000000000 -0400 |
7444 |
@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ |
7445 |
ATA_PIO_SHT(DRV_NAME), |
7446 |
}; |
7447 |
@@ -23133,9 +22863,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_pcmcia.c linux-2.6.32.38/drivers/ata |
7448 |
|
7449 |
info = kzalloc(sizeof(*info), GFP_KERNEL); |
7450 |
if (info == NULL) |
7451 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc2027x.c linux-2.6.32.38/drivers/ata/pata_pdc2027x.c |
7452 |
---- linux-2.6.32.38/drivers/ata/pata_pdc2027x.c 2011-03-27 14:31:47.000000000 -0400 |
7453 |
-+++ linux-2.6.32.38/drivers/ata/pata_pdc2027x.c 2011-04-17 15:56:46.000000000 -0400 |
7454 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc2027x.c linux-2.6.32.39/drivers/ata/pata_pdc2027x.c |
7455 |
+--- linux-2.6.32.39/drivers/ata/pata_pdc2027x.c 2011-03-27 14:31:47.000000000 -0400 |
7456 |
++++ linux-2.6.32.39/drivers/ata/pata_pdc2027x.c 2011-04-17 15:56:46.000000000 -0400 |
7457 |
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 |
7458 |
ATA_BMDMA_SHT(DRV_NAME), |
7459 |
}; |
7460 |
@@ -23153,9 +22883,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc2027x.c linux-2.6.32.38/drivers/a |
7461 |
.inherits = &pdc2027x_pata100_ops, |
7462 |
.mode_filter = pdc2027x_mode_filter, |
7463 |
.set_piomode = pdc2027x_set_piomode, |
7464 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c |
7465 |
---- linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c 2011-03-27 14:31:47.000000000 -0400 |
7466 |
-+++ linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:56:46.000000000 -0400 |
7467 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c |
7468 |
+--- linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c 2011-03-27 14:31:47.000000000 -0400 |
7469 |
++++ linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:56:46.000000000 -0400 |
7470 |
@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x |
7471 |
ATA_BMDMA_SHT(DRV_NAME), |
7472 |
}; |
7473 |
@@ -23174,9 +22904,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.38/drive |
7474 |
.inherits = &pdc2024x_port_ops, |
7475 |
|
7476 |
.check_atapi_dma = pdc2026x_check_atapi_dma, |
7477 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_platform.c linux-2.6.32.38/drivers/ata/pata_platform.c |
7478 |
---- linux-2.6.32.38/drivers/ata/pata_platform.c 2011-03-27 14:31:47.000000000 -0400 |
7479 |
-+++ linux-2.6.32.38/drivers/ata/pata_platform.c 2011-04-17 15:56:46.000000000 -0400 |
7480 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_platform.c linux-2.6.32.39/drivers/ata/pata_platform.c |
7481 |
+--- linux-2.6.32.39/drivers/ata/pata_platform.c 2011-03-27 14:31:47.000000000 -0400 |
7482 |
++++ linux-2.6.32.39/drivers/ata/pata_platform.c 2011-04-17 15:56:46.000000000 -0400 |
7483 |
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl |
7484 |
ATA_PIO_SHT(DRV_NAME), |
7485 |
}; |
7486 |
@@ -23186,9 +22916,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_platform.c linux-2.6.32.38/drivers/a |
7487 |
.inherits = &ata_sff_port_ops, |
7488 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
7489 |
.cable_detect = ata_cable_unknown, |
7490 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_qdi.c linux-2.6.32.38/drivers/ata/pata_qdi.c |
7491 |
---- linux-2.6.32.38/drivers/ata/pata_qdi.c 2011-03-27 14:31:47.000000000 -0400 |
7492 |
-+++ linux-2.6.32.38/drivers/ata/pata_qdi.c 2011-04-17 15:56:46.000000000 -0400 |
7493 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_qdi.c linux-2.6.32.39/drivers/ata/pata_qdi.c |
7494 |
+--- linux-2.6.32.39/drivers/ata/pata_qdi.c 2011-03-27 14:31:47.000000000 -0400 |
7495 |
++++ linux-2.6.32.39/drivers/ata/pata_qdi.c 2011-04-17 15:56:46.000000000 -0400 |
7496 |
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht |
7497 |
ATA_PIO_SHT(DRV_NAME), |
7498 |
}; |
7499 |
@@ -23207,9 +22937,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_qdi.c linux-2.6.32.38/drivers/ata/pa |
7500 |
.inherits = &qdi6500_port_ops, |
7501 |
.set_piomode = qdi6580_set_piomode, |
7502 |
}; |
7503 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_radisys.c linux-2.6.32.38/drivers/ata/pata_radisys.c |
7504 |
---- linux-2.6.32.38/drivers/ata/pata_radisys.c 2011-03-27 14:31:47.000000000 -0400 |
7505 |
-+++ linux-2.6.32.38/drivers/ata/pata_radisys.c 2011-04-17 15:56:46.000000000 -0400 |
7506 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_radisys.c linux-2.6.32.39/drivers/ata/pata_radisys.c |
7507 |
+--- linux-2.6.32.39/drivers/ata/pata_radisys.c 2011-03-27 14:31:47.000000000 -0400 |
7508 |
++++ linux-2.6.32.39/drivers/ata/pata_radisys.c 2011-04-17 15:56:46.000000000 -0400 |
7509 |
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys |
7510 |
ATA_BMDMA_SHT(DRV_NAME), |
7511 |
}; |
7512 |
@@ -23219,9 +22949,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_radisys.c linux-2.6.32.38/drivers/at |
7513 |
.inherits = &ata_bmdma_port_ops, |
7514 |
.qc_issue = radisys_qc_issue, |
7515 |
.cable_detect = ata_cable_unknown, |
7516 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_rb532_cf.c linux-2.6.32.38/drivers/ata/pata_rb532_cf.c |
7517 |
---- linux-2.6.32.38/drivers/ata/pata_rb532_cf.c 2011-03-27 14:31:47.000000000 -0400 |
7518 |
-+++ linux-2.6.32.38/drivers/ata/pata_rb532_cf.c 2011-04-17 15:56:46.000000000 -0400 |
7519 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_rb532_cf.c linux-2.6.32.39/drivers/ata/pata_rb532_cf.c |
7520 |
+--- linux-2.6.32.39/drivers/ata/pata_rb532_cf.c 2011-03-27 14:31:47.000000000 -0400 |
7521 |
++++ linux-2.6.32.39/drivers/ata/pata_rb532_cf.c 2011-04-17 15:56:46.000000000 -0400 |
7522 |
@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle |
7523 |
return IRQ_HANDLED; |
7524 |
} |
7525 |
@@ -23231,9 +22961,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_rb532_cf.c linux-2.6.32.38/drivers/a |
7526 |
.inherits = &ata_sff_port_ops, |
7527 |
.sff_data_xfer = ata_sff_data_xfer32, |
7528 |
}; |
7529 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_rdc.c linux-2.6.32.38/drivers/ata/pata_rdc.c |
7530 |
---- linux-2.6.32.38/drivers/ata/pata_rdc.c 2011-03-27 14:31:47.000000000 -0400 |
7531 |
-+++ linux-2.6.32.38/drivers/ata/pata_rdc.c 2011-04-17 15:56:46.000000000 -0400 |
7532 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_rdc.c linux-2.6.32.39/drivers/ata/pata_rdc.c |
7533 |
+--- linux-2.6.32.39/drivers/ata/pata_rdc.c 2011-03-27 14:31:47.000000000 -0400 |
7534 |
++++ linux-2.6.32.39/drivers/ata/pata_rdc.c 2011-04-17 15:56:46.000000000 -0400 |
7535 |
@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p |
7536 |
pci_write_config_byte(dev, 0x48, udma_enable); |
7537 |
} |
7538 |
@@ -23243,9 +22973,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_rdc.c linux-2.6.32.38/drivers/ata/pa |
7539 |
.inherits = &ata_bmdma32_port_ops, |
7540 |
.cable_detect = rdc_pata_cable_detect, |
7541 |
.set_piomode = rdc_set_piomode, |
7542 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_rz1000.c linux-2.6.32.38/drivers/ata/pata_rz1000.c |
7543 |
---- linux-2.6.32.38/drivers/ata/pata_rz1000.c 2011-03-27 14:31:47.000000000 -0400 |
7544 |
-+++ linux-2.6.32.38/drivers/ata/pata_rz1000.c 2011-04-17 15:56:46.000000000 -0400 |
7545 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_rz1000.c linux-2.6.32.39/drivers/ata/pata_rz1000.c |
7546 |
+--- linux-2.6.32.39/drivers/ata/pata_rz1000.c 2011-03-27 14:31:47.000000000 -0400 |
7547 |
++++ linux-2.6.32.39/drivers/ata/pata_rz1000.c 2011-04-17 15:56:46.000000000 -0400 |
7548 |
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ |
7549 |
ATA_PIO_SHT(DRV_NAME), |
7550 |
}; |
7551 |
@@ -23255,9 +22985,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_rz1000.c linux-2.6.32.38/drivers/ata |
7552 |
.inherits = &ata_sff_port_ops, |
7553 |
.cable_detect = ata_cable_40wire, |
7554 |
.set_mode = rz1000_set_mode, |
7555 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_sc1200.c linux-2.6.32.38/drivers/ata/pata_sc1200.c |
7556 |
---- linux-2.6.32.38/drivers/ata/pata_sc1200.c 2011-03-27 14:31:47.000000000 -0400 |
7557 |
-+++ linux-2.6.32.38/drivers/ata/pata_sc1200.c 2011-04-17 15:56:46.000000000 -0400 |
7558 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_sc1200.c linux-2.6.32.39/drivers/ata/pata_sc1200.c |
7559 |
+--- linux-2.6.32.39/drivers/ata/pata_sc1200.c 2011-03-27 14:31:47.000000000 -0400 |
7560 |
++++ linux-2.6.32.39/drivers/ata/pata_sc1200.c 2011-04-17 15:56:46.000000000 -0400 |
7561 |
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ |
7562 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
7563 |
}; |
7564 |
@@ -23267,9 +22997,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sc1200.c linux-2.6.32.38/drivers/ata |
7565 |
.inherits = &ata_bmdma_port_ops, |
7566 |
.qc_prep = ata_sff_dumb_qc_prep, |
7567 |
.qc_issue = sc1200_qc_issue, |
7568 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_scc.c linux-2.6.32.38/drivers/ata/pata_scc.c |
7569 |
---- linux-2.6.32.38/drivers/ata/pata_scc.c 2011-03-27 14:31:47.000000000 -0400 |
7570 |
-+++ linux-2.6.32.38/drivers/ata/pata_scc.c 2011-04-17 15:56:46.000000000 -0400 |
7571 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_scc.c linux-2.6.32.39/drivers/ata/pata_scc.c |
7572 |
+--- linux-2.6.32.39/drivers/ata/pata_scc.c 2011-03-27 14:31:47.000000000 -0400 |
7573 |
++++ linux-2.6.32.39/drivers/ata/pata_scc.c 2011-04-17 15:56:46.000000000 -0400 |
7574 |
@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht |
7575 |
ATA_BMDMA_SHT(DRV_NAME), |
7576 |
}; |
7577 |
@@ -23279,9 +23009,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_scc.c linux-2.6.32.38/drivers/ata/pa |
7578 |
.inherits = &ata_bmdma_port_ops, |
7579 |
|
7580 |
.set_piomode = scc_set_piomode, |
7581 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_sch.c linux-2.6.32.38/drivers/ata/pata_sch.c |
7582 |
---- linux-2.6.32.38/drivers/ata/pata_sch.c 2011-03-27 14:31:47.000000000 -0400 |
7583 |
-+++ linux-2.6.32.38/drivers/ata/pata_sch.c 2011-04-17 15:56:46.000000000 -0400 |
7584 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_sch.c linux-2.6.32.39/drivers/ata/pata_sch.c |
7585 |
+--- linux-2.6.32.39/drivers/ata/pata_sch.c 2011-03-27 14:31:47.000000000 -0400 |
7586 |
++++ linux-2.6.32.39/drivers/ata/pata_sch.c 2011-04-17 15:56:46.000000000 -0400 |
7587 |
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht |
7588 |
ATA_BMDMA_SHT(DRV_NAME), |
7589 |
}; |
7590 |
@@ -23291,9 +23021,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sch.c linux-2.6.32.38/drivers/ata/pa |
7591 |
.inherits = &ata_bmdma_port_ops, |
7592 |
.cable_detect = ata_cable_unknown, |
7593 |
.set_piomode = sch_set_piomode, |
7594 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_serverworks.c linux-2.6.32.38/drivers/ata/pata_serverworks.c |
7595 |
---- linux-2.6.32.38/drivers/ata/pata_serverworks.c 2011-03-27 14:31:47.000000000 -0400 |
7596 |
-+++ linux-2.6.32.38/drivers/ata/pata_serverworks.c 2011-04-17 15:56:46.000000000 -0400 |
7597 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_serverworks.c linux-2.6.32.39/drivers/ata/pata_serverworks.c |
7598 |
+--- linux-2.6.32.39/drivers/ata/pata_serverworks.c 2011-03-27 14:31:47.000000000 -0400 |
7599 |
++++ linux-2.6.32.39/drivers/ata/pata_serverworks.c 2011-04-17 15:56:46.000000000 -0400 |
7600 |
@@ -299,7 +299,7 @@ static struct scsi_host_template serverw |
7601 |
ATA_BMDMA_SHT(DRV_NAME), |
7602 |
}; |
7603 |
@@ -23312,9 +23042,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_serverworks.c linux-2.6.32.38/driver |
7604 |
.inherits = &serverworks_osb4_port_ops, |
7605 |
.mode_filter = serverworks_csb_filter, |
7606 |
}; |
7607 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_sil680.c linux-2.6.32.38/drivers/ata/pata_sil680.c |
7608 |
---- linux-2.6.32.38/drivers/ata/pata_sil680.c 2011-03-27 14:31:47.000000000 -0400 |
7609 |
-+++ linux-2.6.32.38/drivers/ata/pata_sil680.c 2011-04-17 15:56:46.000000000 -0400 |
7610 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_sil680.c linux-2.6.32.39/drivers/ata/pata_sil680.c |
7611 |
+--- linux-2.6.32.39/drivers/ata/pata_sil680.c 2011-03-27 14:31:47.000000000 -0400 |
7612 |
++++ linux-2.6.32.39/drivers/ata/pata_sil680.c 2011-04-17 15:56:46.000000000 -0400 |
7613 |
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ |
7614 |
ATA_BMDMA_SHT(DRV_NAME), |
7615 |
}; |
7616 |
@@ -23324,9 +23054,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sil680.c linux-2.6.32.38/drivers/ata |
7617 |
.inherits = &ata_bmdma32_port_ops, |
7618 |
.cable_detect = sil680_cable_detect, |
7619 |
.set_piomode = sil680_set_piomode, |
7620 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_sis.c linux-2.6.32.38/drivers/ata/pata_sis.c |
7621 |
---- linux-2.6.32.38/drivers/ata/pata_sis.c 2011-03-27 14:31:47.000000000 -0400 |
7622 |
-+++ linux-2.6.32.38/drivers/ata/pata_sis.c 2011-04-17 15:56:46.000000000 -0400 |
7623 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_sis.c linux-2.6.32.39/drivers/ata/pata_sis.c |
7624 |
+--- linux-2.6.32.39/drivers/ata/pata_sis.c 2011-03-27 14:31:47.000000000 -0400 |
7625 |
++++ linux-2.6.32.39/drivers/ata/pata_sis.c 2011-04-17 15:56:46.000000000 -0400 |
7626 |
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht |
7627 |
ATA_BMDMA_SHT(DRV_NAME), |
7628 |
}; |
7629 |
@@ -23382,9 +23112,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sis.c linux-2.6.32.38/drivers/ata/pa |
7630 |
.inherits = &sis_base_ops, |
7631 |
.set_piomode = sis_old_set_piomode, |
7632 |
.set_dmamode = sis_old_set_dmamode, |
7633 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_sl82c105.c linux-2.6.32.38/drivers/ata/pata_sl82c105.c |
7634 |
---- linux-2.6.32.38/drivers/ata/pata_sl82c105.c 2011-03-27 14:31:47.000000000 -0400 |
7635 |
-+++ linux-2.6.32.38/drivers/ata/pata_sl82c105.c 2011-04-17 15:56:46.000000000 -0400 |
7636 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_sl82c105.c linux-2.6.32.39/drivers/ata/pata_sl82c105.c |
7637 |
+--- linux-2.6.32.39/drivers/ata/pata_sl82c105.c 2011-03-27 14:31:47.000000000 -0400 |
7638 |
++++ linux-2.6.32.39/drivers/ata/pata_sl82c105.c 2011-04-17 15:56:46.000000000 -0400 |
7639 |
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 |
7640 |
ATA_BMDMA_SHT(DRV_NAME), |
7641 |
}; |
7642 |
@@ -23394,9 +23124,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_sl82c105.c linux-2.6.32.38/drivers/a |
7643 |
.inherits = &ata_bmdma_port_ops, |
7644 |
.qc_defer = sl82c105_qc_defer, |
7645 |
.bmdma_start = sl82c105_bmdma_start, |
7646 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_triflex.c linux-2.6.32.38/drivers/ata/pata_triflex.c |
7647 |
---- linux-2.6.32.38/drivers/ata/pata_triflex.c 2011-03-27 14:31:47.000000000 -0400 |
7648 |
-+++ linux-2.6.32.38/drivers/ata/pata_triflex.c 2011-04-17 15:56:46.000000000 -0400 |
7649 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_triflex.c linux-2.6.32.39/drivers/ata/pata_triflex.c |
7650 |
+--- linux-2.6.32.39/drivers/ata/pata_triflex.c 2011-03-27 14:31:47.000000000 -0400 |
7651 |
++++ linux-2.6.32.39/drivers/ata/pata_triflex.c 2011-04-17 15:56:46.000000000 -0400 |
7652 |
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex |
7653 |
ATA_BMDMA_SHT(DRV_NAME), |
7654 |
}; |
7655 |
@@ -23406,9 +23136,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_triflex.c linux-2.6.32.38/drivers/at |
7656 |
.inherits = &ata_bmdma_port_ops, |
7657 |
.bmdma_start = triflex_bmdma_start, |
7658 |
.bmdma_stop = triflex_bmdma_stop, |
7659 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_via.c linux-2.6.32.38/drivers/ata/pata_via.c |
7660 |
---- linux-2.6.32.38/drivers/ata/pata_via.c 2011-03-27 14:31:47.000000000 -0400 |
7661 |
-+++ linux-2.6.32.38/drivers/ata/pata_via.c 2011-04-17 15:56:46.000000000 -0400 |
7662 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_via.c linux-2.6.32.39/drivers/ata/pata_via.c |
7663 |
+--- linux-2.6.32.39/drivers/ata/pata_via.c 2011-03-27 14:31:47.000000000 -0400 |
7664 |
++++ linux-2.6.32.39/drivers/ata/pata_via.c 2011-04-17 15:56:46.000000000 -0400 |
7665 |
@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht |
7666 |
ATA_BMDMA_SHT(DRV_NAME), |
7667 |
}; |
7668 |
@@ -23427,9 +23157,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_via.c linux-2.6.32.38/drivers/ata/pa |
7669 |
.inherits = &via_port_ops, |
7670 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
7671 |
}; |
7672 |
-diff -urNp linux-2.6.32.38/drivers/ata/pata_winbond.c linux-2.6.32.38/drivers/ata/pata_winbond.c |
7673 |
---- linux-2.6.32.38/drivers/ata/pata_winbond.c 2011-03-27 14:31:47.000000000 -0400 |
7674 |
-+++ linux-2.6.32.38/drivers/ata/pata_winbond.c 2011-04-17 15:56:46.000000000 -0400 |
7675 |
+diff -urNp linux-2.6.32.39/drivers/ata/pata_winbond.c linux-2.6.32.39/drivers/ata/pata_winbond.c |
7676 |
+--- linux-2.6.32.39/drivers/ata/pata_winbond.c 2011-03-27 14:31:47.000000000 -0400 |
7677 |
++++ linux-2.6.32.39/drivers/ata/pata_winbond.c 2011-04-17 15:56:46.000000000 -0400 |
7678 |
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond |
7679 |
ATA_PIO_SHT(DRV_NAME), |
7680 |
}; |
7681 |
@@ -23439,9 +23169,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pata_winbond.c linux-2.6.32.38/drivers/at |
7682 |
.inherits = &ata_sff_port_ops, |
7683 |
.sff_data_xfer = winbond_data_xfer, |
7684 |
.cable_detect = ata_cable_40wire, |
7685 |
-diff -urNp linux-2.6.32.38/drivers/ata/pdc_adma.c linux-2.6.32.38/drivers/ata/pdc_adma.c |
7686 |
---- linux-2.6.32.38/drivers/ata/pdc_adma.c 2011-03-27 14:31:47.000000000 -0400 |
7687 |
-+++ linux-2.6.32.38/drivers/ata/pdc_adma.c 2011-04-17 15:56:46.000000000 -0400 |
7688 |
+diff -urNp linux-2.6.32.39/drivers/ata/pdc_adma.c linux-2.6.32.39/drivers/ata/pdc_adma.c |
7689 |
+--- linux-2.6.32.39/drivers/ata/pdc_adma.c 2011-03-27 14:31:47.000000000 -0400 |
7690 |
++++ linux-2.6.32.39/drivers/ata/pdc_adma.c 2011-04-17 15:56:46.000000000 -0400 |
7691 |
@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at |
7692 |
.dma_boundary = ADMA_DMA_BOUNDARY, |
7693 |
}; |
7694 |
@@ -23451,9 +23181,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/pdc_adma.c linux-2.6.32.38/drivers/ata/pd |
7695 |
.inherits = &ata_sff_port_ops, |
7696 |
|
7697 |
.lost_interrupt = ATA_OP_NULL, |
7698 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_fsl.c linux-2.6.32.38/drivers/ata/sata_fsl.c |
7699 |
---- linux-2.6.32.38/drivers/ata/sata_fsl.c 2011-03-27 14:31:47.000000000 -0400 |
7700 |
-+++ linux-2.6.32.38/drivers/ata/sata_fsl.c 2011-04-17 15:56:46.000000000 -0400 |
7701 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_fsl.c linux-2.6.32.39/drivers/ata/sata_fsl.c |
7702 |
+--- linux-2.6.32.39/drivers/ata/sata_fsl.c 2011-03-27 14:31:47.000000000 -0400 |
7703 |
++++ linux-2.6.32.39/drivers/ata/sata_fsl.c 2011-04-17 15:56:46.000000000 -0400 |
7704 |
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs |
7705 |
.dma_boundary = ATA_DMA_BOUNDARY, |
7706 |
}; |
7707 |
@@ -23463,9 +23193,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_fsl.c linux-2.6.32.38/drivers/ata/sa |
7708 |
.inherits = &sata_pmp_port_ops, |
7709 |
|
7710 |
.qc_defer = ata_std_qc_defer, |
7711 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_inic162x.c linux-2.6.32.38/drivers/ata/sata_inic162x.c |
7712 |
---- linux-2.6.32.38/drivers/ata/sata_inic162x.c 2011-03-27 14:31:47.000000000 -0400 |
7713 |
-+++ linux-2.6.32.38/drivers/ata/sata_inic162x.c 2011-04-17 15:56:46.000000000 -0400 |
7714 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_inic162x.c linux-2.6.32.39/drivers/ata/sata_inic162x.c |
7715 |
+--- linux-2.6.32.39/drivers/ata/sata_inic162x.c 2011-03-27 14:31:47.000000000 -0400 |
7716 |
++++ linux-2.6.32.39/drivers/ata/sata_inic162x.c 2011-04-17 15:56:46.000000000 -0400 |
7717 |
@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po |
7718 |
return 0; |
7719 |
} |
7720 |
@@ -23475,9 +23205,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_inic162x.c linux-2.6.32.38/drivers/a |
7721 |
.inherits = &sata_port_ops, |
7722 |
|
7723 |
.check_atapi_dma = inic_check_atapi_dma, |
7724 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_mv.c linux-2.6.32.38/drivers/ata/sata_mv.c |
7725 |
---- linux-2.6.32.38/drivers/ata/sata_mv.c 2011-03-27 14:31:47.000000000 -0400 |
7726 |
-+++ linux-2.6.32.38/drivers/ata/sata_mv.c 2011-04-17 15:56:46.000000000 -0400 |
7727 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_mv.c linux-2.6.32.39/drivers/ata/sata_mv.c |
7728 |
+--- linux-2.6.32.39/drivers/ata/sata_mv.c 2011-03-27 14:31:47.000000000 -0400 |
7729 |
++++ linux-2.6.32.39/drivers/ata/sata_mv.c 2011-04-17 15:56:46.000000000 -0400 |
7730 |
@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht |
7731 |
.dma_boundary = MV_DMA_BOUNDARY, |
7732 |
}; |
7733 |
@@ -23505,9 +23235,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_mv.c linux-2.6.32.38/drivers/ata/sat |
7734 |
.inherits = &mv6_ops, |
7735 |
.dev_config = ATA_OP_NULL, |
7736 |
.qc_prep = mv_qc_prep_iie, |
7737 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_nv.c linux-2.6.32.38/drivers/ata/sata_nv.c |
7738 |
---- linux-2.6.32.38/drivers/ata/sata_nv.c 2011-03-27 14:31:47.000000000 -0400 |
7739 |
-+++ linux-2.6.32.38/drivers/ata/sata_nv.c 2011-04-17 15:56:46.000000000 -0400 |
7740 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_nv.c linux-2.6.32.39/drivers/ata/sata_nv.c |
7741 |
+--- linux-2.6.32.39/drivers/ata/sata_nv.c 2011-03-27 14:31:47.000000000 -0400 |
7742 |
++++ linux-2.6.32.39/drivers/ata/sata_nv.c 2011-04-17 15:56:46.000000000 -0400 |
7743 |
@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc |
7744 |
* cases. Define nv_hardreset() which only kicks in for post-boot |
7745 |
* probing and use it for all variants. |
7746 |
@@ -23550,9 +23280,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_nv.c linux-2.6.32.38/drivers/ata/sat |
7747 |
.inherits = &nv_generic_ops, |
7748 |
|
7749 |
.qc_defer = ata_std_qc_defer, |
7750 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_promise.c linux-2.6.32.38/drivers/ata/sata_promise.c |
7751 |
---- linux-2.6.32.38/drivers/ata/sata_promise.c 2011-03-27 14:31:47.000000000 -0400 |
7752 |
-+++ linux-2.6.32.38/drivers/ata/sata_promise.c 2011-04-17 15:56:46.000000000 -0400 |
7753 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_promise.c linux-2.6.32.39/drivers/ata/sata_promise.c |
7754 |
+--- linux-2.6.32.39/drivers/ata/sata_promise.c 2011-03-27 14:31:47.000000000 -0400 |
7755 |
++++ linux-2.6.32.39/drivers/ata/sata_promise.c 2011-04-17 15:56:46.000000000 -0400 |
7756 |
@@ -195,7 +195,7 @@ static const struct ata_port_operations |
7757 |
.error_handler = pdc_error_handler, |
7758 |
}; |
7759 |
@@ -23579,9 +23309,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_promise.c linux-2.6.32.38/drivers/at |
7760 |
.inherits = &pdc_common_ops, |
7761 |
.cable_detect = pdc_pata_cable_detect, |
7762 |
.freeze = pdc_freeze, |
7763 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_qstor.c linux-2.6.32.38/drivers/ata/sata_qstor.c |
7764 |
---- linux-2.6.32.38/drivers/ata/sata_qstor.c 2011-03-27 14:31:47.000000000 -0400 |
7765 |
-+++ linux-2.6.32.38/drivers/ata/sata_qstor.c 2011-04-17 15:56:46.000000000 -0400 |
7766 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_qstor.c linux-2.6.32.39/drivers/ata/sata_qstor.c |
7767 |
+--- linux-2.6.32.39/drivers/ata/sata_qstor.c 2011-03-27 14:31:47.000000000 -0400 |
7768 |
++++ linux-2.6.32.39/drivers/ata/sata_qstor.c 2011-04-17 15:56:46.000000000 -0400 |
7769 |
@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ |
7770 |
.dma_boundary = QS_DMA_BOUNDARY, |
7771 |
}; |
7772 |
@@ -23591,9 +23321,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_qstor.c linux-2.6.32.38/drivers/ata/ |
7773 |
.inherits = &ata_sff_port_ops, |
7774 |
|
7775 |
.check_atapi_dma = qs_check_atapi_dma, |
7776 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_sil24.c linux-2.6.32.38/drivers/ata/sata_sil24.c |
7777 |
---- linux-2.6.32.38/drivers/ata/sata_sil24.c 2011-03-27 14:31:47.000000000 -0400 |
7778 |
-+++ linux-2.6.32.38/drivers/ata/sata_sil24.c 2011-04-17 15:56:46.000000000 -0400 |
7779 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_sil24.c linux-2.6.32.39/drivers/ata/sata_sil24.c |
7780 |
+--- linux-2.6.32.39/drivers/ata/sata_sil24.c 2011-03-27 14:31:47.000000000 -0400 |
7781 |
++++ linux-2.6.32.39/drivers/ata/sata_sil24.c 2011-04-17 15:56:46.000000000 -0400 |
7782 |
@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s |
7783 |
.dma_boundary = ATA_DMA_BOUNDARY, |
7784 |
}; |
7785 |
@@ -23603,9 +23333,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sil24.c linux-2.6.32.38/drivers/ata/ |
7786 |
.inherits = &sata_pmp_port_ops, |
7787 |
|
7788 |
.qc_defer = sil24_qc_defer, |
7789 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_sil.c linux-2.6.32.38/drivers/ata/sata_sil.c |
7790 |
---- linux-2.6.32.38/drivers/ata/sata_sil.c 2011-03-27 14:31:47.000000000 -0400 |
7791 |
-+++ linux-2.6.32.38/drivers/ata/sata_sil.c 2011-04-17 15:56:46.000000000 -0400 |
7792 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_sil.c linux-2.6.32.39/drivers/ata/sata_sil.c |
7793 |
+--- linux-2.6.32.39/drivers/ata/sata_sil.c 2011-03-27 14:31:47.000000000 -0400 |
7794 |
++++ linux-2.6.32.39/drivers/ata/sata_sil.c 2011-04-17 15:56:46.000000000 -0400 |
7795 |
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht |
7796 |
.sg_tablesize = ATA_MAX_PRD |
7797 |
}; |
7798 |
@@ -23615,9 +23345,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sil.c linux-2.6.32.38/drivers/ata/sa |
7799 |
.inherits = &ata_bmdma32_port_ops, |
7800 |
.dev_config = sil_dev_config, |
7801 |
.set_mode = sil_set_mode, |
7802 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_sis.c linux-2.6.32.38/drivers/ata/sata_sis.c |
7803 |
---- linux-2.6.32.38/drivers/ata/sata_sis.c 2011-03-27 14:31:47.000000000 -0400 |
7804 |
-+++ linux-2.6.32.38/drivers/ata/sata_sis.c 2011-04-17 15:56:46.000000000 -0400 |
7805 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_sis.c linux-2.6.32.39/drivers/ata/sata_sis.c |
7806 |
+--- linux-2.6.32.39/drivers/ata/sata_sis.c 2011-03-27 14:31:47.000000000 -0400 |
7807 |
++++ linux-2.6.32.39/drivers/ata/sata_sis.c 2011-04-17 15:56:46.000000000 -0400 |
7808 |
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht |
7809 |
ATA_BMDMA_SHT(DRV_NAME), |
7810 |
}; |
7811 |
@@ -23627,9 +23357,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sis.c linux-2.6.32.38/drivers/ata/sa |
7812 |
.inherits = &ata_bmdma_port_ops, |
7813 |
.scr_read = sis_scr_read, |
7814 |
.scr_write = sis_scr_write, |
7815 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_svw.c linux-2.6.32.38/drivers/ata/sata_svw.c |
7816 |
---- linux-2.6.32.38/drivers/ata/sata_svw.c 2011-03-27 14:31:47.000000000 -0400 |
7817 |
-+++ linux-2.6.32.38/drivers/ata/sata_svw.c 2011-04-17 15:56:46.000000000 -0400 |
7818 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_svw.c linux-2.6.32.39/drivers/ata/sata_svw.c |
7819 |
+--- linux-2.6.32.39/drivers/ata/sata_svw.c 2011-03-27 14:31:47.000000000 -0400 |
7820 |
++++ linux-2.6.32.39/drivers/ata/sata_svw.c 2011-04-17 15:56:46.000000000 -0400 |
7821 |
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata |
7822 |
}; |
7823 |
|
7824 |
@@ -23639,9 +23369,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_svw.c linux-2.6.32.38/drivers/ata/sa |
7825 |
.inherits = &ata_bmdma_port_ops, |
7826 |
.sff_tf_load = k2_sata_tf_load, |
7827 |
.sff_tf_read = k2_sata_tf_read, |
7828 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_sx4.c linux-2.6.32.38/drivers/ata/sata_sx4.c |
7829 |
---- linux-2.6.32.38/drivers/ata/sata_sx4.c 2011-03-27 14:31:47.000000000 -0400 |
7830 |
-+++ linux-2.6.32.38/drivers/ata/sata_sx4.c 2011-04-17 15:56:46.000000000 -0400 |
7831 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_sx4.c linux-2.6.32.39/drivers/ata/sata_sx4.c |
7832 |
+--- linux-2.6.32.39/drivers/ata/sata_sx4.c 2011-03-27 14:31:47.000000000 -0400 |
7833 |
++++ linux-2.6.32.39/drivers/ata/sata_sx4.c 2011-04-17 15:56:46.000000000 -0400 |
7834 |
@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat |
7835 |
}; |
7836 |
|
7837 |
@@ -23651,9 +23381,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_sx4.c linux-2.6.32.38/drivers/ata/sa |
7838 |
.inherits = &ata_sff_port_ops, |
7839 |
|
7840 |
.check_atapi_dma = pdc_check_atapi_dma, |
7841 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_uli.c linux-2.6.32.38/drivers/ata/sata_uli.c |
7842 |
---- linux-2.6.32.38/drivers/ata/sata_uli.c 2011-03-27 14:31:47.000000000 -0400 |
7843 |
-+++ linux-2.6.32.38/drivers/ata/sata_uli.c 2011-04-17 15:56:46.000000000 -0400 |
7844 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_uli.c linux-2.6.32.39/drivers/ata/sata_uli.c |
7845 |
+--- linux-2.6.32.39/drivers/ata/sata_uli.c 2011-03-27 14:31:47.000000000 -0400 |
7846 |
++++ linux-2.6.32.39/drivers/ata/sata_uli.c 2011-04-17 15:56:46.000000000 -0400 |
7847 |
@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht |
7848 |
ATA_BMDMA_SHT(DRV_NAME), |
7849 |
}; |
7850 |
@@ -23663,9 +23393,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_uli.c linux-2.6.32.38/drivers/ata/sa |
7851 |
.inherits = &ata_bmdma_port_ops, |
7852 |
.scr_read = uli_scr_read, |
7853 |
.scr_write = uli_scr_write, |
7854 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_via.c linux-2.6.32.38/drivers/ata/sata_via.c |
7855 |
---- linux-2.6.32.38/drivers/ata/sata_via.c 2011-03-27 14:31:47.000000000 -0400 |
7856 |
-+++ linux-2.6.32.38/drivers/ata/sata_via.c 2011-04-17 15:56:46.000000000 -0400 |
7857 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_via.c linux-2.6.32.39/drivers/ata/sata_via.c |
7858 |
+--- linux-2.6.32.39/drivers/ata/sata_via.c 2011-03-27 14:31:47.000000000 -0400 |
7859 |
++++ linux-2.6.32.39/drivers/ata/sata_via.c 2011-04-17 15:56:46.000000000 -0400 |
7860 |
@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh |
7861 |
ATA_BMDMA_SHT(DRV_NAME), |
7862 |
}; |
7863 |
@@ -23703,9 +23433,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_via.c linux-2.6.32.38/drivers/ata/sa |
7864 |
.inherits = &svia_base_ops, |
7865 |
.hardreset = sata_std_hardreset, |
7866 |
.scr_read = vt8251_scr_read, |
7867 |
-diff -urNp linux-2.6.32.38/drivers/ata/sata_vsc.c linux-2.6.32.38/drivers/ata/sata_vsc.c |
7868 |
---- linux-2.6.32.38/drivers/ata/sata_vsc.c 2011-03-27 14:31:47.000000000 -0400 |
7869 |
-+++ linux-2.6.32.38/drivers/ata/sata_vsc.c 2011-04-17 15:56:46.000000000 -0400 |
7870 |
+diff -urNp linux-2.6.32.39/drivers/ata/sata_vsc.c linux-2.6.32.39/drivers/ata/sata_vsc.c |
7871 |
+--- linux-2.6.32.39/drivers/ata/sata_vsc.c 2011-03-27 14:31:47.000000000 -0400 |
7872 |
++++ linux-2.6.32.39/drivers/ata/sata_vsc.c 2011-04-17 15:56:46.000000000 -0400 |
7873 |
@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat |
7874 |
}; |
7875 |
|
7876 |
@@ -23715,9 +23445,9 @@ diff -urNp linux-2.6.32.38/drivers/ata/sata_vsc.c linux-2.6.32.38/drivers/ata/sa |
7877 |
.inherits = &ata_bmdma_port_ops, |
7878 |
/* The IRQ handling is not quite standard SFF behaviour so we |
7879 |
cannot use the default lost interrupt handler */ |
7880 |
-diff -urNp linux-2.6.32.38/drivers/atm/adummy.c linux-2.6.32.38/drivers/atm/adummy.c |
7881 |
---- linux-2.6.32.38/drivers/atm/adummy.c 2011-03-27 14:31:47.000000000 -0400 |
7882 |
-+++ linux-2.6.32.38/drivers/atm/adummy.c 2011-04-17 15:56:46.000000000 -0400 |
7883 |
+diff -urNp linux-2.6.32.39/drivers/atm/adummy.c linux-2.6.32.39/drivers/atm/adummy.c |
7884 |
+--- linux-2.6.32.39/drivers/atm/adummy.c 2011-03-27 14:31:47.000000000 -0400 |
7885 |
++++ linux-2.6.32.39/drivers/atm/adummy.c 2011-04-17 15:56:46.000000000 -0400 |
7886 |
@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct |
7887 |
vcc->pop(vcc, skb); |
7888 |
else |
7889 |
@@ -23727,9 +23457,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/adummy.c linux-2.6.32.38/drivers/atm/adum |
7890 |
|
7891 |
return 0; |
7892 |
} |
7893 |
-diff -urNp linux-2.6.32.38/drivers/atm/ambassador.c linux-2.6.32.38/drivers/atm/ambassador.c |
7894 |
---- linux-2.6.32.38/drivers/atm/ambassador.c 2011-03-27 14:31:47.000000000 -0400 |
7895 |
-+++ linux-2.6.32.38/drivers/atm/ambassador.c 2011-04-17 15:56:46.000000000 -0400 |
7896 |
+diff -urNp linux-2.6.32.39/drivers/atm/ambassador.c linux-2.6.32.39/drivers/atm/ambassador.c |
7897 |
+--- linux-2.6.32.39/drivers/atm/ambassador.c 2011-03-27 14:31:47.000000000 -0400 |
7898 |
++++ linux-2.6.32.39/drivers/atm/ambassador.c 2011-04-17 15:56:46.000000000 -0400 |
7899 |
@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, |
7900 |
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); |
7901 |
|
7902 |
@@ -23766,9 +23496,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/ambassador.c linux-2.6.32.38/drivers/atm/ |
7903 |
return -ENOMEM; // ? |
7904 |
} |
7905 |
|
7906 |
-diff -urNp linux-2.6.32.38/drivers/atm/atmtcp.c linux-2.6.32.38/drivers/atm/atmtcp.c |
7907 |
---- linux-2.6.32.38/drivers/atm/atmtcp.c 2011-03-27 14:31:47.000000000 -0400 |
7908 |
-+++ linux-2.6.32.38/drivers/atm/atmtcp.c 2011-04-17 15:56:46.000000000 -0400 |
7909 |
+diff -urNp linux-2.6.32.39/drivers/atm/atmtcp.c linux-2.6.32.39/drivers/atm/atmtcp.c |
7910 |
+--- linux-2.6.32.39/drivers/atm/atmtcp.c 2011-03-27 14:31:47.000000000 -0400 |
7911 |
++++ linux-2.6.32.39/drivers/atm/atmtcp.c 2011-04-17 15:56:46.000000000 -0400 |
7912 |
@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc |
7913 |
if (vcc->pop) vcc->pop(vcc,skb); |
7914 |
else dev_kfree_skb(skb); |
7915 |
@@ -23818,9 +23548,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/atmtcp.c linux-2.6.32.38/drivers/atm/atmt |
7916 |
done: |
7917 |
if (vcc->pop) vcc->pop(vcc,skb); |
7918 |
else dev_kfree_skb(skb); |
7919 |
-diff -urNp linux-2.6.32.38/drivers/atm/eni.c linux-2.6.32.38/drivers/atm/eni.c |
7920 |
---- linux-2.6.32.38/drivers/atm/eni.c 2011-03-27 14:31:47.000000000 -0400 |
7921 |
-+++ linux-2.6.32.38/drivers/atm/eni.c 2011-04-17 15:56:46.000000000 -0400 |
7922 |
+diff -urNp linux-2.6.32.39/drivers/atm/eni.c linux-2.6.32.39/drivers/atm/eni.c |
7923 |
+--- linux-2.6.32.39/drivers/atm/eni.c 2011-03-27 14:31:47.000000000 -0400 |
7924 |
++++ linux-2.6.32.39/drivers/atm/eni.c 2011-04-17 15:56:46.000000000 -0400 |
7925 |
@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) |
7926 |
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", |
7927 |
vcc->dev->number); |
7928 |
@@ -23866,9 +23596,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/eni.c linux-2.6.32.38/drivers/atm/eni.c |
7929 |
wake_up(&eni_dev->tx_wait); |
7930 |
dma_complete++; |
7931 |
} |
7932 |
-diff -urNp linux-2.6.32.38/drivers/atm/firestream.c linux-2.6.32.38/drivers/atm/firestream.c |
7933 |
---- linux-2.6.32.38/drivers/atm/firestream.c 2011-03-27 14:31:47.000000000 -0400 |
7934 |
-+++ linux-2.6.32.38/drivers/atm/firestream.c 2011-04-17 15:56:46.000000000 -0400 |
7935 |
+diff -urNp linux-2.6.32.39/drivers/atm/firestream.c linux-2.6.32.39/drivers/atm/firestream.c |
7936 |
+--- linux-2.6.32.39/drivers/atm/firestream.c 2011-03-27 14:31:47.000000000 -0400 |
7937 |
++++ linux-2.6.32.39/drivers/atm/firestream.c 2011-04-17 15:56:46.000000000 -0400 |
7938 |
@@ -748,7 +748,7 @@ static void process_txdone_queue (struct |
7939 |
} |
7940 |
} |
7941 |
@@ -23902,9 +23632,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/firestream.c linux-2.6.32.38/drivers/atm/ |
7942 |
break; |
7943 |
default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ |
7944 |
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", |
7945 |
-diff -urNp linux-2.6.32.38/drivers/atm/fore200e.c linux-2.6.32.38/drivers/atm/fore200e.c |
7946 |
---- linux-2.6.32.38/drivers/atm/fore200e.c 2011-03-27 14:31:47.000000000 -0400 |
7947 |
-+++ linux-2.6.32.38/drivers/atm/fore200e.c 2011-04-17 15:56:46.000000000 -0400 |
7948 |
+diff -urNp linux-2.6.32.39/drivers/atm/fore200e.c linux-2.6.32.39/drivers/atm/fore200e.c |
7949 |
+--- linux-2.6.32.39/drivers/atm/fore200e.c 2011-03-27 14:31:47.000000000 -0400 |
7950 |
++++ linux-2.6.32.39/drivers/atm/fore200e.c 2011-04-17 15:56:46.000000000 -0400 |
7951 |
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 |
7952 |
#endif |
7953 |
/* check error condition */ |
7954 |
@@ -23961,9 +23691,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/fore200e.c linux-2.6.32.38/drivers/atm/fo |
7955 |
|
7956 |
fore200e->tx_sat++; |
7957 |
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", |
7958 |
-diff -urNp linux-2.6.32.38/drivers/atm/he.c linux-2.6.32.38/drivers/atm/he.c |
7959 |
---- linux-2.6.32.38/drivers/atm/he.c 2011-03-27 14:31:47.000000000 -0400 |
7960 |
-+++ linux-2.6.32.38/drivers/atm/he.c 2011-04-17 15:56:46.000000000 -0400 |
7961 |
+diff -urNp linux-2.6.32.39/drivers/atm/he.c linux-2.6.32.39/drivers/atm/he.c |
7962 |
+--- linux-2.6.32.39/drivers/atm/he.c 2011-03-27 14:31:47.000000000 -0400 |
7963 |
++++ linux-2.6.32.39/drivers/atm/he.c 2011-04-17 15:56:46.000000000 -0400 |
7964 |
@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i |
7965 |
|
7966 |
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { |
7967 |
@@ -24045,9 +23775,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/he.c linux-2.6.32.38/drivers/atm/he.c |
7968 |
|
7969 |
return 0; |
7970 |
} |
7971 |
-diff -urNp linux-2.6.32.38/drivers/atm/horizon.c linux-2.6.32.38/drivers/atm/horizon.c |
7972 |
---- linux-2.6.32.38/drivers/atm/horizon.c 2011-03-27 14:31:47.000000000 -0400 |
7973 |
-+++ linux-2.6.32.38/drivers/atm/horizon.c 2011-04-17 15:56:46.000000000 -0400 |
7974 |
+diff -urNp linux-2.6.32.39/drivers/atm/horizon.c linux-2.6.32.39/drivers/atm/horizon.c |
7975 |
+--- linux-2.6.32.39/drivers/atm/horizon.c 2011-03-27 14:31:47.000000000 -0400 |
7976 |
++++ linux-2.6.32.39/drivers/atm/horizon.c 2011-04-17 15:56:46.000000000 -0400 |
7977 |
@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, |
7978 |
{ |
7979 |
struct atm_vcc * vcc = ATM_SKB(skb)->vcc; |
7980 |
@@ -24066,9 +23796,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/horizon.c linux-2.6.32.38/drivers/atm/hor |
7981 |
|
7982 |
// free the skb |
7983 |
hrz_kfree_skb (skb); |
7984 |
-diff -urNp linux-2.6.32.38/drivers/atm/idt77252.c linux-2.6.32.38/drivers/atm/idt77252.c |
7985 |
---- linux-2.6.32.38/drivers/atm/idt77252.c 2011-03-27 14:31:47.000000000 -0400 |
7986 |
-+++ linux-2.6.32.38/drivers/atm/idt77252.c 2011-04-17 15:56:46.000000000 -0400 |
7987 |
+diff -urNp linux-2.6.32.39/drivers/atm/idt77252.c linux-2.6.32.39/drivers/atm/idt77252.c |
7988 |
+--- linux-2.6.32.39/drivers/atm/idt77252.c 2011-03-27 14:31:47.000000000 -0400 |
7989 |
++++ linux-2.6.32.39/drivers/atm/idt77252.c 2011-04-17 15:56:46.000000000 -0400 |
7990 |
@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str |
7991 |
else |
7992 |
dev_kfree_skb(skb); |
7993 |
@@ -24223,9 +23953,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/idt77252.c linux-2.6.32.38/drivers/atm/id |
7994 |
return -ENOMEM; |
7995 |
} |
7996 |
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); |
7997 |
-diff -urNp linux-2.6.32.38/drivers/atm/iphase.c linux-2.6.32.38/drivers/atm/iphase.c |
7998 |
---- linux-2.6.32.38/drivers/atm/iphase.c 2011-03-27 14:31:47.000000000 -0400 |
7999 |
-+++ linux-2.6.32.38/drivers/atm/iphase.c 2011-04-17 15:56:46.000000000 -0400 |
8000 |
+diff -urNp linux-2.6.32.39/drivers/atm/iphase.c linux-2.6.32.39/drivers/atm/iphase.c |
8001 |
+--- linux-2.6.32.39/drivers/atm/iphase.c 2011-03-27 14:31:47.000000000 -0400 |
8002 |
++++ linux-2.6.32.39/drivers/atm/iphase.c 2011-04-17 15:56:46.000000000 -0400 |
8003 |
@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) |
8004 |
status = (u_short) (buf_desc_ptr->desc_mode); |
8005 |
if (status & (RX_CER | RX_PTE | RX_OFL)) |
8006 |
@@ -24322,9 +24052,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/iphase.c linux-2.6.32.38/drivers/atm/ipha |
8007 |
if (iavcc->vc_desc_cnt > 10) { |
8008 |
vcc->tx_quota = vcc->tx_quota * 3 / 4; |
8009 |
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); |
8010 |
-diff -urNp linux-2.6.32.38/drivers/atm/lanai.c linux-2.6.32.38/drivers/atm/lanai.c |
8011 |
---- linux-2.6.32.38/drivers/atm/lanai.c 2011-03-27 14:31:47.000000000 -0400 |
8012 |
-+++ linux-2.6.32.38/drivers/atm/lanai.c 2011-04-17 15:56:46.000000000 -0400 |
8013 |
+diff -urNp linux-2.6.32.39/drivers/atm/lanai.c linux-2.6.32.39/drivers/atm/lanai.c |
8014 |
+--- linux-2.6.32.39/drivers/atm/lanai.c 2011-03-27 14:31:47.000000000 -0400 |
8015 |
++++ linux-2.6.32.39/drivers/atm/lanai.c 2011-04-17 15:56:46.000000000 -0400 |
8016 |
@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l |
8017 |
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); |
8018 |
lanai_endtx(lanai, lvcc); |
8019 |
@@ -24379,9 +24109,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/lanai.c linux-2.6.32.38/drivers/atm/lanai |
8020 |
lvcc->stats.x.aal5.service_rxcrc++; |
8021 |
lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; |
8022 |
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); |
8023 |
-diff -urNp linux-2.6.32.38/drivers/atm/nicstar.c linux-2.6.32.38/drivers/atm/nicstar.c |
8024 |
---- linux-2.6.32.38/drivers/atm/nicstar.c 2011-03-27 14:31:47.000000000 -0400 |
8025 |
-+++ linux-2.6.32.38/drivers/atm/nicstar.c 2011-04-17 15:56:46.000000000 -0400 |
8026 |
+diff -urNp linux-2.6.32.39/drivers/atm/nicstar.c linux-2.6.32.39/drivers/atm/nicstar.c |
8027 |
+--- linux-2.6.32.39/drivers/atm/nicstar.c 2011-03-27 14:31:47.000000000 -0400 |
8028 |
++++ linux-2.6.32.39/drivers/atm/nicstar.c 2011-04-17 15:56:46.000000000 -0400 |
8029 |
@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, |
8030 |
if ((vc = (vc_map *) vcc->dev_data) == NULL) |
8031 |
{ |
8032 |
@@ -24584,9 +24314,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/nicstar.c linux-2.6.32.38/drivers/atm/nic |
8033 |
} |
8034 |
} |
8035 |
|
8036 |
-diff -urNp linux-2.6.32.38/drivers/atm/solos-pci.c linux-2.6.32.38/drivers/atm/solos-pci.c |
8037 |
---- linux-2.6.32.38/drivers/atm/solos-pci.c 2011-04-17 17:00:52.000000000 -0400 |
8038 |
-+++ linux-2.6.32.38/drivers/atm/solos-pci.c 2011-04-17 17:03:05.000000000 -0400 |
8039 |
+diff -urNp linux-2.6.32.39/drivers/atm/solos-pci.c linux-2.6.32.39/drivers/atm/solos-pci.c |
8040 |
+--- linux-2.6.32.39/drivers/atm/solos-pci.c 2011-04-17 17:00:52.000000000 -0400 |
8041 |
++++ linux-2.6.32.39/drivers/atm/solos-pci.c 2011-04-17 17:03:05.000000000 -0400 |
8042 |
@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) |
8043 |
} |
8044 |
atm_charge(vcc, skb->truesize); |
8045 |
@@ -24605,9 +24335,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/solos-pci.c linux-2.6.32.38/drivers/atm/s |
8046 |
solos_pop(vcc, oldskb); |
8047 |
} else |
8048 |
dev_kfree_skb_irq(oldskb); |
8049 |
-diff -urNp linux-2.6.32.38/drivers/atm/suni.c linux-2.6.32.38/drivers/atm/suni.c |
8050 |
---- linux-2.6.32.38/drivers/atm/suni.c 2011-03-27 14:31:47.000000000 -0400 |
8051 |
-+++ linux-2.6.32.38/drivers/atm/suni.c 2011-04-17 15:56:46.000000000 -0400 |
8052 |
+diff -urNp linux-2.6.32.39/drivers/atm/suni.c linux-2.6.32.39/drivers/atm/suni.c |
8053 |
+--- linux-2.6.32.39/drivers/atm/suni.c 2011-03-27 14:31:47.000000000 -0400 |
8054 |
++++ linux-2.6.32.39/drivers/atm/suni.c 2011-04-17 15:56:46.000000000 -0400 |
8055 |
@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); |
8056 |
|
8057 |
|
8058 |
@@ -24619,9 +24349,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/suni.c linux-2.6.32.38/drivers/atm/suni.c |
8059 |
|
8060 |
|
8061 |
static void suni_hz(unsigned long from_timer) |
8062 |
-diff -urNp linux-2.6.32.38/drivers/atm/uPD98402.c linux-2.6.32.38/drivers/atm/uPD98402.c |
8063 |
---- linux-2.6.32.38/drivers/atm/uPD98402.c 2011-03-27 14:31:47.000000000 -0400 |
8064 |
-+++ linux-2.6.32.38/drivers/atm/uPD98402.c 2011-04-17 15:56:46.000000000 -0400 |
8065 |
+diff -urNp linux-2.6.32.39/drivers/atm/uPD98402.c linux-2.6.32.39/drivers/atm/uPD98402.c |
8066 |
+--- linux-2.6.32.39/drivers/atm/uPD98402.c 2011-03-27 14:31:47.000000000 -0400 |
8067 |
++++ linux-2.6.32.39/drivers/atm/uPD98402.c 2011-04-17 15:56:46.000000000 -0400 |
8068 |
@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d |
8069 |
struct sonet_stats tmp; |
8070 |
int error = 0; |
8071 |
@@ -24666,9 +24396,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/uPD98402.c linux-2.6.32.38/drivers/atm/uP |
8072 |
return 0; |
8073 |
} |
8074 |
|
8075 |
-diff -urNp linux-2.6.32.38/drivers/atm/zatm.c linux-2.6.32.38/drivers/atm/zatm.c |
8076 |
---- linux-2.6.32.38/drivers/atm/zatm.c 2011-03-27 14:31:47.000000000 -0400 |
8077 |
-+++ linux-2.6.32.38/drivers/atm/zatm.c 2011-04-17 15:56:46.000000000 -0400 |
8078 |
+diff -urNp linux-2.6.32.39/drivers/atm/zatm.c linux-2.6.32.39/drivers/atm/zatm.c |
8079 |
+--- linux-2.6.32.39/drivers/atm/zatm.c 2011-03-27 14:31:47.000000000 -0400 |
8080 |
++++ linux-2.6.32.39/drivers/atm/zatm.c 2011-04-17 15:56:46.000000000 -0400 |
8081 |
@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy |
8082 |
} |
8083 |
if (!size) { |
8084 |
@@ -24696,9 +24426,9 @@ diff -urNp linux-2.6.32.38/drivers/atm/zatm.c linux-2.6.32.38/drivers/atm/zatm.c |
8085 |
wake_up(&zatm_vcc->tx_wait); |
8086 |
} |
8087 |
|
8088 |
-diff -urNp linux-2.6.32.38/drivers/base/bus.c linux-2.6.32.38/drivers/base/bus.c |
8089 |
---- linux-2.6.32.38/drivers/base/bus.c 2011-03-27 14:31:47.000000000 -0400 |
8090 |
-+++ linux-2.6.32.38/drivers/base/bus.c 2011-04-17 15:56:46.000000000 -0400 |
8091 |
+diff -urNp linux-2.6.32.39/drivers/base/bus.c linux-2.6.32.39/drivers/base/bus.c |
8092 |
+--- linux-2.6.32.39/drivers/base/bus.c 2011-03-27 14:31:47.000000000 -0400 |
8093 |
++++ linux-2.6.32.39/drivers/base/bus.c 2011-04-17 15:56:46.000000000 -0400 |
8094 |
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob |
8095 |
return ret; |
8096 |
} |
8097 |
@@ -24726,9 +24456,9 @@ diff -urNp linux-2.6.32.38/drivers/base/bus.c linux-2.6.32.38/drivers/base/bus.c |
8098 |
.filter = bus_uevent_filter, |
8099 |
}; |
8100 |
|
8101 |
-diff -urNp linux-2.6.32.38/drivers/base/class.c linux-2.6.32.38/drivers/base/class.c |
8102 |
---- linux-2.6.32.38/drivers/base/class.c 2011-03-27 14:31:47.000000000 -0400 |
8103 |
-+++ linux-2.6.32.38/drivers/base/class.c 2011-04-17 15:56:46.000000000 -0400 |
8104 |
+diff -urNp linux-2.6.32.39/drivers/base/class.c linux-2.6.32.39/drivers/base/class.c |
8105 |
+--- linux-2.6.32.39/drivers/base/class.c 2011-03-27 14:31:47.000000000 -0400 |
8106 |
++++ linux-2.6.32.39/drivers/base/class.c 2011-04-17 15:56:46.000000000 -0400 |
8107 |
@@ -63,7 +63,7 @@ static void class_release(struct kobject |
8108 |
kfree(cp); |
8109 |
} |
8110 |
@@ -24738,9 +24468,9 @@ diff -urNp linux-2.6.32.38/drivers/base/class.c linux-2.6.32.38/drivers/base/cla |
8111 |
.show = class_attr_show, |
8112 |
.store = class_attr_store, |
8113 |
}; |
8114 |
-diff -urNp linux-2.6.32.38/drivers/base/core.c linux-2.6.32.38/drivers/base/core.c |
8115 |
---- linux-2.6.32.38/drivers/base/core.c 2011-03-27 14:31:47.000000000 -0400 |
8116 |
-+++ linux-2.6.32.38/drivers/base/core.c 2011-04-17 15:56:46.000000000 -0400 |
8117 |
+diff -urNp linux-2.6.32.39/drivers/base/core.c linux-2.6.32.39/drivers/base/core.c |
8118 |
+--- linux-2.6.32.39/drivers/base/core.c 2011-03-27 14:31:47.000000000 -0400 |
8119 |
++++ linux-2.6.32.39/drivers/base/core.c 2011-04-17 15:56:46.000000000 -0400 |
8120 |
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob |
8121 |
return ret; |
8122 |
} |
8123 |
@@ -24759,9 +24489,9 @@ diff -urNp linux-2.6.32.38/drivers/base/core.c linux-2.6.32.38/drivers/base/core |
8124 |
.filter = dev_uevent_filter, |
8125 |
.name = dev_uevent_name, |
8126 |
.uevent = dev_uevent, |
8127 |
-diff -urNp linux-2.6.32.38/drivers/base/memory.c linux-2.6.32.38/drivers/base/memory.c |
8128 |
---- linux-2.6.32.38/drivers/base/memory.c 2011-03-27 14:31:47.000000000 -0400 |
8129 |
-+++ linux-2.6.32.38/drivers/base/memory.c 2011-04-17 15:56:46.000000000 -0400 |
8130 |
+diff -urNp linux-2.6.32.39/drivers/base/memory.c linux-2.6.32.39/drivers/base/memory.c |
8131 |
+--- linux-2.6.32.39/drivers/base/memory.c 2011-03-27 14:31:47.000000000 -0400 |
8132 |
++++ linux-2.6.32.39/drivers/base/memory.c 2011-04-17 15:56:46.000000000 -0400 |
8133 |
@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks |
8134 |
return retval; |
8135 |
} |
8136 |
@@ -24771,9 +24501,9 @@ diff -urNp linux-2.6.32.38/drivers/base/memory.c linux-2.6.32.38/drivers/base/me |
8137 |
.name = memory_uevent_name, |
8138 |
.uevent = memory_uevent, |
8139 |
}; |
8140 |
-diff -urNp linux-2.6.32.38/drivers/base/sys.c linux-2.6.32.38/drivers/base/sys.c |
8141 |
---- linux-2.6.32.38/drivers/base/sys.c 2011-03-27 14:31:47.000000000 -0400 |
8142 |
-+++ linux-2.6.32.38/drivers/base/sys.c 2011-04-17 15:56:46.000000000 -0400 |
8143 |
+diff -urNp linux-2.6.32.39/drivers/base/sys.c linux-2.6.32.39/drivers/base/sys.c |
8144 |
+--- linux-2.6.32.39/drivers/base/sys.c 2011-03-27 14:31:47.000000000 -0400 |
8145 |
++++ linux-2.6.32.39/drivers/base/sys.c 2011-04-17 15:56:46.000000000 -0400 |
8146 |
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc |
8147 |
return -EIO; |
8148 |
} |
8149 |
@@ -24792,9 +24522,9 @@ diff -urNp linux-2.6.32.38/drivers/base/sys.c linux-2.6.32.38/drivers/base/sys.c |
8150 |
.show = sysdev_class_show, |
8151 |
.store = sysdev_class_store, |
8152 |
}; |
8153 |
-diff -urNp linux-2.6.32.38/drivers/block/cciss.c linux-2.6.32.38/drivers/block/cciss.c |
8154 |
---- linux-2.6.32.38/drivers/block/cciss.c 2011-03-27 14:31:47.000000000 -0400 |
8155 |
-+++ linux-2.6.32.38/drivers/block/cciss.c 2011-04-17 15:56:46.000000000 -0400 |
8156 |
+diff -urNp linux-2.6.32.39/drivers/block/cciss.c linux-2.6.32.39/drivers/block/cciss.c |
8157 |
+--- linux-2.6.32.39/drivers/block/cciss.c 2011-03-27 14:31:47.000000000 -0400 |
8158 |
++++ linux-2.6.32.39/drivers/block/cciss.c 2011-04-17 15:56:46.000000000 -0400 |
8159 |
@@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct |
8160 |
int err; |
8161 |
u32 cp; |
8162 |
@@ -24804,9 +24534,9 @@ diff -urNp linux-2.6.32.38/drivers/block/cciss.c linux-2.6.32.38/drivers/block/c |
8163 |
err = 0; |
8164 |
err |= |
8165 |
copy_from_user(&arg64.LUN_info, &arg32->LUN_info, |
8166 |
-diff -urNp linux-2.6.32.38/drivers/block/pktcdvd.c linux-2.6.32.38/drivers/block/pktcdvd.c |
8167 |
---- linux-2.6.32.38/drivers/block/pktcdvd.c 2011-03-27 14:31:47.000000000 -0400 |
8168 |
-+++ linux-2.6.32.38/drivers/block/pktcdvd.c 2011-04-17 15:56:46.000000000 -0400 |
8169 |
+diff -urNp linux-2.6.32.39/drivers/block/pktcdvd.c linux-2.6.32.39/drivers/block/pktcdvd.c |
8170 |
+--- linux-2.6.32.39/drivers/block/pktcdvd.c 2011-03-27 14:31:47.000000000 -0400 |
8171 |
++++ linux-2.6.32.39/drivers/block/pktcdvd.c 2011-04-17 15:56:46.000000000 -0400 |
8172 |
@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob |
8173 |
return len; |
8174 |
} |
8175 |
@@ -24816,9 +24546,9 @@ diff -urNp linux-2.6.32.38/drivers/block/pktcdvd.c linux-2.6.32.38/drivers/block |
8176 |
.show = kobj_pkt_show, |
8177 |
.store = kobj_pkt_store |
8178 |
}; |
8179 |
-diff -urNp linux-2.6.32.38/drivers/char/agp/frontend.c linux-2.6.32.38/drivers/char/agp/frontend.c |
8180 |
---- linux-2.6.32.38/drivers/char/agp/frontend.c 2011-03-27 14:31:47.000000000 -0400 |
8181 |
-+++ linux-2.6.32.38/drivers/char/agp/frontend.c 2011-04-17 15:56:46.000000000 -0400 |
8182 |
+diff -urNp linux-2.6.32.39/drivers/char/agp/frontend.c linux-2.6.32.39/drivers/char/agp/frontend.c |
8183 |
+--- linux-2.6.32.39/drivers/char/agp/frontend.c 2011-03-27 14:31:47.000000000 -0400 |
8184 |
++++ linux-2.6.32.39/drivers/char/agp/frontend.c 2011-04-17 15:56:46.000000000 -0400 |
8185 |
@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag |
8186 |
if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) |
8187 |
return -EFAULT; |
8188 |
@@ -24828,21 +24558,70 @@ diff -urNp linux-2.6.32.38/drivers/char/agp/frontend.c linux-2.6.32.38/drivers/c |
8189 |
return -EFAULT; |
8190 |
|
8191 |
client = agp_find_client_by_pid(reserve.pid); |
8192 |
-diff -urNp linux-2.6.32.38/drivers/char/agp/intel-agp.c linux-2.6.32.38/drivers/char/agp/intel-agp.c |
8193 |
---- linux-2.6.32.38/drivers/char/agp/intel-agp.c 2011-03-27 14:31:47.000000000 -0400 |
8194 |
-+++ linux-2.6.32.38/drivers/char/agp/intel-agp.c 2011-04-17 15:56:46.000000000 -0400 |
8195 |
-@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc |
8196 |
- ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), |
8197 |
- ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), |
8198 |
- ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB), |
8199 |
-- { } |
8200 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
8201 |
- }; |
8202 |
- |
8203 |
- MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); |
8204 |
-diff -urNp linux-2.6.32.38/drivers/char/briq_panel.c linux-2.6.32.38/drivers/char/briq_panel.c |
8205 |
---- linux-2.6.32.38/drivers/char/briq_panel.c 2011-03-27 14:31:47.000000000 -0400 |
8206 |
-+++ linux-2.6.32.38/drivers/char/briq_panel.c 2011-04-18 19:48:57.000000000 -0400 |
8207 |
+diff -urNp linux-2.6.32.39/drivers/char/agp/generic.c linux-2.6.32.39/drivers/char/agp/generic.c |
8208 |
+--- linux-2.6.32.39/drivers/char/agp/generic.c 2011-03-27 14:31:47.000000000 -0400 |
8209 |
++++ linux-2.6.32.39/drivers/char/agp/generic.c 2011-04-22 19:37:29.000000000 -0400 |
8210 |
+@@ -123,6 +123,9 @@ static struct agp_memory *agp_create_use |
8211 |
+ struct agp_memory *new; |
8212 |
+ unsigned long alloc_size = num_agp_pages*sizeof(struct page *); |
8213 |
+ |
8214 |
++ if (INT_MAX/sizeof(struct page *) < num_agp_pages) |
8215 |
++ return NULL; |
8216 |
++ |
8217 |
+ new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL); |
8218 |
+ if (new == NULL) |
8219 |
+ return NULL; |
8220 |
+@@ -242,11 +245,14 @@ struct agp_memory *agp_allocate_memory(s |
8221 |
+ int scratch_pages; |
8222 |
+ struct agp_memory *new; |
8223 |
+ size_t i; |
8224 |
++ int cur_memory; |
8225 |
+ |
8226 |
+ if (!bridge) |
8227 |
+ return NULL; |
8228 |
+ |
8229 |
+- if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->max_memory_agp) |
8230 |
++ cur_memory = atomic_read(&bridge->current_memory_agp); |
8231 |
++ if ((cur_memory + page_count > bridge->max_memory_agp) || |
8232 |
++ (cur_memory + page_count < page_count)) |
8233 |
+ return NULL; |
8234 |
+ |
8235 |
+ if (type >= AGP_USER_TYPES) { |
8236 |
+@@ -1123,8 +1129,8 @@ int agp_generic_insert_memory(struct agp |
8237 |
+ return -EINVAL; |
8238 |
+ } |
8239 |
+ |
8240 |
+- /* AK: could wrap */ |
8241 |
+- if ((pg_start + mem->page_count) > num_entries) |
8242 |
++ if (((pg_start + mem->page_count) > num_entries) || |
8243 |
++ ((pg_start + mem->page_count) < pg_start)) |
8244 |
+ return -EINVAL; |
8245 |
+ |
8246 |
+ j = pg_start; |
8247 |
+@@ -1158,7 +1164,7 @@ int agp_generic_remove_memory(struct agp |
8248 |
+ { |
8249 |
+ size_t i; |
8250 |
+ struct agp_bridge_data *bridge; |
8251 |
+- int mask_type; |
8252 |
++ int mask_type, num_entries; |
8253 |
+ |
8254 |
+ bridge = mem->bridge; |
8255 |
+ if (!bridge) |
8256 |
+@@ -1170,6 +1176,11 @@ int agp_generic_remove_memory(struct agp |
8257 |
+ if (type != mem->type) |
8258 |
+ return -EINVAL; |
8259 |
+ |
8260 |
++ num_entries = agp_num_entries(); |
8261 |
++ if (((pg_start + mem->page_count) > num_entries) || |
8262 |
++ ((pg_start + mem->page_count) < pg_start)) |
8263 |
++ return -EINVAL; |
8264 |
++ |
8265 |
+ mask_type = bridge->driver->agp_type_to_mask_type(bridge, type); |
8266 |
+ if (mask_type != 0) { |
8267 |
+ /* The generic routines know nothing of memory types */ |
8268 |
+diff -urNp linux-2.6.32.39/drivers/char/briq_panel.c linux-2.6.32.39/drivers/char/briq_panel.c |
8269 |
+--- linux-2.6.32.39/drivers/char/briq_panel.c 2011-03-27 14:31:47.000000000 -0400 |
8270 |
++++ linux-2.6.32.39/drivers/char/briq_panel.c 2011-04-18 19:48:57.000000000 -0400 |
8271 |
@@ -10,6 +10,7 @@ |
8272 |
#include <linux/types.h> |
8273 |
#include <linux/errno.h> |
8274 |
@@ -24884,9 +24663,9 @@ diff -urNp linux-2.6.32.38/drivers/char/briq_panel.c linux-2.6.32.38/drivers/cha |
8275 |
|
8276 |
return len; |
8277 |
} |
8278 |
-diff -urNp linux-2.6.32.38/drivers/char/genrtc.c linux-2.6.32.38/drivers/char/genrtc.c |
8279 |
---- linux-2.6.32.38/drivers/char/genrtc.c 2011-03-27 14:31:47.000000000 -0400 |
8280 |
-+++ linux-2.6.32.38/drivers/char/genrtc.c 2011-04-18 19:45:42.000000000 -0400 |
8281 |
+diff -urNp linux-2.6.32.39/drivers/char/genrtc.c linux-2.6.32.39/drivers/char/genrtc.c |
8282 |
+--- linux-2.6.32.39/drivers/char/genrtc.c 2011-03-27 14:31:47.000000000 -0400 |
8283 |
++++ linux-2.6.32.39/drivers/char/genrtc.c 2011-04-18 19:45:42.000000000 -0400 |
8284 |
@@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i |
8285 |
switch (cmd) { |
8286 |
|
8287 |
@@ -24895,9 +24674,9 @@ diff -urNp linux-2.6.32.38/drivers/char/genrtc.c linux-2.6.32.38/drivers/char/ge |
8288 |
if (get_rtc_pll(&pll)) |
8289 |
return -EINVAL; |
8290 |
else |
8291 |
-diff -urNp linux-2.6.32.38/drivers/char/hpet.c linux-2.6.32.38/drivers/char/hpet.c |
8292 |
---- linux-2.6.32.38/drivers/char/hpet.c 2011-03-27 14:31:47.000000000 -0400 |
8293 |
-+++ linux-2.6.32.38/drivers/char/hpet.c 2011-04-17 15:56:46.000000000 -0400 |
8294 |
+diff -urNp linux-2.6.32.39/drivers/char/hpet.c linux-2.6.32.39/drivers/char/hpet.c |
8295 |
+--- linux-2.6.32.39/drivers/char/hpet.c 2011-03-27 14:31:47.000000000 -0400 |
8296 |
++++ linux-2.6.32.39/drivers/char/hpet.c 2011-04-23 12:56:11.000000000 -0400 |
8297 |
@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in |
8298 |
return 0; |
8299 |
} |
8300 |
@@ -24930,18 +24709,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hpet.c linux-2.6.32.38/drivers/char/hpet |
8301 |
info.hi_flags = |
8302 |
readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK; |
8303 |
info.hi_hpet = hpetp->hp_which; |
8304 |
-@@ -1015,7 +1015,7 @@ static struct acpi_driver hpet_acpi_driv |
8305 |
- }, |
8306 |
- }; |
8307 |
- |
8308 |
--static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops }; |
8309 |
-+static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops, {NULL, NULL}, NULL, NULL }; |
8310 |
- |
8311 |
- static int __init hpet_init(void) |
8312 |
- { |
8313 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_beat.c linux-2.6.32.38/drivers/char/hvc_beat.c |
8314 |
---- linux-2.6.32.38/drivers/char/hvc_beat.c 2011-03-27 14:31:47.000000000 -0400 |
8315 |
-+++ linux-2.6.32.38/drivers/char/hvc_beat.c 2011-04-17 15:56:46.000000000 -0400 |
8316 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_beat.c linux-2.6.32.39/drivers/char/hvc_beat.c |
8317 |
+--- linux-2.6.32.39/drivers/char/hvc_beat.c 2011-03-27 14:31:47.000000000 -0400 |
8318 |
++++ linux-2.6.32.39/drivers/char/hvc_beat.c 2011-04-17 15:56:46.000000000 -0400 |
8319 |
@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v |
8320 |
return cnt; |
8321 |
} |
8322 |
@@ -24951,9 +24721,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_beat.c linux-2.6.32.38/drivers/char/ |
8323 |
.get_chars = hvc_beat_get_chars, |
8324 |
.put_chars = hvc_beat_put_chars, |
8325 |
}; |
8326 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_console.c linux-2.6.32.38/drivers/char/hvc_console.c |
8327 |
---- linux-2.6.32.38/drivers/char/hvc_console.c 2011-03-27 14:31:47.000000000 -0400 |
8328 |
-+++ linux-2.6.32.38/drivers/char/hvc_console.c 2011-04-17 15:56:46.000000000 -0400 |
8329 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_console.c linux-2.6.32.39/drivers/char/hvc_console.c |
8330 |
+--- linux-2.6.32.39/drivers/char/hvc_console.c 2011-03-27 14:31:47.000000000 -0400 |
8331 |
++++ linux-2.6.32.39/drivers/char/hvc_console.c 2011-04-17 15:56:46.000000000 -0400 |
8332 |
@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind |
8333 |
* console interfaces but can still be used as a tty device. This has to be |
8334 |
* static because kmalloc will not work during early console init. |
8335 |
@@ -24981,9 +24751,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_console.c linux-2.6.32.38/drivers/ch |
8336 |
{ |
8337 |
struct hvc_struct *hp; |
8338 |
int i; |
8339 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_console.h linux-2.6.32.38/drivers/char/hvc_console.h |
8340 |
---- linux-2.6.32.38/drivers/char/hvc_console.h 2011-03-27 14:31:47.000000000 -0400 |
8341 |
-+++ linux-2.6.32.38/drivers/char/hvc_console.h 2011-04-17 15:56:46.000000000 -0400 |
8342 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_console.h linux-2.6.32.39/drivers/char/hvc_console.h |
8343 |
+--- linux-2.6.32.39/drivers/char/hvc_console.h 2011-03-27 14:31:47.000000000 -0400 |
8344 |
++++ linux-2.6.32.39/drivers/char/hvc_console.h 2011-04-17 15:56:46.000000000 -0400 |
8345 |
@@ -55,7 +55,7 @@ struct hvc_struct { |
8346 |
int outbuf_size; |
8347 |
int n_outbuf; |
8348 |
@@ -25007,9 +24777,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_console.h linux-2.6.32.38/drivers/ch |
8349 |
/* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ |
8350 |
extern int hvc_remove(struct hvc_struct *hp); |
8351 |
|
8352 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_iseries.c linux-2.6.32.38/drivers/char/hvc_iseries.c |
8353 |
---- linux-2.6.32.38/drivers/char/hvc_iseries.c 2011-03-27 14:31:47.000000000 -0400 |
8354 |
-+++ linux-2.6.32.38/drivers/char/hvc_iseries.c 2011-04-17 15:56:46.000000000 -0400 |
8355 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_iseries.c linux-2.6.32.39/drivers/char/hvc_iseries.c |
8356 |
+--- linux-2.6.32.39/drivers/char/hvc_iseries.c 2011-03-27 14:31:47.000000000 -0400 |
8357 |
++++ linux-2.6.32.39/drivers/char/hvc_iseries.c 2011-04-17 15:56:46.000000000 -0400 |
8358 |
@@ -197,7 +197,7 @@ done: |
8359 |
return sent; |
8360 |
} |
8361 |
@@ -25019,9 +24789,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_iseries.c linux-2.6.32.38/drivers/ch |
8362 |
.get_chars = get_chars, |
8363 |
.put_chars = put_chars, |
8364 |
.notifier_add = notifier_add_irq, |
8365 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_iucv.c linux-2.6.32.38/drivers/char/hvc_iucv.c |
8366 |
---- linux-2.6.32.38/drivers/char/hvc_iucv.c 2011-03-27 14:31:47.000000000 -0400 |
8367 |
-+++ linux-2.6.32.38/drivers/char/hvc_iucv.c 2011-04-17 15:56:46.000000000 -0400 |
8368 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_iucv.c linux-2.6.32.39/drivers/char/hvc_iucv.c |
8369 |
+--- linux-2.6.32.39/drivers/char/hvc_iucv.c 2011-03-27 14:31:47.000000000 -0400 |
8370 |
++++ linux-2.6.32.39/drivers/char/hvc_iucv.c 2011-04-17 15:56:46.000000000 -0400 |
8371 |
@@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru |
8372 |
|
8373 |
|
8374 |
@@ -25031,9 +24801,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_iucv.c linux-2.6.32.38/drivers/char/ |
8375 |
.get_chars = hvc_iucv_get_chars, |
8376 |
.put_chars = hvc_iucv_put_chars, |
8377 |
.notifier_add = hvc_iucv_notifier_add, |
8378 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_rtas.c linux-2.6.32.38/drivers/char/hvc_rtas.c |
8379 |
---- linux-2.6.32.38/drivers/char/hvc_rtas.c 2011-03-27 14:31:47.000000000 -0400 |
8380 |
-+++ linux-2.6.32.38/drivers/char/hvc_rtas.c 2011-04-17 15:56:46.000000000 -0400 |
8381 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_rtas.c linux-2.6.32.39/drivers/char/hvc_rtas.c |
8382 |
+--- linux-2.6.32.39/drivers/char/hvc_rtas.c 2011-03-27 14:31:47.000000000 -0400 |
8383 |
++++ linux-2.6.32.39/drivers/char/hvc_rtas.c 2011-04-17 15:56:46.000000000 -0400 |
8384 |
@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ |
8385 |
return i; |
8386 |
} |
8387 |
@@ -25043,9 +24813,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_rtas.c linux-2.6.32.38/drivers/char/ |
8388 |
.get_chars = hvc_rtas_read_console, |
8389 |
.put_chars = hvc_rtas_write_console, |
8390 |
}; |
8391 |
-diff -urNp linux-2.6.32.38/drivers/char/hvcs.c linux-2.6.32.38/drivers/char/hvcs.c |
8392 |
---- linux-2.6.32.38/drivers/char/hvcs.c 2011-03-27 14:31:47.000000000 -0400 |
8393 |
-+++ linux-2.6.32.38/drivers/char/hvcs.c 2011-04-17 15:56:46.000000000 -0400 |
8394 |
+diff -urNp linux-2.6.32.39/drivers/char/hvcs.c linux-2.6.32.39/drivers/char/hvcs.c |
8395 |
+--- linux-2.6.32.39/drivers/char/hvcs.c 2011-03-27 14:31:47.000000000 -0400 |
8396 |
++++ linux-2.6.32.39/drivers/char/hvcs.c 2011-04-17 15:56:46.000000000 -0400 |
8397 |
@@ -82,6 +82,7 @@ |
8398 |
#include <asm/hvcserver.h> |
8399 |
#include <asm/uaccess.h> |
8400 |
@@ -25148,9 +24918,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvcs.c linux-2.6.32.38/drivers/char/hvcs |
8401 |
return 0; |
8402 |
|
8403 |
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; |
8404 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_udbg.c linux-2.6.32.38/drivers/char/hvc_udbg.c |
8405 |
---- linux-2.6.32.38/drivers/char/hvc_udbg.c 2011-03-27 14:31:47.000000000 -0400 |
8406 |
-+++ linux-2.6.32.38/drivers/char/hvc_udbg.c 2011-04-17 15:56:46.000000000 -0400 |
8407 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_udbg.c linux-2.6.32.39/drivers/char/hvc_udbg.c |
8408 |
+--- linux-2.6.32.39/drivers/char/hvc_udbg.c 2011-03-27 14:31:47.000000000 -0400 |
8409 |
++++ linux-2.6.32.39/drivers/char/hvc_udbg.c 2011-04-17 15:56:46.000000000 -0400 |
8410 |
@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno |
8411 |
return i; |
8412 |
} |
8413 |
@@ -25160,9 +24930,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_udbg.c linux-2.6.32.38/drivers/char/ |
8414 |
.get_chars = hvc_udbg_get, |
8415 |
.put_chars = hvc_udbg_put, |
8416 |
}; |
8417 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_vio.c linux-2.6.32.38/drivers/char/hvc_vio.c |
8418 |
---- linux-2.6.32.38/drivers/char/hvc_vio.c 2011-03-27 14:31:47.000000000 -0400 |
8419 |
-+++ linux-2.6.32.38/drivers/char/hvc_vio.c 2011-04-17 15:56:46.000000000 -0400 |
8420 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_vio.c linux-2.6.32.39/drivers/char/hvc_vio.c |
8421 |
+--- linux-2.6.32.39/drivers/char/hvc_vio.c 2011-03-27 14:31:47.000000000 -0400 |
8422 |
++++ linux-2.6.32.39/drivers/char/hvc_vio.c 2011-04-17 15:56:46.000000000 -0400 |
8423 |
@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v |
8424 |
return got; |
8425 |
} |
8426 |
@@ -25172,9 +24942,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_vio.c linux-2.6.32.38/drivers/char/h |
8427 |
.get_chars = filtered_get_chars, |
8428 |
.put_chars = hvc_put_chars, |
8429 |
.notifier_add = notifier_add_irq, |
8430 |
-diff -urNp linux-2.6.32.38/drivers/char/hvc_xen.c linux-2.6.32.38/drivers/char/hvc_xen.c |
8431 |
---- linux-2.6.32.38/drivers/char/hvc_xen.c 2011-03-27 14:31:47.000000000 -0400 |
8432 |
-+++ linux-2.6.32.38/drivers/char/hvc_xen.c 2011-04-17 15:56:46.000000000 -0400 |
8433 |
+diff -urNp linux-2.6.32.39/drivers/char/hvc_xen.c linux-2.6.32.39/drivers/char/hvc_xen.c |
8434 |
+--- linux-2.6.32.39/drivers/char/hvc_xen.c 2011-03-27 14:31:47.000000000 -0400 |
8435 |
++++ linux-2.6.32.39/drivers/char/hvc_xen.c 2011-04-17 15:56:46.000000000 -0400 |
8436 |
@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno |
8437 |
return recv; |
8438 |
} |
8439 |
@@ -25184,9 +24954,9 @@ diff -urNp linux-2.6.32.38/drivers/char/hvc_xen.c linux-2.6.32.38/drivers/char/h |
8440 |
.get_chars = read_console, |
8441 |
.put_chars = write_console, |
8442 |
.notifier_add = notifier_add_irq, |
8443 |
-diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c |
8444 |
---- linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c 2011-03-27 14:31:47.000000000 -0400 |
8445 |
-+++ linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:56:46.000000000 -0400 |
8446 |
+diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c |
8447 |
+--- linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c 2011-03-27 14:31:47.000000000 -0400 |
8448 |
++++ linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:56:46.000000000 -0400 |
8449 |
@@ -414,7 +414,7 @@ struct ipmi_smi { |
8450 |
struct proc_dir_entry *proc_dir; |
8451 |
char proc_dir_name[10]; |
8452 |
@@ -25217,9 +24987,9 @@ diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.38/d |
8453 |
|
8454 |
intf->proc_dir = NULL; |
8455 |
|
8456 |
-diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c |
8457 |
---- linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c 2011-03-27 14:31:47.000000000 -0400 |
8458 |
-+++ linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:56:46.000000000 -0400 |
8459 |
+diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c |
8460 |
+--- linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c 2011-03-27 14:31:47.000000000 -0400 |
8461 |
++++ linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:56:46.000000000 -0400 |
8462 |
@@ -277,7 +277,7 @@ struct smi_info { |
8463 |
unsigned char slave_addr; |
8464 |
|
8465 |
@@ -25250,9 +25020,9 @@ diff -urNp linux-2.6.32.38/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.38/driv |
8466 |
|
8467 |
new_smi->interrupt_disabled = 0; |
8468 |
atomic_set(&new_smi->stop_operation, 0); |
8469 |
-diff -urNp linux-2.6.32.38/drivers/char/istallion.c linux-2.6.32.38/drivers/char/istallion.c |
8470 |
---- linux-2.6.32.38/drivers/char/istallion.c 2011-03-27 14:31:47.000000000 -0400 |
8471 |
-+++ linux-2.6.32.38/drivers/char/istallion.c 2011-04-18 19:39:36.000000000 -0400 |
8472 |
+diff -urNp linux-2.6.32.39/drivers/char/istallion.c linux-2.6.32.39/drivers/char/istallion.c |
8473 |
+--- linux-2.6.32.39/drivers/char/istallion.c 2011-03-27 14:31:47.000000000 -0400 |
8474 |
++++ linux-2.6.32.39/drivers/char/istallion.c 2011-04-22 22:18:05.000000000 -0400 |
8475 |
@@ -187,7 +187,6 @@ static struct ktermios stli_deftermios |
8476 |
* re-used for each stats call. |
8477 |
*/ |
8478 |
@@ -25265,13 +25035,13 @@ diff -urNp linux-2.6.32.38/drivers/char/istallion.c linux-2.6.32.38/drivers/char |
8479 |
{ |
8480 |
struct stlibrd *brdp; |
8481 |
unsigned int i; |
8482 |
-+ combrd_t stdli_brdstats; |
8483 |
++ combrd_t stli_brdstats; |
8484 |
|
8485 |
if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) |
8486 |
return -EFAULT; |
8487 |
-diff -urNp linux-2.6.32.38/drivers/char/Kconfig linux-2.6.32.38/drivers/char/Kconfig |
8488 |
---- linux-2.6.32.38/drivers/char/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
8489 |
-+++ linux-2.6.32.38/drivers/char/Kconfig 2011-04-18 19:20:15.000000000 -0400 |
8490 |
+diff -urNp linux-2.6.32.39/drivers/char/Kconfig linux-2.6.32.39/drivers/char/Kconfig |
8491 |
+--- linux-2.6.32.39/drivers/char/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
8492 |
++++ linux-2.6.32.39/drivers/char/Kconfig 2011-04-18 19:20:15.000000000 -0400 |
8493 |
@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING |
8494 |
|
8495 |
config DEVKMEM |
8496 |
@@ -25290,9 +25060,9 @@ diff -urNp linux-2.6.32.38/drivers/char/Kconfig linux-2.6.32.38/drivers/char/Kco |
8497 |
default y |
8498 |
|
8499 |
source "drivers/s390/char/Kconfig" |
8500 |
-diff -urNp linux-2.6.32.38/drivers/char/keyboard.c linux-2.6.32.38/drivers/char/keyboard.c |
8501 |
---- linux-2.6.32.38/drivers/char/keyboard.c 2011-03-27 14:31:47.000000000 -0400 |
8502 |
-+++ linux-2.6.32.38/drivers/char/keyboard.c 2011-04-17 15:56:46.000000000 -0400 |
8503 |
+diff -urNp linux-2.6.32.39/drivers/char/keyboard.c linux-2.6.32.39/drivers/char/keyboard.c |
8504 |
+--- linux-2.6.32.39/drivers/char/keyboard.c 2011-03-27 14:31:47.000000000 -0400 |
8505 |
++++ linux-2.6.32.39/drivers/char/keyboard.c 2011-04-17 15:56:46.000000000 -0400 |
8506 |
@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u |
8507 |
kbd->kbdmode == VC_MEDIUMRAW) && |
8508 |
value != KVAL(K_SAK)) |
8509 |
@@ -25319,9 +25089,9 @@ diff -urNp linux-2.6.32.38/drivers/char/keyboard.c linux-2.6.32.38/drivers/char/ |
8510 |
}; |
8511 |
|
8512 |
MODULE_DEVICE_TABLE(input, kbd_ids); |
8513 |
-diff -urNp linux-2.6.32.38/drivers/char/mem.c linux-2.6.32.38/drivers/char/mem.c |
8514 |
---- linux-2.6.32.38/drivers/char/mem.c 2011-03-27 14:31:47.000000000 -0400 |
8515 |
-+++ linux-2.6.32.38/drivers/char/mem.c 2011-04-17 15:56:46.000000000 -0400 |
8516 |
+diff -urNp linux-2.6.32.39/drivers/char/mem.c linux-2.6.32.39/drivers/char/mem.c |
8517 |
+--- linux-2.6.32.39/drivers/char/mem.c 2011-03-27 14:31:47.000000000 -0400 |
8518 |
++++ linux-2.6.32.39/drivers/char/mem.c 2011-04-17 15:56:46.000000000 -0400 |
8519 |
@@ -18,6 +18,7 @@ |
8520 |
#include <linux/raw.h> |
8521 |
#include <linux/tty.h> |
8522 |
@@ -25463,24 +25233,9 @@ diff -urNp linux-2.6.32.38/drivers/char/mem.c linux-2.6.32.38/drivers/char/mem.c |
8523 |
}; |
8524 |
|
8525 |
static int memory_open(struct inode *inode, struct file *filp) |
8526 |
-diff -urNp linux-2.6.32.38/drivers/char/nvram.c linux-2.6.32.38/drivers/char/nvram.c |
8527 |
---- linux-2.6.32.38/drivers/char/nvram.c 2011-03-27 14:31:47.000000000 -0400 |
8528 |
-+++ linux-2.6.32.38/drivers/char/nvram.c 2011-04-17 15:56:46.000000000 -0400 |
8529 |
-@@ -435,7 +435,10 @@ static const struct file_operations nvra |
8530 |
- static struct miscdevice nvram_dev = { |
8531 |
- NVRAM_MINOR, |
8532 |
- "nvram", |
8533 |
-- &nvram_fops |
8534 |
-+ &nvram_fops, |
8535 |
-+ {NULL, NULL}, |
8536 |
-+ NULL, |
8537 |
-+ NULL |
8538 |
- }; |
8539 |
- |
8540 |
- static int __init nvram_init(void) |
8541 |
-diff -urNp linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c |
8542 |
---- linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c 2011-03-27 14:31:47.000000000 -0400 |
8543 |
-+++ linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:56:46.000000000 -0400 |
8544 |
+diff -urNp linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c |
8545 |
+--- linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c 2011-03-27 14:31:47.000000000 -0400 |
8546 |
++++ linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:56:46.000000000 -0400 |
8547 |
@@ -29,6 +29,7 @@ |
8548 |
#include <linux/tty_driver.h> |
8549 |
#include <linux/tty_flip.h> |
8550 |
@@ -25603,9 +25358,9 @@ diff -urNp linux-2.6.32.38/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.38/ |
8551 |
do_ipw_close(ttyj); |
8552 |
ipwireless_disassociate_network_ttys(network, |
8553 |
ttyj->channel_idx); |
8554 |
-diff -urNp linux-2.6.32.38/drivers/char/pty.c linux-2.6.32.38/drivers/char/pty.c |
8555 |
---- linux-2.6.32.38/drivers/char/pty.c 2011-03-27 14:31:47.000000000 -0400 |
8556 |
-+++ linux-2.6.32.38/drivers/char/pty.c 2011-04-17 15:56:46.000000000 -0400 |
8557 |
+diff -urNp linux-2.6.32.39/drivers/char/pty.c linux-2.6.32.39/drivers/char/pty.c |
8558 |
+--- linux-2.6.32.39/drivers/char/pty.c 2011-03-27 14:31:47.000000000 -0400 |
8559 |
++++ linux-2.6.32.39/drivers/char/pty.c 2011-04-17 15:56:46.000000000 -0400 |
8560 |
@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode |
8561 |
return ret; |
8562 |
} |
8563 |
@@ -25636,9 +25391,9 @@ diff -urNp linux-2.6.32.38/drivers/char/pty.c linux-2.6.32.38/drivers/char/pty.c |
8564 |
cdev_init(&ptmx_cdev, &ptmx_fops); |
8565 |
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || |
8566 |
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) |
8567 |
-diff -urNp linux-2.6.32.38/drivers/char/random.c linux-2.6.32.38/drivers/char/random.c |
8568 |
---- linux-2.6.32.38/drivers/char/random.c 2011-03-27 14:31:47.000000000 -0400 |
8569 |
-+++ linux-2.6.32.38/drivers/char/random.c 2011-04-17 15:56:46.000000000 -0400 |
8570 |
+diff -urNp linux-2.6.32.39/drivers/char/random.c linux-2.6.32.39/drivers/char/random.c |
8571 |
+--- linux-2.6.32.39/drivers/char/random.c 2011-03-27 14:31:47.000000000 -0400 |
8572 |
++++ linux-2.6.32.39/drivers/char/random.c 2011-04-17 15:56:46.000000000 -0400 |
8573 |
@@ -254,8 +254,13 @@ |
8574 |
/* |
8575 |
* Configuration information |
8576 |
@@ -25680,9 +25435,9 @@ diff -urNp linux-2.6.32.38/drivers/char/random.c linux-2.6.32.38/drivers/char/ra |
8577 |
static int max_write_thresh = INPUT_POOL_WORDS * 32; |
8578 |
static char sysctl_bootid[16]; |
8579 |
|
8580 |
-diff -urNp linux-2.6.32.38/drivers/char/sonypi.c linux-2.6.32.38/drivers/char/sonypi.c |
8581 |
---- linux-2.6.32.38/drivers/char/sonypi.c 2011-03-27 14:31:47.000000000 -0400 |
8582 |
-+++ linux-2.6.32.38/drivers/char/sonypi.c 2011-04-17 15:56:46.000000000 -0400 |
8583 |
+diff -urNp linux-2.6.32.39/drivers/char/sonypi.c linux-2.6.32.39/drivers/char/sonypi.c |
8584 |
+--- linux-2.6.32.39/drivers/char/sonypi.c 2011-03-27 14:31:47.000000000 -0400 |
8585 |
++++ linux-2.6.32.39/drivers/char/sonypi.c 2011-04-17 15:56:46.000000000 -0400 |
8586 |
@@ -55,6 +55,7 @@ |
8587 |
#include <asm/uaccess.h> |
8588 |
#include <asm/io.h> |
8589 |
@@ -25721,9 +25476,9 @@ diff -urNp linux-2.6.32.38/drivers/char/sonypi.c linux-2.6.32.38/drivers/char/so |
8590 |
mutex_unlock(&sonypi_device.lock); |
8591 |
unlock_kernel(); |
8592 |
return 0; |
8593 |
-diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm_bios.c linux-2.6.32.38/drivers/char/tpm/tpm_bios.c |
8594 |
---- linux-2.6.32.38/drivers/char/tpm/tpm_bios.c 2011-03-27 14:31:47.000000000 -0400 |
8595 |
-+++ linux-2.6.32.38/drivers/char/tpm/tpm_bios.c 2011-04-17 15:56:46.000000000 -0400 |
8596 |
+diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm_bios.c linux-2.6.32.39/drivers/char/tpm/tpm_bios.c |
8597 |
+--- linux-2.6.32.39/drivers/char/tpm/tpm_bios.c 2011-03-27 14:31:47.000000000 -0400 |
8598 |
++++ linux-2.6.32.39/drivers/char/tpm/tpm_bios.c 2011-04-17 15:56:46.000000000 -0400 |
8599 |
@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start |
8600 |
event = addr; |
8601 |
|
8602 |
@@ -25764,9 +25519,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm_bios.c linux-2.6.32.38/drivers/c |
8603 |
|
8604 |
memcpy(log->bios_event_log, virt, len); |
8605 |
|
8606 |
-diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm.c linux-2.6.32.38/drivers/char/tpm/tpm.c |
8607 |
---- linux-2.6.32.38/drivers/char/tpm/tpm.c 2011-04-17 17:00:52.000000000 -0400 |
8608 |
-+++ linux-2.6.32.38/drivers/char/tpm/tpm.c 2011-04-17 17:03:05.000000000 -0400 |
8609 |
+diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm.c linux-2.6.32.39/drivers/char/tpm/tpm.c |
8610 |
+--- linux-2.6.32.39/drivers/char/tpm/tpm.c 2011-04-17 17:00:52.000000000 -0400 |
8611 |
++++ linux-2.6.32.39/drivers/char/tpm/tpm.c 2011-04-17 17:03:05.000000000 -0400 |
8612 |
@@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c |
8613 |
chip->vendor.req_complete_val) |
8614 |
goto out_recv; |
8615 |
@@ -25776,9 +25531,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tpm/tpm.c linux-2.6.32.38/drivers/char/t |
8616 |
dev_err(chip->dev, "Operation Canceled\n"); |
8617 |
rc = -ECANCELED; |
8618 |
goto out; |
8619 |
-diff -urNp linux-2.6.32.38/drivers/char/tty_io.c linux-2.6.32.38/drivers/char/tty_io.c |
8620 |
---- linux-2.6.32.38/drivers/char/tty_io.c 2011-03-27 14:31:47.000000000 -0400 |
8621 |
-+++ linux-2.6.32.38/drivers/char/tty_io.c 2011-04-17 15:56:46.000000000 -0400 |
8622 |
+diff -urNp linux-2.6.32.39/drivers/char/tty_io.c linux-2.6.32.39/drivers/char/tty_io.c |
8623 |
+--- linux-2.6.32.39/drivers/char/tty_io.c 2011-03-27 14:31:47.000000000 -0400 |
8624 |
++++ linux-2.6.32.39/drivers/char/tty_io.c 2011-04-17 15:56:46.000000000 -0400 |
8625 |
@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list |
8626 |
DEFINE_MUTEX(tty_mutex); |
8627 |
EXPORT_SYMBOL(tty_mutex); |
8628 |
@@ -25917,9 +25672,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tty_io.c linux-2.6.32.38/drivers/char/tt |
8629 |
/* |
8630 |
* Initialize the console device. This is called *early*, so |
8631 |
* we can't necessarily depend on lots of kernel help here. |
8632 |
-diff -urNp linux-2.6.32.38/drivers/char/tty_ldisc.c linux-2.6.32.38/drivers/char/tty_ldisc.c |
8633 |
---- linux-2.6.32.38/drivers/char/tty_ldisc.c 2011-03-27 14:31:47.000000000 -0400 |
8634 |
-+++ linux-2.6.32.38/drivers/char/tty_ldisc.c 2011-04-17 15:56:46.000000000 -0400 |
8635 |
+diff -urNp linux-2.6.32.39/drivers/char/tty_ldisc.c linux-2.6.32.39/drivers/char/tty_ldisc.c |
8636 |
+--- linux-2.6.32.39/drivers/char/tty_ldisc.c 2011-03-27 14:31:47.000000000 -0400 |
8637 |
++++ linux-2.6.32.39/drivers/char/tty_ldisc.c 2011-04-17 15:56:46.000000000 -0400 |
8638 |
@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc * |
8639 |
if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { |
8640 |
struct tty_ldisc_ops *ldo = ld->ops; |
8641 |
@@ -25965,9 +25720,9 @@ diff -urNp linux-2.6.32.38/drivers/char/tty_ldisc.c linux-2.6.32.38/drivers/char |
8642 |
module_put(ldops->owner); |
8643 |
spin_unlock_irqrestore(&tty_ldisc_lock, flags); |
8644 |
} |
8645 |
-diff -urNp linux-2.6.32.38/drivers/char/virtio_console.c linux-2.6.32.38/drivers/char/virtio_console.c |
8646 |
---- linux-2.6.32.38/drivers/char/virtio_console.c 2011-03-27 14:31:47.000000000 -0400 |
8647 |
-+++ linux-2.6.32.38/drivers/char/virtio_console.c 2011-04-17 15:56:46.000000000 -0400 |
8648 |
+diff -urNp linux-2.6.32.39/drivers/char/virtio_console.c linux-2.6.32.39/drivers/char/virtio_console.c |
8649 |
+--- linux-2.6.32.39/drivers/char/virtio_console.c 2011-03-27 14:31:47.000000000 -0400 |
8650 |
++++ linux-2.6.32.39/drivers/char/virtio_console.c 2011-04-17 15:56:46.000000000 -0400 |
8651 |
@@ -44,6 +44,7 @@ static unsigned int in_len; |
8652 |
static char *in, *inbuf; |
8653 |
|
8654 |
@@ -25976,9 +25731,9 @@ diff -urNp linux-2.6.32.38/drivers/char/virtio_console.c linux-2.6.32.38/drivers |
8655 |
static struct hv_ops virtio_cons; |
8656 |
|
8657 |
/* The hvc device */ |
8658 |
-diff -urNp linux-2.6.32.38/drivers/char/vt.c linux-2.6.32.38/drivers/char/vt.c |
8659 |
---- linux-2.6.32.38/drivers/char/vt.c 2011-03-27 14:31:47.000000000 -0400 |
8660 |
-+++ linux-2.6.32.38/drivers/char/vt.c 2011-04-17 15:56:46.000000000 -0400 |
8661 |
+diff -urNp linux-2.6.32.39/drivers/char/vt.c linux-2.6.32.39/drivers/char/vt.c |
8662 |
+--- linux-2.6.32.39/drivers/char/vt.c 2011-03-27 14:31:47.000000000 -0400 |
8663 |
++++ linux-2.6.32.39/drivers/char/vt.c 2011-04-17 15:56:46.000000000 -0400 |
8664 |
@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier |
8665 |
|
8666 |
static void notify_write(struct vc_data *vc, unsigned int unicode) |
8667 |
@@ -25988,9 +25743,9 @@ diff -urNp linux-2.6.32.38/drivers/char/vt.c linux-2.6.32.38/drivers/char/vt.c |
8668 |
atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); |
8669 |
} |
8670 |
|
8671 |
-diff -urNp linux-2.6.32.38/drivers/char/vt_ioctl.c linux-2.6.32.38/drivers/char/vt_ioctl.c |
8672 |
---- linux-2.6.32.38/drivers/char/vt_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
8673 |
-+++ linux-2.6.32.38/drivers/char/vt_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
8674 |
+diff -urNp linux-2.6.32.39/drivers/char/vt_ioctl.c linux-2.6.32.39/drivers/char/vt_ioctl.c |
8675 |
+--- linux-2.6.32.39/drivers/char/vt_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
8676 |
++++ linux-2.6.32.39/drivers/char/vt_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
8677 |
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ |
8678 |
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) |
8679 |
return -EFAULT; |
8680 |
@@ -26034,9 +25789,9 @@ diff -urNp linux-2.6.32.38/drivers/char/vt_ioctl.c linux-2.6.32.38/drivers/char/ |
8681 |
if (!perm) { |
8682 |
ret = -EPERM; |
8683 |
goto reterr; |
8684 |
-diff -urNp linux-2.6.32.38/drivers/cpufreq/cpufreq.c linux-2.6.32.38/drivers/cpufreq/cpufreq.c |
8685 |
---- linux-2.6.32.38/drivers/cpufreq/cpufreq.c 2011-03-27 14:31:47.000000000 -0400 |
8686 |
-+++ linux-2.6.32.38/drivers/cpufreq/cpufreq.c 2011-04-17 15:56:46.000000000 -0400 |
8687 |
+diff -urNp linux-2.6.32.39/drivers/cpufreq/cpufreq.c linux-2.6.32.39/drivers/cpufreq/cpufreq.c |
8688 |
+--- linux-2.6.32.39/drivers/cpufreq/cpufreq.c 2011-03-27 14:31:47.000000000 -0400 |
8689 |
++++ linux-2.6.32.39/drivers/cpufreq/cpufreq.c 2011-04-17 15:56:46.000000000 -0400 |
8690 |
@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct |
8691 |
complete(&policy->kobj_unregister); |
8692 |
} |
8693 |
@@ -26046,9 +25801,9 @@ diff -urNp linux-2.6.32.38/drivers/cpufreq/cpufreq.c linux-2.6.32.38/drivers/cpu |
8694 |
.show = show, |
8695 |
.store = store, |
8696 |
}; |
8697 |
-diff -urNp linux-2.6.32.38/drivers/cpuidle/sysfs.c linux-2.6.32.38/drivers/cpuidle/sysfs.c |
8698 |
---- linux-2.6.32.38/drivers/cpuidle/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8699 |
-+++ linux-2.6.32.38/drivers/cpuidle/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8700 |
+diff -urNp linux-2.6.32.39/drivers/cpuidle/sysfs.c linux-2.6.32.39/drivers/cpuidle/sysfs.c |
8701 |
+--- linux-2.6.32.39/drivers/cpuidle/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8702 |
++++ linux-2.6.32.39/drivers/cpuidle/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8703 |
@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj |
8704 |
return ret; |
8705 |
} |
8706 |
@@ -26076,9 +25831,9 @@ diff -urNp linux-2.6.32.38/drivers/cpuidle/sysfs.c linux-2.6.32.38/drivers/cpuid |
8707 |
{ |
8708 |
kobject_put(&device->kobjs[i]->kobj); |
8709 |
wait_for_completion(&device->kobjs[i]->kobj_unregister); |
8710 |
-diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.c linux-2.6.32.38/drivers/dma/ioat/dma.c |
8711 |
---- linux-2.6.32.38/drivers/dma/ioat/dma.c 2011-03-27 14:31:47.000000000 -0400 |
8712 |
-+++ linux-2.6.32.38/drivers/dma/ioat/dma.c 2011-04-17 15:56:46.000000000 -0400 |
8713 |
+diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.c linux-2.6.32.39/drivers/dma/ioat/dma.c |
8714 |
+--- linux-2.6.32.39/drivers/dma/ioat/dma.c 2011-03-27 14:31:47.000000000 -0400 |
8715 |
++++ linux-2.6.32.39/drivers/dma/ioat/dma.c 2011-04-17 15:56:46.000000000 -0400 |
8716 |
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str |
8717 |
return entry->show(&chan->common, page); |
8718 |
} |
8719 |
@@ -26088,9 +25843,9 @@ diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.c linux-2.6.32.38/drivers/dma/io |
8720 |
.show = ioat_attr_show, |
8721 |
}; |
8722 |
|
8723 |
-diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.h linux-2.6.32.38/drivers/dma/ioat/dma.h |
8724 |
---- linux-2.6.32.38/drivers/dma/ioat/dma.h 2011-03-27 14:31:47.000000000 -0400 |
8725 |
-+++ linux-2.6.32.38/drivers/dma/ioat/dma.h 2011-04-17 15:56:46.000000000 -0400 |
8726 |
+diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.h linux-2.6.32.39/drivers/dma/ioat/dma.h |
8727 |
+--- linux-2.6.32.39/drivers/dma/ioat/dma.h 2011-03-27 14:31:47.000000000 -0400 |
8728 |
++++ linux-2.6.32.39/drivers/dma/ioat/dma.h 2011-04-17 15:56:46.000000000 -0400 |
8729 |
@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c |
8730 |
unsigned long *phys_complete); |
8731 |
void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); |
8732 |
@@ -26100,29 +25855,9 @@ diff -urNp linux-2.6.32.38/drivers/dma/ioat/dma.h linux-2.6.32.38/drivers/dma/io |
8733 |
extern struct ioat_sysfs_entry ioat_version_attr; |
8734 |
extern struct ioat_sysfs_entry ioat_cap_attr; |
8735 |
#endif /* IOATDMA_H */ |
8736 |
-diff -urNp linux-2.6.32.38/drivers/edac/edac_core.h linux-2.6.32.38/drivers/edac/edac_core.h |
8737 |
---- linux-2.6.32.38/drivers/edac/edac_core.h 2011-03-27 14:31:47.000000000 -0400 |
8738 |
-+++ linux-2.6.32.38/drivers/edac/edac_core.h 2011-04-17 15:56:46.000000000 -0400 |
8739 |
-@@ -99,11 +99,11 @@ extern int edac_debug_level; |
8740 |
- |
8741 |
- #else /* !CONFIG_EDAC_DEBUG */ |
8742 |
- |
8743 |
--#define debugf0( ... ) |
8744 |
--#define debugf1( ... ) |
8745 |
--#define debugf2( ... ) |
8746 |
--#define debugf3( ... ) |
8747 |
--#define debugf4( ... ) |
8748 |
-+#define debugf0( ... ) do {} while (0) |
8749 |
-+#define debugf1( ... ) do {} while (0) |
8750 |
-+#define debugf2( ... ) do {} while (0) |
8751 |
-+#define debugf3( ... ) do {} while (0) |
8752 |
-+#define debugf4( ... ) do {} while (0) |
8753 |
- |
8754 |
- #endif /* !CONFIG_EDAC_DEBUG */ |
8755 |
- |
8756 |
-diff -urNp linux-2.6.32.38/drivers/edac/edac_device_sysfs.c linux-2.6.32.38/drivers/edac/edac_device_sysfs.c |
8757 |
---- linux-2.6.32.38/drivers/edac/edac_device_sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8758 |
-+++ linux-2.6.32.38/drivers/edac/edac_device_sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8759 |
+diff -urNp linux-2.6.32.39/drivers/edac/edac_device_sysfs.c linux-2.6.32.39/drivers/edac/edac_device_sysfs.c |
8760 |
+--- linux-2.6.32.39/drivers/edac/edac_device_sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8761 |
++++ linux-2.6.32.39/drivers/edac/edac_device_sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8762 |
@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s |
8763 |
} |
8764 |
|
8765 |
@@ -26150,9 +25885,9 @@ diff -urNp linux-2.6.32.38/drivers/edac/edac_device_sysfs.c linux-2.6.32.38/driv |
8766 |
.show = edac_dev_block_show, |
8767 |
.store = edac_dev_block_store |
8768 |
}; |
8769 |
-diff -urNp linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c |
8770 |
---- linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8771 |
-+++ linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8772 |
+diff -urNp linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c |
8773 |
+--- linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8774 |
++++ linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8775 |
@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob |
8776 |
return -EIO; |
8777 |
} |
8778 |
@@ -26171,9 +25906,9 @@ diff -urNp linux-2.6.32.38/drivers/edac/edac_mc_sysfs.c linux-2.6.32.38/drivers/ |
8779 |
.show = mcidev_show, |
8780 |
.store = mcidev_store |
8781 |
}; |
8782 |
-diff -urNp linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c |
8783 |
---- linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8784 |
-+++ linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8785 |
+diff -urNp linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c |
8786 |
+--- linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
8787 |
++++ linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
8788 |
@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s |
8789 |
} |
8790 |
|
8791 |
@@ -26192,9 +25927,9 @@ diff -urNp linux-2.6.32.38/drivers/edac/edac_pci_sysfs.c linux-2.6.32.38/drivers |
8792 |
.show = edac_pci_dev_show, |
8793 |
.store = edac_pci_dev_store |
8794 |
}; |
8795 |
-diff -urNp linux-2.6.32.38/drivers/firewire/core-cdev.c linux-2.6.32.38/drivers/firewire/core-cdev.c |
8796 |
---- linux-2.6.32.38/drivers/firewire/core-cdev.c 2011-03-27 14:31:47.000000000 -0400 |
8797 |
-+++ linux-2.6.32.38/drivers/firewire/core-cdev.c 2011-04-17 15:56:46.000000000 -0400 |
8798 |
+diff -urNp linux-2.6.32.39/drivers/firewire/core-cdev.c linux-2.6.32.39/drivers/firewire/core-cdev.c |
8799 |
+--- linux-2.6.32.39/drivers/firewire/core-cdev.c 2011-03-27 14:31:47.000000000 -0400 |
8800 |
++++ linux-2.6.32.39/drivers/firewire/core-cdev.c 2011-04-17 15:56:46.000000000 -0400 |
8801 |
@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie |
8802 |
int ret; |
8803 |
|
8804 |
@@ -26205,9 +25940,9 @@ diff -urNp linux-2.6.32.38/drivers/firewire/core-cdev.c linux-2.6.32.38/drivers/ |
8805 |
return -EINVAL; |
8806 |
|
8807 |
r = kmalloc(sizeof(*r), GFP_KERNEL); |
8808 |
-diff -urNp linux-2.6.32.38/drivers/firmware/dmi_scan.c linux-2.6.32.38/drivers/firmware/dmi_scan.c |
8809 |
---- linux-2.6.32.38/drivers/firmware/dmi_scan.c 2011-03-27 14:31:47.000000000 -0400 |
8810 |
-+++ linux-2.6.32.38/drivers/firmware/dmi_scan.c 2011-04-17 15:56:46.000000000 -0400 |
8811 |
+diff -urNp linux-2.6.32.39/drivers/firmware/dmi_scan.c linux-2.6.32.39/drivers/firmware/dmi_scan.c |
8812 |
+--- linux-2.6.32.39/drivers/firmware/dmi_scan.c 2011-03-27 14:31:47.000000000 -0400 |
8813 |
++++ linux-2.6.32.39/drivers/firmware/dmi_scan.c 2011-04-17 15:56:46.000000000 -0400 |
8814 |
@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) |
8815 |
} |
8816 |
} |
8817 |
@@ -26220,9 +25955,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/dmi_scan.c linux-2.6.32.38/drivers/f |
8818 |
p = dmi_ioremap(0xF0000, 0x10000); |
8819 |
if (p == NULL) |
8820 |
goto error; |
8821 |
-diff -urNp linux-2.6.32.38/drivers/firmware/edd.c linux-2.6.32.38/drivers/firmware/edd.c |
8822 |
---- linux-2.6.32.38/drivers/firmware/edd.c 2011-03-27 14:31:47.000000000 -0400 |
8823 |
-+++ linux-2.6.32.38/drivers/firmware/edd.c 2011-04-17 15:56:46.000000000 -0400 |
8824 |
+diff -urNp linux-2.6.32.39/drivers/firmware/edd.c linux-2.6.32.39/drivers/firmware/edd.c |
8825 |
+--- linux-2.6.32.39/drivers/firmware/edd.c 2011-03-27 14:31:47.000000000 -0400 |
8826 |
++++ linux-2.6.32.39/drivers/firmware/edd.c 2011-04-17 15:56:46.000000000 -0400 |
8827 |
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str |
8828 |
return ret; |
8829 |
} |
8830 |
@@ -26232,9 +25967,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/edd.c linux-2.6.32.38/drivers/firmwa |
8831 |
.show = edd_attr_show, |
8832 |
}; |
8833 |
|
8834 |
-diff -urNp linux-2.6.32.38/drivers/firmware/efivars.c linux-2.6.32.38/drivers/firmware/efivars.c |
8835 |
---- linux-2.6.32.38/drivers/firmware/efivars.c 2011-03-27 14:31:47.000000000 -0400 |
8836 |
-+++ linux-2.6.32.38/drivers/firmware/efivars.c 2011-04-17 15:56:46.000000000 -0400 |
8837 |
+diff -urNp linux-2.6.32.39/drivers/firmware/efivars.c linux-2.6.32.39/drivers/firmware/efivars.c |
8838 |
+--- linux-2.6.32.39/drivers/firmware/efivars.c 2011-03-27 14:31:47.000000000 -0400 |
8839 |
++++ linux-2.6.32.39/drivers/firmware/efivars.c 2011-04-17 15:56:46.000000000 -0400 |
8840 |
@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct |
8841 |
return ret; |
8842 |
} |
8843 |
@@ -26244,9 +25979,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/efivars.c linux-2.6.32.38/drivers/fi |
8844 |
.show = efivar_attr_show, |
8845 |
.store = efivar_attr_store, |
8846 |
}; |
8847 |
-diff -urNp linux-2.6.32.38/drivers/firmware/iscsi_ibft.c linux-2.6.32.38/drivers/firmware/iscsi_ibft.c |
8848 |
---- linux-2.6.32.38/drivers/firmware/iscsi_ibft.c 2011-03-27 14:31:47.000000000 -0400 |
8849 |
-+++ linux-2.6.32.38/drivers/firmware/iscsi_ibft.c 2011-04-17 15:56:46.000000000 -0400 |
8850 |
+diff -urNp linux-2.6.32.39/drivers/firmware/iscsi_ibft.c linux-2.6.32.39/drivers/firmware/iscsi_ibft.c |
8851 |
+--- linux-2.6.32.39/drivers/firmware/iscsi_ibft.c 2011-03-27 14:31:47.000000000 -0400 |
8852 |
++++ linux-2.6.32.39/drivers/firmware/iscsi_ibft.c 2011-04-17 15:56:46.000000000 -0400 |
8853 |
@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc |
8854 |
return ret; |
8855 |
} |
8856 |
@@ -26256,9 +25991,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/iscsi_ibft.c linux-2.6.32.38/drivers |
8857 |
.show = ibft_show_attribute, |
8858 |
}; |
8859 |
|
8860 |
-diff -urNp linux-2.6.32.38/drivers/firmware/memmap.c linux-2.6.32.38/drivers/firmware/memmap.c |
8861 |
---- linux-2.6.32.38/drivers/firmware/memmap.c 2011-03-27 14:31:47.000000000 -0400 |
8862 |
-+++ linux-2.6.32.38/drivers/firmware/memmap.c 2011-04-17 15:56:46.000000000 -0400 |
8863 |
+diff -urNp linux-2.6.32.39/drivers/firmware/memmap.c linux-2.6.32.39/drivers/firmware/memmap.c |
8864 |
+--- linux-2.6.32.39/drivers/firmware/memmap.c 2011-03-27 14:31:47.000000000 -0400 |
8865 |
++++ linux-2.6.32.39/drivers/firmware/memmap.c 2011-04-17 15:56:46.000000000 -0400 |
8866 |
@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { |
8867 |
NULL |
8868 |
}; |
8869 |
@@ -26268,9 +26003,9 @@ diff -urNp linux-2.6.32.38/drivers/firmware/memmap.c linux-2.6.32.38/drivers/fir |
8870 |
.show = memmap_attr_show, |
8871 |
}; |
8872 |
|
8873 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c |
8874 |
---- linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c 2011-03-27 14:31:47.000000000 -0400 |
8875 |
-+++ linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:56:46.000000000 -0400 |
8876 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c |
8877 |
+--- linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c 2011-03-27 14:31:47.000000000 -0400 |
8878 |
++++ linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:56:46.000000000 -0400 |
8879 |
@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d |
8880 |
struct drm_crtc *tmp; |
8881 |
int crtc_mask = 1; |
8882 |
@@ -26280,9 +26015,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.38/dri |
8883 |
|
8884 |
dev = crtc->dev; |
8885 |
|
8886 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_drv.c linux-2.6.32.38/drivers/gpu/drm/drm_drv.c |
8887 |
---- linux-2.6.32.38/drivers/gpu/drm/drm_drv.c 2011-03-27 14:31:47.000000000 -0400 |
8888 |
-+++ linux-2.6.32.38/drivers/gpu/drm/drm_drv.c 2011-04-17 15:56:46.000000000 -0400 |
8889 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_drv.c linux-2.6.32.39/drivers/gpu/drm/drm_drv.c |
8890 |
+--- linux-2.6.32.39/drivers/gpu/drm/drm_drv.c 2011-03-27 14:31:47.000000000 -0400 |
8891 |
++++ linux-2.6.32.39/drivers/gpu/drm/drm_drv.c 2011-04-17 15:56:46.000000000 -0400 |
8892 |
@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc |
8893 |
char *kdata = NULL; |
8894 |
|
8895 |
@@ -26292,9 +26027,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_drv.c linux-2.6.32.38/drivers/gpu |
8896 |
++file_priv->ioctl_count; |
8897 |
|
8898 |
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", |
8899 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_fops.c linux-2.6.32.38/drivers/gpu/drm/drm_fops.c |
8900 |
---- linux-2.6.32.38/drivers/gpu/drm/drm_fops.c 2011-03-27 14:31:47.000000000 -0400 |
8901 |
-+++ linux-2.6.32.38/drivers/gpu/drm/drm_fops.c 2011-04-17 15:56:46.000000000 -0400 |
8902 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_fops.c linux-2.6.32.39/drivers/gpu/drm/drm_fops.c |
8903 |
+--- linux-2.6.32.39/drivers/gpu/drm/drm_fops.c 2011-03-27 14:31:47.000000000 -0400 |
8904 |
++++ linux-2.6.32.39/drivers/gpu/drm/drm_fops.c 2011-04-17 15:56:46.000000000 -0400 |
8905 |
@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * |
8906 |
} |
8907 |
|
8908 |
@@ -26346,9 +26081,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_fops.c linux-2.6.32.38/drivers/gp |
8909 |
if (atomic_read(&dev->ioctl_count)) { |
8910 |
DRM_ERROR("Device busy: %d\n", |
8911 |
atomic_read(&dev->ioctl_count)); |
8912 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_gem.c linux-2.6.32.38/drivers/gpu/drm/drm_gem.c |
8913 |
---- linux-2.6.32.38/drivers/gpu/drm/drm_gem.c 2011-03-27 14:31:47.000000000 -0400 |
8914 |
-+++ linux-2.6.32.38/drivers/gpu/drm/drm_gem.c 2011-04-17 15:56:46.000000000 -0400 |
8915 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_gem.c linux-2.6.32.39/drivers/gpu/drm/drm_gem.c |
8916 |
+--- linux-2.6.32.39/drivers/gpu/drm/drm_gem.c 2011-03-27 14:31:47.000000000 -0400 |
8917 |
++++ linux-2.6.32.39/drivers/gpu/drm/drm_gem.c 2011-04-17 15:56:46.000000000 -0400 |
8918 |
@@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev) |
8919 |
spin_lock_init(&dev->object_name_lock); |
8920 |
idr_init(&dev->object_name_idr); |
8921 |
@@ -26382,9 +26117,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_gem.c linux-2.6.32.38/drivers/gpu |
8922 |
kfree(obj); |
8923 |
} |
8924 |
EXPORT_SYMBOL(drm_gem_object_free); |
8925 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_info.c linux-2.6.32.38/drivers/gpu/drm/drm_info.c |
8926 |
---- linux-2.6.32.38/drivers/gpu/drm/drm_info.c 2011-03-27 14:31:47.000000000 -0400 |
8927 |
-+++ linux-2.6.32.38/drivers/gpu/drm/drm_info.c 2011-04-17 15:56:46.000000000 -0400 |
8928 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_info.c linux-2.6.32.39/drivers/gpu/drm/drm_info.c |
8929 |
+--- linux-2.6.32.39/drivers/gpu/drm/drm_info.c 2011-03-27 14:31:47.000000000 -0400 |
8930 |
++++ linux-2.6.32.39/drivers/gpu/drm/drm_info.c 2011-04-17 15:56:46.000000000 -0400 |
8931 |
@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void |
8932 |
struct drm_local_map *map; |
8933 |
struct drm_map_list *r_list; |
8934 |
@@ -26464,9 +26199,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_info.c linux-2.6.32.38/drivers/gp |
8935 |
|
8936 |
#if defined(__i386__) |
8937 |
pgprot = pgprot_val(vma->vm_page_prot); |
8938 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c |
8939 |
---- linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
8940 |
-+++ linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
8941 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c |
8942 |
+--- linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
8943 |
++++ linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
8944 |
@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, |
8945 |
stats->data[i].value = |
8946 |
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); |
8947 |
@@ -26476,9 +26211,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.38/drivers/g |
8948 |
stats->data[i].type = dev->types[i]; |
8949 |
} |
8950 |
|
8951 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_lock.c linux-2.6.32.38/drivers/gpu/drm/drm_lock.c |
8952 |
---- linux-2.6.32.38/drivers/gpu/drm/drm_lock.c 2011-03-27 14:31:47.000000000 -0400 |
8953 |
-+++ linux-2.6.32.38/drivers/gpu/drm/drm_lock.c 2011-04-17 15:56:46.000000000 -0400 |
8954 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_lock.c linux-2.6.32.39/drivers/gpu/drm/drm_lock.c |
8955 |
+--- linux-2.6.32.39/drivers/gpu/drm/drm_lock.c 2011-03-27 14:31:47.000000000 -0400 |
8956 |
++++ linux-2.6.32.39/drivers/gpu/drm/drm_lock.c 2011-04-17 15:56:46.000000000 -0400 |
8957 |
@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi |
8958 |
if (drm_lock_take(&master->lock, lock->context)) { |
8959 |
master->lock.file_priv = file_priv; |
8960 |
@@ -26497,9 +26232,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/drm_lock.c linux-2.6.32.38/drivers/gp |
8961 |
|
8962 |
/* kernel_context_switch isn't used by any of the x86 drm |
8963 |
* modules but is required by the Sparc driver. |
8964 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c |
8965 |
---- linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c 2011-03-27 14:31:47.000000000 -0400 |
8966 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:56:46.000000000 -0400 |
8967 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c |
8968 |
+--- linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c 2011-03-27 14:31:47.000000000 -0400 |
8969 |
++++ linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:56:46.000000000 -0400 |
8970 |
@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de |
8971 |
dma->buflist[vertex->idx], |
8972 |
vertex->discard, vertex->used); |
8973 |
@@ -26522,9 +26257,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.38/drive |
8974 |
sarea_priv->last_enqueue = dev_priv->counter - 1; |
8975 |
sarea_priv->last_dispatch = (int)hw_status[5]; |
8976 |
|
8977 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c |
8978 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-27 14:31:47.000000000 -0400 |
8979 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:56:46.000000000 -0400 |
8980 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c |
8981 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-27 14:31:47.000000000 -0400 |
8982 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:56:46.000000000 -0400 |
8983 |
@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ |
8984 |
} |
8985 |
} |
8986 |
@@ -26534,9 +26269,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.38/dri |
8987 |
.init = ch7017_init, |
8988 |
.detect = ch7017_detect, |
8989 |
.mode_valid = ch7017_mode_valid, |
8990 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c |
8991 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-27 14:31:47.000000000 -0400 |
8992 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:56:46.000000000 -0400 |
8993 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c |
8994 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-27 14:31:47.000000000 -0400 |
8995 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:56:46.000000000 -0400 |
8996 |
@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ |
8997 |
} |
8998 |
} |
8999 |
@@ -26546,9 +26281,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.38/dri |
9000 |
.init = ch7xxx_init, |
9001 |
.detect = ch7xxx_detect, |
9002 |
.mode_valid = ch7xxx_mode_valid, |
9003 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h |
9004 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h 2011-03-27 14:31:47.000000000 -0400 |
9005 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:56:46.000000000 -0400 |
9006 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h |
9007 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h 2011-03-27 14:31:47.000000000 -0400 |
9008 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:56:46.000000000 -0400 |
9009 |
@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { |
9010 |
* |
9011 |
* \return singly-linked list of modes or NULL if no modes found. |
9012 |
@@ -26581,9 +26316,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo.h linux-2.6.32.38/drivers/gp |
9013 |
+extern const struct intel_dvo_dev_ops ch7017_ops; |
9014 |
|
9015 |
#endif /* _INTEL_DVO_H */ |
9016 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c |
9017 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-27 14:31:47.000000000 -0400 |
9018 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:56:46.000000000 -0400 |
9019 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c |
9020 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-27 14:31:47.000000000 -0400 |
9021 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:56:46.000000000 -0400 |
9022 |
@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv |
9023 |
} |
9024 |
} |
9025 |
@@ -26593,9 +26328,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.38/drive |
9026 |
.init = ivch_init, |
9027 |
.dpms = ivch_dpms, |
9028 |
.save = ivch_save, |
9029 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c |
9030 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-27 14:31:47.000000000 -0400 |
9031 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:56:46.000000000 -0400 |
9032 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c |
9033 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-27 14:31:47.000000000 -0400 |
9034 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:56:46.000000000 -0400 |
9035 |
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ |
9036 |
} |
9037 |
} |
9038 |
@@ -26605,9 +26340,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.38/dri |
9039 |
.init = sil164_init, |
9040 |
.detect = sil164_detect, |
9041 |
.mode_valid = sil164_mode_valid, |
9042 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c |
9043 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-27 14:31:47.000000000 -0400 |
9044 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:56:46.000000000 -0400 |
9045 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c |
9046 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-27 14:31:47.000000000 -0400 |
9047 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:56:46.000000000 -0400 |
9048 |
@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ |
9049 |
} |
9050 |
} |
9051 |
@@ -26617,9 +26352,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.38/dri |
9052 |
.init = tfp410_init, |
9053 |
.detect = tfp410_detect, |
9054 |
.mode_valid = tfp410_mode_valid, |
9055 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c |
9056 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c 2011-03-27 14:31:47.000000000 -0400 |
9057 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:56:46.000000000 -0400 |
9058 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c |
9059 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c 2011-03-27 14:31:47.000000000 -0400 |
9060 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:56:46.000000000 -0400 |
9061 |
@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev) |
9062 |
return i915_resume(dev); |
9063 |
} |
9064 |
@@ -26629,9 +26364,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.38/drive |
9065 |
.fault = i915_gem_fault, |
9066 |
.open = drm_gem_vm_open, |
9067 |
.close = drm_gem_vm_close, |
9068 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c |
9069 |
---- linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c 2011-03-27 14:31:47.000000000 -0400 |
9070 |
-+++ linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c 2011-04-17 15:56:46.000000000 -0400 |
9071 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c |
9072 |
+--- linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c 2011-03-27 14:31:47.000000000 -0400 |
9073 |
++++ linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c 2011-04-17 15:56:46.000000000 -0400 |
9074 |
@@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d |
9075 |
|
9076 |
args->aper_size = dev->gtt_total; |
9077 |
@@ -26714,9 +26449,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.38/drive |
9078 |
} |
9079 |
i915_verify_inactive(dev, __FILE__, __LINE__); |
9080 |
} |
9081 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c |
9082 |
---- linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c 2011-03-27 14:31:47.000000000 -0400 |
9083 |
-+++ linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:56:46.000000000 -0400 |
9084 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c |
9085 |
+--- linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c 2011-03-27 14:31:47.000000000 -0400 |
9086 |
++++ linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:56:46.000000000 -0400 |
9087 |
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, |
9088 |
regex_t mask_rex; |
9089 |
regmatch_t match[4]; |
9090 |
@@ -26734,9 +26469,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.38/d |
9091 |
|
9092 |
if (regcomp |
9093 |
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { |
9094 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c |
9095 |
---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c 2011-03-27 14:31:47.000000000 -0400 |
9096 |
-+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c 2011-04-17 15:56:46.000000000 -0400 |
9097 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c |
9098 |
+--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-03-27 14:31:47.000000000 -0400 |
9099 |
++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c 2011-04-17 15:56:46.000000000 -0400 |
9100 |
@@ -520,13 +520,13 @@ static uint16_t atombios_get_connector_o |
9101 |
} |
9102 |
} |
9103 |
@@ -26761,9 +26496,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 |
9104 |
|
9105 |
atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); |
9106 |
|
9107 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c |
9108 |
---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c 2011-03-27 14:31:47.000000000 -0400 |
9109 |
-+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c 2011-04-17 15:56:46.000000000 -0400 |
9110 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c |
9111 |
+--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c 2011-03-27 14:31:47.000000000 -0400 |
9112 |
++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c 2011-04-17 15:56:46.000000000 -0400 |
9113 |
@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl |
9114 |
|
9115 |
if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { |
9116 |
@@ -26773,10 +26508,10 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32. |
9117 |
} else |
9118 |
error = abs(current_freq - freq); |
9119 |
vco_diff = abs(vco - best_vco); |
9120 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c |
9121 |
---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-27 14:31:47.000000000 -0400 |
9122 |
-+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-17 15:56:46.000000000 -0400 |
9123 |
-@@ -289,7 +289,7 @@ static int compat_radeon_cp_getparam(str |
9124 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c |
9125 |
+--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-27 14:31:47.000000000 -0400 |
9126 |
++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-23 13:57:24.000000000 -0400 |
9127 |
+@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str |
9128 |
request = compat_alloc_user_space(sizeof(*request)); |
9129 |
if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) |
9130 |
|| __put_user(req32.param, &request->param) |
9131 |
@@ -26785,9 +26520,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.38 |
9132 |
&request->value)) |
9133 |
return -EFAULT; |
9134 |
|
9135 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c |
9136 |
---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c 2011-03-27 14:31:47.000000000 -0400 |
9137 |
-+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:56:46.000000000 -0400 |
9138 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c |
9139 |
+--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c 2011-03-27 14:31:47.000000000 -0400 |
9140 |
++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:56:46.000000000 -0400 |
9141 |
@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm |
9142 |
{ |
9143 |
drm_radeon_private_t *dev_priv = dev->dev_private; |
9144 |
@@ -26797,9 +26532,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.38 |
9145 |
|
9146 |
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); |
9147 |
|
9148 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c |
9149 |
---- linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-27 14:31:47.000000000 -0400 |
9150 |
-+++ linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:56:46.000000000 -0400 |
9151 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c |
9152 |
+--- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-27 14:31:47.000000000 -0400 |
9153 |
++++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:56:46.000000000 -0400 |
9154 |
@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic |
9155 |
DRM_INFO("radeon: ttm finalized\n"); |
9156 |
} |
9157 |
@@ -26851,9 +26586,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.38/d |
9158 |
} |
9159 |
|
9160 |
|
9161 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c |
9162 |
---- linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c 2011-03-27 14:31:47.000000000 -0400 |
9163 |
-+++ linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:56:46.000000000 -0400 |
9164 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c |
9165 |
+--- linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c 2011-03-27 14:31:47.000000000 -0400 |
9166 |
++++ linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:56:46.000000000 -0400 |
9167 |
@@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct |
9168 |
if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && |
9169 |
rdev->pm.sideport_bandwidth.full) |
9170 |
@@ -26867,18 +26602,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.38/driver |
9171 |
} else { |
9172 |
if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && |
9173 |
rdev->pm.k8_bandwidth.full) |
9174 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c |
9175 |
---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-27 14:31:47.000000000 -0400 |
9176 |
-+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c 2011-04-17 15:56:46.000000000 -0400 |
9177 |
-@@ -39,7 +39,7 @@ |
9178 |
- #include <linux/module.h> |
9179 |
- |
9180 |
- #define TTM_ASSERT_LOCKED(param) |
9181 |
--#define TTM_DEBUG(fmt, arg...) |
9182 |
-+#define TTM_DEBUG(fmt, arg...) do {} while (0) |
9183 |
- #define TTM_BO_HASH_ORDER 13 |
9184 |
- |
9185 |
- static int ttm_bo_setup_vm(struct ttm_buffer_object *bo); |
9186 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c |
9187 |
+--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-27 14:31:47.000000000 -0400 |
9188 |
++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c 2011-04-23 12:56:11.000000000 -0400 |
9189 |
@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a |
9190 |
NULL |
9191 |
}; |
9192 |
@@ -26888,9 +26614,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.38/drivers/ |
9193 |
.show = &ttm_bo_global_show |
9194 |
}; |
9195 |
|
9196 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c |
9197 |
---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-27 14:31:47.000000000 -0400 |
9198 |
-+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:56:46.000000000 -0400 |
9199 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c |
9200 |
+--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-27 14:31:47.000000000 -0400 |
9201 |
++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:56:46.000000000 -0400 |
9202 |
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are |
9203 |
{ |
9204 |
struct ttm_buffer_object *bo = (struct ttm_buffer_object *) |
9205 |
@@ -26911,9 +26637,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.38/drive |
9206 |
/* |
9207 |
* Work around locking order reversal in fault / nopfn |
9208 |
* between mmap_sem and bo_reserve: Perform a trylock operation |
9209 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c |
9210 |
---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c 2011-03-27 14:31:47.000000000 -0400 |
9211 |
-+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c 2011-04-17 15:56:46.000000000 -0400 |
9212 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c |
9213 |
+--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c 2011-03-27 14:31:47.000000000 -0400 |
9214 |
++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c 2011-04-17 15:56:46.000000000 -0400 |
9215 |
@@ -36,7 +36,7 @@ |
9216 |
struct ttm_global_item { |
9217 |
struct mutex mutex; |
9218 |
@@ -26971,9 +26697,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.38/driv |
9219 |
ref->release(ref); |
9220 |
item->object = NULL; |
9221 |
} |
9222 |
-diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c |
9223 |
---- linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c 2011-03-27 14:31:47.000000000 -0400 |
9224 |
-+++ linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c 2011-04-17 15:56:46.000000000 -0400 |
9225 |
+diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c |
9226 |
+--- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c 2011-03-27 14:31:47.000000000 -0400 |
9227 |
++++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c 2011-04-17 15:56:46.000000000 -0400 |
9228 |
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at |
9229 |
NULL |
9230 |
}; |
9231 |
@@ -26983,9 +26709,9 @@ diff -urNp linux-2.6.32.38/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.38/driv |
9232 |
.show = &ttm_mem_zone_show, |
9233 |
.store = &ttm_mem_zone_store |
9234 |
}; |
9235 |
-diff -urNp linux-2.6.32.38/drivers/hid/usbhid/hiddev.c linux-2.6.32.38/drivers/hid/usbhid/hiddev.c |
9236 |
---- linux-2.6.32.38/drivers/hid/usbhid/hiddev.c 2011-03-27 14:31:47.000000000 -0400 |
9237 |
-+++ linux-2.6.32.38/drivers/hid/usbhid/hiddev.c 2011-04-17 15:56:46.000000000 -0400 |
9238 |
+diff -urNp linux-2.6.32.39/drivers/hid/usbhid/hiddev.c linux-2.6.32.39/drivers/hid/usbhid/hiddev.c |
9239 |
+--- linux-2.6.32.39/drivers/hid/usbhid/hiddev.c 2011-03-27 14:31:47.000000000 -0400 |
9240 |
++++ linux-2.6.32.39/drivers/hid/usbhid/hiddev.c 2011-04-17 15:56:46.000000000 -0400 |
9241 |
@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi |
9242 |
return put_user(HID_VERSION, (int __user *)arg); |
9243 |
|
9244 |
@@ -26995,57 +26721,9 @@ diff -urNp linux-2.6.32.38/drivers/hid/usbhid/hiddev.c linux-2.6.32.38/drivers/h |
9245 |
return -EINVAL; |
9246 |
|
9247 |
for (i = 0; i < hid->maxcollection; i++) |
9248 |
-diff -urNp linux-2.6.32.38/drivers/hwmon/k8temp.c linux-2.6.32.38/drivers/hwmon/k8temp.c |
9249 |
---- linux-2.6.32.38/drivers/hwmon/k8temp.c 2011-03-27 14:31:47.000000000 -0400 |
9250 |
-+++ linux-2.6.32.38/drivers/hwmon/k8temp.c 2011-04-17 15:56:46.000000000 -0400 |
9251 |
-@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n |
9252 |
- |
9253 |
- static struct pci_device_id k8temp_ids[] = { |
9254 |
- { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, |
9255 |
-- { 0 }, |
9256 |
-+ { 0, 0, 0, 0, 0, 0, 0 }, |
9257 |
- }; |
9258 |
- |
9259 |
- MODULE_DEVICE_TABLE(pci, k8temp_ids); |
9260 |
-diff -urNp linux-2.6.32.38/drivers/hwmon/sis5595.c linux-2.6.32.38/drivers/hwmon/sis5595.c |
9261 |
---- linux-2.6.32.38/drivers/hwmon/sis5595.c 2011-03-27 14:31:47.000000000 -0400 |
9262 |
-+++ linux-2.6.32.38/drivers/hwmon/sis5595.c 2011-04-17 15:56:46.000000000 -0400 |
9263 |
-@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda |
9264 |
- |
9265 |
- static struct pci_device_id sis5595_pci_ids[] = { |
9266 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, |
9267 |
-- { 0, } |
9268 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
9269 |
- }; |
9270 |
- |
9271 |
- MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); |
9272 |
-diff -urNp linux-2.6.32.38/drivers/hwmon/via686a.c linux-2.6.32.38/drivers/hwmon/via686a.c |
9273 |
---- linux-2.6.32.38/drivers/hwmon/via686a.c 2011-03-27 14:31:47.000000000 -0400 |
9274 |
-+++ linux-2.6.32.38/drivers/hwmon/via686a.c 2011-04-17 15:56:46.000000000 -0400 |
9275 |
-@@ -777,7 +777,7 @@ static struct via686a_data *via686a_upda |
9276 |
- |
9277 |
- static struct pci_device_id via686a_pci_ids[] = { |
9278 |
- { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) }, |
9279 |
-- { 0, } |
9280 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
9281 |
- }; |
9282 |
- |
9283 |
- MODULE_DEVICE_TABLE(pci, via686a_pci_ids); |
9284 |
-diff -urNp linux-2.6.32.38/drivers/hwmon/vt8231.c linux-2.6.32.38/drivers/hwmon/vt8231.c |
9285 |
---- linux-2.6.32.38/drivers/hwmon/vt8231.c 2011-03-27 14:31:47.000000000 -0400 |
9286 |
-+++ linux-2.6.32.38/drivers/hwmon/vt8231.c 2011-04-17 15:56:46.000000000 -0400 |
9287 |
-@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri |
9288 |
- |
9289 |
- static struct pci_device_id vt8231_pci_ids[] = { |
9290 |
- { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) }, |
9291 |
-- { 0, } |
9292 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
9293 |
- }; |
9294 |
- |
9295 |
- MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); |
9296 |
-diff -urNp linux-2.6.32.38/drivers/hwmon/w83791d.c linux-2.6.32.38/drivers/hwmon/w83791d.c |
9297 |
---- linux-2.6.32.38/drivers/hwmon/w83791d.c 2011-03-27 14:31:47.000000000 -0400 |
9298 |
-+++ linux-2.6.32.38/drivers/hwmon/w83791d.c 2011-04-17 15:56:46.000000000 -0400 |
9299 |
+diff -urNp linux-2.6.32.39/drivers/hwmon/w83791d.c linux-2.6.32.39/drivers/hwmon/w83791d.c |
9300 |
+--- linux-2.6.32.39/drivers/hwmon/w83791d.c 2011-03-27 14:31:47.000000000 -0400 |
9301 |
++++ linux-2.6.32.39/drivers/hwmon/w83791d.c 2011-04-17 15:56:46.000000000 -0400 |
9302 |
@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli |
9303 |
struct i2c_board_info *info); |
9304 |
static int w83791d_remove(struct i2c_client *client); |
9305 |
@@ -27057,66 +26735,9 @@ diff -urNp linux-2.6.32.38/drivers/hwmon/w83791d.c linux-2.6.32.38/drivers/hwmon |
9306 |
static struct w83791d_data *w83791d_update_device(struct device *dev); |
9307 |
|
9308 |
#ifdef DEBUG |
9309 |
-diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-i801.c linux-2.6.32.38/drivers/i2c/busses/i2c-i801.c |
9310 |
---- linux-2.6.32.38/drivers/i2c/busses/i2c-i801.c 2011-03-27 14:31:47.000000000 -0400 |
9311 |
-+++ linux-2.6.32.38/drivers/i2c/busses/i2c-i801.c 2011-04-17 15:56:46.000000000 -0400 |
9312 |
-@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = |
9313 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, |
9314 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, |
9315 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) }, |
9316 |
-- { 0, } |
9317 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
9318 |
- }; |
9319 |
- |
9320 |
- MODULE_DEVICE_TABLE (pci, i801_ids); |
9321 |
-diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.38/drivers/i2c/busses/i2c-piix4.c |
9322 |
---- linux-2.6.32.38/drivers/i2c/busses/i2c-piix4.c 2011-03-27 14:31:47.000000000 -0400 |
9323 |
-+++ linux-2.6.32.38/drivers/i2c/busses/i2c-piix4.c 2011-04-17 15:56:46.000000000 -0400 |
9324 |
-@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat |
9325 |
- .ident = "IBM", |
9326 |
- .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, |
9327 |
- }, |
9328 |
-- { }, |
9329 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9330 |
- }; |
9331 |
- |
9332 |
- static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, |
9333 |
-@@ -491,7 +491,7 @@ static struct pci_device_id piix4_ids[] |
9334 |
- PCI_DEVICE_ID_SERVERWORKS_HT1000SB) }, |
9335 |
- { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, |
9336 |
- PCI_DEVICE_ID_SERVERWORKS_HT1100LD) }, |
9337 |
-- { 0, } |
9338 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
9339 |
- }; |
9340 |
- |
9341 |
- MODULE_DEVICE_TABLE (pci, piix4_ids); |
9342 |
-diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.38/drivers/i2c/busses/i2c-sis630.c |
9343 |
---- linux-2.6.32.38/drivers/i2c/busses/i2c-sis630.c 2011-03-27 14:31:47.000000000 -0400 |
9344 |
-+++ linux-2.6.32.38/drivers/i2c/busses/i2c-sis630.c 2011-04-17 15:56:46.000000000 -0400 |
9345 |
-@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter |
9346 |
- static struct pci_device_id sis630_ids[] __devinitdata = { |
9347 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, |
9348 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) }, |
9349 |
-- { 0, } |
9350 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
9351 |
- }; |
9352 |
- |
9353 |
- MODULE_DEVICE_TABLE (pci, sis630_ids); |
9354 |
-diff -urNp linux-2.6.32.38/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.38/drivers/i2c/busses/i2c-sis96x.c |
9355 |
---- linux-2.6.32.38/drivers/i2c/busses/i2c-sis96x.c 2011-03-27 14:31:47.000000000 -0400 |
9356 |
-+++ linux-2.6.32.38/drivers/i2c/busses/i2c-sis96x.c 2011-04-17 15:56:46.000000000 -0400 |
9357 |
-@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter |
9358 |
- |
9359 |
- static struct pci_device_id sis96x_ids[] = { |
9360 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) }, |
9361 |
-- { 0, } |
9362 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
9363 |
- }; |
9364 |
- |
9365 |
- MODULE_DEVICE_TABLE (pci, sis96x_ids); |
9366 |
-diff -urNp linux-2.6.32.38/drivers/ide/ide-cd.c linux-2.6.32.38/drivers/ide/ide-cd.c |
9367 |
---- linux-2.6.32.38/drivers/ide/ide-cd.c 2011-03-27 14:31:47.000000000 -0400 |
9368 |
-+++ linux-2.6.32.38/drivers/ide/ide-cd.c 2011-04-17 15:56:46.000000000 -0400 |
9369 |
+diff -urNp linux-2.6.32.39/drivers/ide/ide-cd.c linux-2.6.32.39/drivers/ide/ide-cd.c |
9370 |
+--- linux-2.6.32.39/drivers/ide/ide-cd.c 2011-03-27 14:31:47.000000000 -0400 |
9371 |
++++ linux-2.6.32.39/drivers/ide/ide-cd.c 2011-04-17 15:56:46.000000000 -0400 |
9372 |
@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_ |
9373 |
alignment = queue_dma_alignment(q) | q->dma_pad_mask; |
9374 |
if ((unsigned long)buf & alignment |
9375 |
@@ -27126,9 +26747,9 @@ diff -urNp linux-2.6.32.38/drivers/ide/ide-cd.c linux-2.6.32.38/drivers/ide/ide- |
9376 |
drive->dma = 0; |
9377 |
} |
9378 |
} |
9379 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/dv1394.c linux-2.6.32.38/drivers/ieee1394/dv1394.c |
9380 |
---- linux-2.6.32.38/drivers/ieee1394/dv1394.c 2011-03-27 14:31:47.000000000 -0400 |
9381 |
-+++ linux-2.6.32.38/drivers/ieee1394/dv1394.c 2011-04-17 15:56:46.000000000 -0400 |
9382 |
+diff -urNp linux-2.6.32.39/drivers/ieee1394/dv1394.c linux-2.6.32.39/drivers/ieee1394/dv1394.c |
9383 |
+--- linux-2.6.32.39/drivers/ieee1394/dv1394.c 2011-03-27 14:31:47.000000000 -0400 |
9384 |
++++ linux-2.6.32.39/drivers/ieee1394/dv1394.c 2011-04-23 12:56:11.000000000 -0400 |
9385 |
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c |
9386 |
based upon DIF section and sequence |
9387 |
*/ |
9388 |
@@ -27138,30 +26759,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/dv1394.c linux-2.6.32.38/drivers/iee |
9389 |
frame_put_packet (struct frame *f, struct packet *p) |
9390 |
{ |
9391 |
int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */ |
9392 |
-@@ -2178,7 +2178,7 @@ static const struct ieee1394_device_id d |
9393 |
- .specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff, |
9394 |
- .version = AVC_SW_VERSION_ENTRY & 0xffffff |
9395 |
- }, |
9396 |
-- { } |
9397 |
-+ { 0, 0, 0, 0, 0, 0 } |
9398 |
- }; |
9399 |
- |
9400 |
- MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); |
9401 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/eth1394.c linux-2.6.32.38/drivers/ieee1394/eth1394.c |
9402 |
---- linux-2.6.32.38/drivers/ieee1394/eth1394.c 2011-03-27 14:31:47.000000000 -0400 |
9403 |
-+++ linux-2.6.32.38/drivers/ieee1394/eth1394.c 2011-04-17 15:56:46.000000000 -0400 |
9404 |
-@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e |
9405 |
- .specifier_id = ETHER1394_GASP_SPECIFIER_ID, |
9406 |
- .version = ETHER1394_GASP_VERSION, |
9407 |
- }, |
9408 |
-- {} |
9409 |
-+ { 0, 0, 0, 0, 0, 0 } |
9410 |
- }; |
9411 |
- |
9412 |
- MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); |
9413 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/hosts.c linux-2.6.32.38/drivers/ieee1394/hosts.c |
9414 |
---- linux-2.6.32.38/drivers/ieee1394/hosts.c 2011-03-27 14:31:47.000000000 -0400 |
9415 |
-+++ linux-2.6.32.38/drivers/ieee1394/hosts.c 2011-04-17 15:56:46.000000000 -0400 |
9416 |
+diff -urNp linux-2.6.32.39/drivers/ieee1394/hosts.c linux-2.6.32.39/drivers/ieee1394/hosts.c |
9417 |
+--- linux-2.6.32.39/drivers/ieee1394/hosts.c 2011-03-27 14:31:47.000000000 -0400 |
9418 |
++++ linux-2.6.32.39/drivers/ieee1394/hosts.c 2011-04-17 15:56:46.000000000 -0400 |
9419 |
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso |
9420 |
} |
9421 |
|
9422 |
@@ -27170,9 +26770,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/hosts.c linux-2.6.32.38/drivers/ieee |
9423 |
.transmit_packet = dummy_transmit_packet, |
9424 |
.devctl = dummy_devctl, |
9425 |
.isoctl = dummy_isoctl |
9426 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c |
9427 |
---- linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c 2011-03-27 14:31:47.000000000 -0400 |
9428 |
-+++ linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c 2011-04-17 15:56:46.000000000 -0400 |
9429 |
+diff -urNp linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c |
9430 |
+--- linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c 2011-03-27 14:31:47.000000000 -0400 |
9431 |
++++ linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c 2011-04-17 15:56:46.000000000 -0400 |
9432 |
@@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con |
9433 |
for (func = 0; func < 8; func++) { |
9434 |
u32 class = read_pci_config(num,slot,func, |
9435 |
@@ -27182,9 +26782,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.38/ |
9436 |
continue; /* No device at this func */ |
9437 |
|
9438 |
if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI) |
9439 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/ohci1394.c linux-2.6.32.38/drivers/ieee1394/ohci1394.c |
9440 |
---- linux-2.6.32.38/drivers/ieee1394/ohci1394.c 2011-03-27 14:31:47.000000000 -0400 |
9441 |
-+++ linux-2.6.32.38/drivers/ieee1394/ohci1394.c 2011-04-17 15:56:46.000000000 -0400 |
9442 |
+diff -urNp linux-2.6.32.39/drivers/ieee1394/ohci1394.c linux-2.6.32.39/drivers/ieee1394/ohci1394.c |
9443 |
+--- linux-2.6.32.39/drivers/ieee1394/ohci1394.c 2011-03-27 14:31:47.000000000 -0400 |
9444 |
++++ linux-2.6.32.39/drivers/ieee1394/ohci1394.c 2011-04-23 12:56:11.000000000 -0400 |
9445 |
@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ |
9446 |
printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) |
9447 |
|
9448 |
@@ -27197,39 +26797,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/ohci1394.c linux-2.6.32.38/drivers/i |
9449 |
|
9450 |
static void dma_trm_tasklet(unsigned long data); |
9451 |
static void dma_trm_reset(struct dma_trm_ctx *d); |
9452 |
-@@ -3449,7 +3449,7 @@ static struct pci_device_id ohci1394_pci |
9453 |
- .subvendor = PCI_ANY_ID, |
9454 |
- .subdevice = PCI_ANY_ID, |
9455 |
- }, |
9456 |
-- { 0, }, |
9457 |
-+ { 0, 0, 0, 0, 0, 0, 0 }, |
9458 |
- }; |
9459 |
- |
9460 |
- MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); |
9461 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/raw1394.c linux-2.6.32.38/drivers/ieee1394/raw1394.c |
9462 |
---- linux-2.6.32.38/drivers/ieee1394/raw1394.c 2011-03-27 14:31:47.000000000 -0400 |
9463 |
-+++ linux-2.6.32.38/drivers/ieee1394/raw1394.c 2011-04-17 15:56:46.000000000 -0400 |
9464 |
-@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r |
9465 |
- .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
9466 |
- .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, |
9467 |
- .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff}, |
9468 |
-- {} |
9469 |
-+ { 0, 0, 0, 0, 0, 0 } |
9470 |
- }; |
9471 |
- |
9472 |
- MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); |
9473 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/sbp2.c linux-2.6.32.38/drivers/ieee1394/sbp2.c |
9474 |
---- linux-2.6.32.38/drivers/ieee1394/sbp2.c 2011-03-27 14:31:47.000000000 -0400 |
9475 |
-+++ linux-2.6.32.38/drivers/ieee1394/sbp2.c 2011-04-17 15:56:46.000000000 -0400 |
9476 |
-@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s |
9477 |
- .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
9478 |
- .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, |
9479 |
- .version = SBP2_SW_VERSION_ENTRY & 0xffffff}, |
9480 |
-- {} |
9481 |
-+ { 0, 0, 0, 0, 0, 0 } |
9482 |
- }; |
9483 |
- MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table); |
9484 |
- |
9485 |
+diff -urNp linux-2.6.32.39/drivers/ieee1394/sbp2.c linux-2.6.32.39/drivers/ieee1394/sbp2.c |
9486 |
+--- linux-2.6.32.39/drivers/ieee1394/sbp2.c 2011-03-27 14:31:47.000000000 -0400 |
9487 |
++++ linux-2.6.32.39/drivers/ieee1394/sbp2.c 2011-04-23 12:56:11.000000000 -0400 |
9488 |
@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot |
9489 |
MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME); |
9490 |
MODULE_LICENSE("GPL"); |
9491 |
@@ -27239,21 +26809,9 @@ diff -urNp linux-2.6.32.38/drivers/ieee1394/sbp2.c linux-2.6.32.38/drivers/ieee1 |
9492 |
{ |
9493 |
int ret; |
9494 |
|
9495 |
-diff -urNp linux-2.6.32.38/drivers/ieee1394/video1394.c linux-2.6.32.38/drivers/ieee1394/video1394.c |
9496 |
---- linux-2.6.32.38/drivers/ieee1394/video1394.c 2011-03-27 14:31:47.000000000 -0400 |
9497 |
-+++ linux-2.6.32.38/drivers/ieee1394/video1394.c 2011-04-17 15:56:46.000000000 -0400 |
9498 |
-@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v |
9499 |
- .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, |
9500 |
- .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff |
9501 |
- }, |
9502 |
-- { } |
9503 |
-+ { 0, 0, 0, 0, 0, 0 } |
9504 |
- }; |
9505 |
- |
9506 |
- MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); |
9507 |
-diff -urNp linux-2.6.32.38/drivers/infiniband/core/cm.c linux-2.6.32.38/drivers/infiniband/core/cm.c |
9508 |
---- linux-2.6.32.38/drivers/infiniband/core/cm.c 2011-03-27 14:31:47.000000000 -0400 |
9509 |
-+++ linux-2.6.32.38/drivers/infiniband/core/cm.c 2011-04-17 15:56:46.000000000 -0400 |
9510 |
+diff -urNp linux-2.6.32.39/drivers/infiniband/core/cm.c linux-2.6.32.39/drivers/infiniband/core/cm.c |
9511 |
+--- linux-2.6.32.39/drivers/infiniband/core/cm.c 2011-03-27 14:31:47.000000000 -0400 |
9512 |
++++ linux-2.6.32.39/drivers/infiniband/core/cm.c 2011-04-17 15:56:46.000000000 -0400 |
9513 |
@@ -112,7 +112,7 @@ static char const counter_group_names[CM |
9514 |
|
9515 |
struct cm_counter_group { |
9516 |
@@ -27397,9 +26955,9 @@ diff -urNp linux-2.6.32.38/drivers/infiniband/core/cm.c linux-2.6.32.38/drivers/ |
9517 |
.show = cm_show_counter |
9518 |
}; |
9519 |
|
9520 |
-diff -urNp linux-2.6.32.38/drivers/infiniband/core/sysfs.c linux-2.6.32.38/drivers/infiniband/core/sysfs.c |
9521 |
---- linux-2.6.32.38/drivers/infiniband/core/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
9522 |
-+++ linux-2.6.32.38/drivers/infiniband/core/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
9523 |
+diff -urNp linux-2.6.32.39/drivers/infiniband/core/sysfs.c linux-2.6.32.39/drivers/infiniband/core/sysfs.c |
9524 |
+--- linux-2.6.32.39/drivers/infiniband/core/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
9525 |
++++ linux-2.6.32.39/drivers/infiniband/core/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
9526 |
@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob |
9527 |
return port_attr->show(p, port_attr, buf); |
9528 |
} |
9529 |
@@ -27409,9 +26967,9 @@ diff -urNp linux-2.6.32.38/drivers/infiniband/core/sysfs.c linux-2.6.32.38/drive |
9530 |
.show = port_attr_show |
9531 |
}; |
9532 |
|
9533 |
-diff -urNp linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c |
9534 |
---- linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c 2011-03-27 14:31:47.000000000 -0400 |
9535 |
-+++ linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c 2011-04-17 15:56:46.000000000 -0400 |
9536 |
+diff -urNp linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c |
9537 |
+--- linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c 2011-03-27 14:31:47.000000000 -0400 |
9538 |
++++ linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c 2011-04-17 15:56:46.000000000 -0400 |
9539 |
@@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u |
9540 |
dst->grh.sgid_index = src->grh.sgid_index; |
9541 |
dst->grh.hop_limit = src->grh.hop_limit; |
9542 |
@@ -27442,157 +27000,9 @@ diff -urNp linux-2.6.32.38/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3 |
9543 |
} |
9544 |
EXPORT_SYMBOL(ib_copy_qp_attr_to_user); |
9545 |
|
9546 |
-diff -urNp linux-2.6.32.38/drivers/input/keyboard/atkbd.c linux-2.6.32.38/drivers/input/keyboard/atkbd.c |
9547 |
---- linux-2.6.32.38/drivers/input/keyboard/atkbd.c 2011-03-27 14:31:47.000000000 -0400 |
9548 |
-+++ linux-2.6.32.38/drivers/input/keyboard/atkbd.c 2011-04-17 15:56:46.000000000 -0400 |
9549 |
-@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri |
9550 |
- .id = SERIO_ANY, |
9551 |
- .extra = SERIO_ANY, |
9552 |
- }, |
9553 |
-- { 0 } |
9554 |
-+ { 0, 0, 0, 0 } |
9555 |
- }; |
9556 |
- |
9557 |
- MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); |
9558 |
-diff -urNp linux-2.6.32.38/drivers/input/mouse/lifebook.c linux-2.6.32.38/drivers/input/mouse/lifebook.c |
9559 |
---- linux-2.6.32.38/drivers/input/mouse/lifebook.c 2011-03-27 14:31:47.000000000 -0400 |
9560 |
-+++ linux-2.6.32.38/drivers/input/mouse/lifebook.c 2011-04-17 15:56:46.000000000 -0400 |
9561 |
-@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo |
9562 |
- DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), |
9563 |
- }, |
9564 |
- }, |
9565 |
-- { } |
9566 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} |
9567 |
- }; |
9568 |
- |
9569 |
- static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) |
9570 |
-diff -urNp linux-2.6.32.38/drivers/input/mouse/psmouse-base.c linux-2.6.32.38/drivers/input/mouse/psmouse-base.c |
9571 |
---- linux-2.6.32.38/drivers/input/mouse/psmouse-base.c 2011-03-27 14:31:47.000000000 -0400 |
9572 |
-+++ linux-2.6.32.38/drivers/input/mouse/psmouse-base.c 2011-04-17 15:56:46.000000000 -0400 |
9573 |
-@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se |
9574 |
- .id = SERIO_ANY, |
9575 |
- .extra = SERIO_ANY, |
9576 |
- }, |
9577 |
-- { 0 } |
9578 |
-+ { 0, 0, 0, 0 } |
9579 |
- }; |
9580 |
- |
9581 |
- MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); |
9582 |
-diff -urNp linux-2.6.32.38/drivers/input/mouse/synaptics.c linux-2.6.32.38/drivers/input/mouse/synaptics.c |
9583 |
---- linux-2.6.32.38/drivers/input/mouse/synaptics.c 2011-03-27 14:31:47.000000000 -0400 |
9584 |
-+++ linux-2.6.32.38/drivers/input/mouse/synaptics.c 2011-04-17 15:56:46.000000000 -0400 |
9585 |
-@@ -437,7 +437,7 @@ static void synaptics_process_packet(str |
9586 |
- break; |
9587 |
- case 2: |
9588 |
- if (SYN_MODEL_PEN(priv->model_id)) |
9589 |
-- ; /* Nothing, treat a pen as a single finger */ |
9590 |
-+ break; /* Nothing, treat a pen as a single finger */ |
9591 |
- break; |
9592 |
- case 4 ... 15: |
9593 |
- if (SYN_CAP_PALMDETECT(priv->capabilities)) |
9594 |
-@@ -652,7 +652,6 @@ static const struct dmi_system_id toshib |
9595 |
- DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |
9596 |
- DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"), |
9597 |
- }, |
9598 |
-- |
9599 |
- }, |
9600 |
- { |
9601 |
- .ident = "Toshiba Portege M300", |
9602 |
-@@ -661,9 +660,8 @@ static const struct dmi_system_id toshib |
9603 |
- DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"), |
9604 |
- DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"), |
9605 |
- }, |
9606 |
-- |
9607 |
- }, |
9608 |
-- { } |
9609 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9610 |
- }; |
9611 |
- #endif |
9612 |
- |
9613 |
-diff -urNp linux-2.6.32.38/drivers/input/mousedev.c linux-2.6.32.38/drivers/input/mousedev.c |
9614 |
---- linux-2.6.32.38/drivers/input/mousedev.c 2011-03-27 14:31:47.000000000 -0400 |
9615 |
-+++ linux-2.6.32.38/drivers/input/mousedev.c 2011-04-17 15:56:46.000000000 -0400 |
9616 |
-@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han |
9617 |
- |
9618 |
- #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX |
9619 |
- static struct miscdevice psaux_mouse = { |
9620 |
-- PSMOUSE_MINOR, "psaux", &mousedev_fops |
9621 |
-+ PSMOUSE_MINOR, "psaux", &mousedev_fops, {NULL, NULL}, NULL, NULL |
9622 |
- }; |
9623 |
- static int psaux_registered; |
9624 |
- #endif |
9625 |
-diff -urNp linux-2.6.32.38/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.38/drivers/input/serio/i8042-x86ia64io.h |
9626 |
---- linux-2.6.32.38/drivers/input/serio/i8042-x86ia64io.h 2011-03-27 14:31:47.000000000 -0400 |
9627 |
-+++ linux-2.6.32.38/drivers/input/serio/i8042-x86ia64io.h 2011-04-17 15:56:46.000000000 -0400 |
9628 |
-@@ -179,7 +179,7 @@ static const struct dmi_system_id __init |
9629 |
- DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), |
9630 |
- }, |
9631 |
- }, |
9632 |
-- { } |
9633 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9634 |
- }; |
9635 |
- |
9636 |
- /* |
9637 |
-@@ -423,7 +423,7 @@ static const struct dmi_system_id __init |
9638 |
- DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), |
9639 |
- }, |
9640 |
- }, |
9641 |
-- { } |
9642 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9643 |
- }; |
9644 |
- |
9645 |
- static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { |
9646 |
-@@ -497,7 +497,7 @@ static const struct dmi_system_id __init |
9647 |
- DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), |
9648 |
- }, |
9649 |
- }, |
9650 |
-- { } |
9651 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9652 |
- }; |
9653 |
- |
9654 |
- #ifdef CONFIG_PNP |
9655 |
-@@ -516,7 +516,7 @@ static const struct dmi_system_id __init |
9656 |
- DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), |
9657 |
- }, |
9658 |
- }, |
9659 |
-- { } |
9660 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9661 |
- }; |
9662 |
- |
9663 |
- static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { |
9664 |
-@@ -540,7 +540,7 @@ static const struct dmi_system_id __init |
9665 |
- DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ |
9666 |
- }, |
9667 |
- }, |
9668 |
-- { } |
9669 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9670 |
- }; |
9671 |
- #endif |
9672 |
- |
9673 |
-@@ -625,7 +625,7 @@ static const struct dmi_system_id __init |
9674 |
- DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), |
9675 |
- }, |
9676 |
- }, |
9677 |
-- { } |
9678 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
9679 |
- }; |
9680 |
- |
9681 |
- #endif /* CONFIG_X86 */ |
9682 |
-diff -urNp linux-2.6.32.38/drivers/input/serio/serio_raw.c linux-2.6.32.38/drivers/input/serio/serio_raw.c |
9683 |
---- linux-2.6.32.38/drivers/input/serio/serio_raw.c 2011-03-27 14:31:47.000000000 -0400 |
9684 |
-+++ linux-2.6.32.38/drivers/input/serio/serio_raw.c 2011-04-17 15:56:46.000000000 -0400 |
9685 |
-@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ |
9686 |
- .id = SERIO_ANY, |
9687 |
- .extra = SERIO_ANY, |
9688 |
- }, |
9689 |
-- { 0 } |
9690 |
-+ { 0, 0, 0, 0 } |
9691 |
- }; |
9692 |
- |
9693 |
- MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); |
9694 |
-diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/common.c linux-2.6.32.38/drivers/isdn/gigaset/common.c |
9695 |
---- linux-2.6.32.38/drivers/isdn/gigaset/common.c 2011-03-27 14:31:47.000000000 -0400 |
9696 |
-+++ linux-2.6.32.38/drivers/isdn/gigaset/common.c 2011-04-17 15:56:46.000000000 -0400 |
9697 |
+diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/common.c linux-2.6.32.39/drivers/isdn/gigaset/common.c |
9698 |
+--- linux-2.6.32.39/drivers/isdn/gigaset/common.c 2011-03-27 14:31:47.000000000 -0400 |
9699 |
++++ linux-2.6.32.39/drivers/isdn/gigaset/common.c 2011-04-17 15:56:46.000000000 -0400 |
9700 |
@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct |
9701 |
cs->commands_pending = 0; |
9702 |
cs->cur_at_seq = 0; |
9703 |
@@ -27602,9 +27012,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/common.c linux-2.6.32.38/drivers |
9704 |
cs->dev = NULL; |
9705 |
cs->tty = NULL; |
9706 |
cs->tty_dev = NULL; |
9707 |
-diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h |
9708 |
---- linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h 2011-03-27 14:31:47.000000000 -0400 |
9709 |
-+++ linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:56:46.000000000 -0400 |
9710 |
+diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h |
9711 |
+--- linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h 2011-03-27 14:31:47.000000000 -0400 |
9712 |
++++ linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:56:46.000000000 -0400 |
9713 |
@@ -34,6 +34,7 @@ |
9714 |
#include <linux/tty_driver.h> |
9715 |
#include <linux/list.h> |
9716 |
@@ -27622,9 +27032,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/gigaset.h linux-2.6.32.38/driver |
9717 |
struct tty_struct *tty; |
9718 |
struct tasklet_struct if_wake_tasklet; |
9719 |
unsigned control_state; |
9720 |
-diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/interface.c linux-2.6.32.38/drivers/isdn/gigaset/interface.c |
9721 |
---- linux-2.6.32.38/drivers/isdn/gigaset/interface.c 2011-03-27 14:31:47.000000000 -0400 |
9722 |
-+++ linux-2.6.32.38/drivers/isdn/gigaset/interface.c 2011-04-17 15:56:46.000000000 -0400 |
9723 |
+diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/interface.c linux-2.6.32.39/drivers/isdn/gigaset/interface.c |
9724 |
+--- linux-2.6.32.39/drivers/isdn/gigaset/interface.c 2011-03-27 14:31:47.000000000 -0400 |
9725 |
++++ linux-2.6.32.39/drivers/isdn/gigaset/interface.c 2011-04-17 15:56:46.000000000 -0400 |
9726 |
@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt |
9727 |
return -ERESTARTSYS; // FIXME -EINTR? |
9728 |
tty->driver_data = cs; |
9729 |
@@ -27712,9 +27122,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/gigaset/interface.c linux-2.6.32.38/driv |
9730 |
dev_warn(cs->dev, "%s: device not opened\n", __func__); |
9731 |
goto out; |
9732 |
} |
9733 |
-diff -urNp linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c |
9734 |
---- linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c 2011-03-27 14:31:47.000000000 -0400 |
9735 |
-+++ linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:56:46.000000000 -0400 |
9736 |
+diff -urNp linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c |
9737 |
+--- linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c 2011-03-27 14:31:47.000000000 -0400 |
9738 |
++++ linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:56:46.000000000 -0400 |
9739 |
@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo |
9740 |
} |
9741 |
if (left) { |
9742 |
@@ -27733,9 +27143,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/hardware/avm/b1.c linux-2.6.32.38/driver |
9743 |
return -EFAULT; |
9744 |
} else { |
9745 |
memcpy(buf, dp, left); |
9746 |
-diff -urNp linux-2.6.32.38/drivers/isdn/icn/icn.c linux-2.6.32.38/drivers/isdn/icn/icn.c |
9747 |
---- linux-2.6.32.38/drivers/isdn/icn/icn.c 2011-03-27 14:31:47.000000000 -0400 |
9748 |
-+++ linux-2.6.32.38/drivers/isdn/icn/icn.c 2011-04-17 15:56:46.000000000 -0400 |
9749 |
+diff -urNp linux-2.6.32.39/drivers/isdn/icn/icn.c linux-2.6.32.39/drivers/isdn/icn/icn.c |
9750 |
+--- linux-2.6.32.39/drivers/isdn/icn/icn.c 2011-03-27 14:31:47.000000000 -0400 |
9751 |
++++ linux-2.6.32.39/drivers/isdn/icn/icn.c 2011-04-17 15:56:46.000000000 -0400 |
9752 |
@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len |
9753 |
if (count > len) |
9754 |
count = len; |
9755 |
@@ -27745,9 +27155,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/icn/icn.c linux-2.6.32.38/drivers/isdn/i |
9756 |
return -EFAULT; |
9757 |
} else |
9758 |
memcpy(msg, buf, count); |
9759 |
-diff -urNp linux-2.6.32.38/drivers/isdn/mISDN/socket.c linux-2.6.32.38/drivers/isdn/mISDN/socket.c |
9760 |
---- linux-2.6.32.38/drivers/isdn/mISDN/socket.c 2011-03-27 14:31:47.000000000 -0400 |
9761 |
-+++ linux-2.6.32.38/drivers/isdn/mISDN/socket.c 2011-04-17 15:56:46.000000000 -0400 |
9762 |
+diff -urNp linux-2.6.32.39/drivers/isdn/mISDN/socket.c linux-2.6.32.39/drivers/isdn/mISDN/socket.c |
9763 |
+--- linux-2.6.32.39/drivers/isdn/mISDN/socket.c 2011-03-27 14:31:47.000000000 -0400 |
9764 |
++++ linux-2.6.32.39/drivers/isdn/mISDN/socket.c 2011-04-17 15:56:46.000000000 -0400 |
9765 |
@@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns |
9766 |
if (dev) { |
9767 |
struct mISDN_devinfo di; |
9768 |
@@ -27764,9 +27174,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/mISDN/socket.c linux-2.6.32.38/drivers/i |
9769 |
di.id = dev->id; |
9770 |
di.Dprotocols = dev->Dprotocols; |
9771 |
di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); |
9772 |
-diff -urNp linux-2.6.32.38/drivers/isdn/sc/interrupt.c linux-2.6.32.38/drivers/isdn/sc/interrupt.c |
9773 |
---- linux-2.6.32.38/drivers/isdn/sc/interrupt.c 2011-03-27 14:31:47.000000000 -0400 |
9774 |
-+++ linux-2.6.32.38/drivers/isdn/sc/interrupt.c 2011-04-17 15:56:46.000000000 -0400 |
9775 |
+diff -urNp linux-2.6.32.39/drivers/isdn/sc/interrupt.c linux-2.6.32.39/drivers/isdn/sc/interrupt.c |
9776 |
+--- linux-2.6.32.39/drivers/isdn/sc/interrupt.c 2011-03-27 14:31:47.000000000 -0400 |
9777 |
++++ linux-2.6.32.39/drivers/isdn/sc/interrupt.c 2011-04-17 15:56:46.000000000 -0400 |
9778 |
@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, |
9779 |
} |
9780 |
else if(callid>=0x0000 && callid<=0x7FFF) |
9781 |
@@ -27801,9 +27211,9 @@ diff -urNp linux-2.6.32.38/drivers/isdn/sc/interrupt.c linux-2.6.32.38/drivers/i |
9782 |
continue; |
9783 |
} |
9784 |
|
9785 |
-diff -urNp linux-2.6.32.38/drivers/lguest/core.c linux-2.6.32.38/drivers/lguest/core.c |
9786 |
---- linux-2.6.32.38/drivers/lguest/core.c 2011-03-27 14:31:47.000000000 -0400 |
9787 |
-+++ linux-2.6.32.38/drivers/lguest/core.c 2011-04-17 15:56:46.000000000 -0400 |
9788 |
+diff -urNp linux-2.6.32.39/drivers/lguest/core.c linux-2.6.32.39/drivers/lguest/core.c |
9789 |
+--- linux-2.6.32.39/drivers/lguest/core.c 2011-03-27 14:31:47.000000000 -0400 |
9790 |
++++ linux-2.6.32.39/drivers/lguest/core.c 2011-04-17 15:56:46.000000000 -0400 |
9791 |
@@ -91,9 +91,17 @@ static __init int map_switcher(void) |
9792 |
* it's worked so far. The end address needs +1 because __get_vm_area |
9793 |
* allocates an extra guard page, so we need space for that. |
9794 |
@@ -27831,9 +27241,9 @@ diff -urNp linux-2.6.32.38/drivers/lguest/core.c linux-2.6.32.38/drivers/lguest/ |
9795 |
end_switcher_text - start_switcher_text); |
9796 |
|
9797 |
printk(KERN_INFO "lguest: mapped switcher at %p\n", |
9798 |
-diff -urNp linux-2.6.32.38/drivers/lguest/x86/core.c linux-2.6.32.38/drivers/lguest/x86/core.c |
9799 |
---- linux-2.6.32.38/drivers/lguest/x86/core.c 2011-03-27 14:31:47.000000000 -0400 |
9800 |
-+++ linux-2.6.32.38/drivers/lguest/x86/core.c 2011-04-17 15:56:46.000000000 -0400 |
9801 |
+diff -urNp linux-2.6.32.39/drivers/lguest/x86/core.c linux-2.6.32.39/drivers/lguest/x86/core.c |
9802 |
+--- linux-2.6.32.39/drivers/lguest/x86/core.c 2011-03-27 14:31:47.000000000 -0400 |
9803 |
++++ linux-2.6.32.39/drivers/lguest/x86/core.c 2011-04-17 15:56:46.000000000 -0400 |
9804 |
@@ -59,7 +59,7 @@ static struct { |
9805 |
/* Offset from where switcher.S was compiled to where we've copied it */ |
9806 |
static unsigned long switcher_offset(void) |
9807 |
@@ -27875,9 +27285,9 @@ diff -urNp linux-2.6.32.38/drivers/lguest/x86/core.c linux-2.6.32.38/drivers/lgu |
9808 |
lguest_entry.segment = LGUEST_CS; |
9809 |
|
9810 |
/* |
9811 |
-diff -urNp linux-2.6.32.38/drivers/lguest/x86/switcher_32.S linux-2.6.32.38/drivers/lguest/x86/switcher_32.S |
9812 |
---- linux-2.6.32.38/drivers/lguest/x86/switcher_32.S 2011-03-27 14:31:47.000000000 -0400 |
9813 |
-+++ linux-2.6.32.38/drivers/lguest/x86/switcher_32.S 2011-04-17 15:56:46.000000000 -0400 |
9814 |
+diff -urNp linux-2.6.32.39/drivers/lguest/x86/switcher_32.S linux-2.6.32.39/drivers/lguest/x86/switcher_32.S |
9815 |
+--- linux-2.6.32.39/drivers/lguest/x86/switcher_32.S 2011-03-27 14:31:47.000000000 -0400 |
9816 |
++++ linux-2.6.32.39/drivers/lguest/x86/switcher_32.S 2011-04-17 15:56:46.000000000 -0400 |
9817 |
@@ -87,6 +87,7 @@ |
9818 |
#include <asm/page.h> |
9819 |
#include <asm/segment.h> |
9820 |
@@ -27936,9 +27346,9 @@ diff -urNp linux-2.6.32.38/drivers/lguest/x86/switcher_32.S linux-2.6.32.38/driv |
9821 |
|
9822 |
// Every interrupt can come to us here |
9823 |
// But we must truly tell each apart. |
9824 |
-diff -urNp linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c |
9825 |
---- linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c 2011-03-27 14:31:47.000000000 -0400 |
9826 |
-+++ linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c 2011-04-17 15:56:46.000000000 -0400 |
9827 |
+diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c |
9828 |
+--- linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c 2011-03-27 14:31:47.000000000 -0400 |
9829 |
++++ linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c 2011-04-17 15:56:46.000000000 -0400 |
9830 |
@@ -15,7 +15,7 @@ |
9831 |
|
9832 |
#define MAX_PMU_LEVEL 0xFF |
9833 |
@@ -27957,9 +27367,9 @@ diff -urNp linux-2.6.32.38/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.38 |
9834 |
.get_brightness = pmu_backlight_get_brightness, |
9835 |
.update_status = pmu_backlight_update_status, |
9836 |
|
9837 |
-diff -urNp linux-2.6.32.38/drivers/macintosh/via-pmu.c linux-2.6.32.38/drivers/macintosh/via-pmu.c |
9838 |
---- linux-2.6.32.38/drivers/macintosh/via-pmu.c 2011-03-27 14:31:47.000000000 -0400 |
9839 |
-+++ linux-2.6.32.38/drivers/macintosh/via-pmu.c 2011-04-17 15:56:46.000000000 -0400 |
9840 |
+diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu.c linux-2.6.32.39/drivers/macintosh/via-pmu.c |
9841 |
+--- linux-2.6.32.39/drivers/macintosh/via-pmu.c 2011-03-27 14:31:47.000000000 -0400 |
9842 |
++++ linux-2.6.32.39/drivers/macintosh/via-pmu.c 2011-04-17 15:56:46.000000000 -0400 |
9843 |
@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state |
9844 |
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); |
9845 |
} |
9846 |
@@ -27969,21 +27379,9 @@ diff -urNp linux-2.6.32.38/drivers/macintosh/via-pmu.c linux-2.6.32.38/drivers/m |
9847 |
.enter = powerbook_sleep, |
9848 |
.valid = pmu_sleep_valid, |
9849 |
}; |
9850 |
-diff -urNp linux-2.6.32.38/drivers/md/bitmap.c linux-2.6.32.38/drivers/md/bitmap.c |
9851 |
---- linux-2.6.32.38/drivers/md/bitmap.c 2011-03-27 14:31:47.000000000 -0400 |
9852 |
-+++ linux-2.6.32.38/drivers/md/bitmap.c 2011-04-17 15:56:46.000000000 -0400 |
9853 |
-@@ -58,7 +58,7 @@ |
9854 |
- # if DEBUG > 0 |
9855 |
- # define PRINTK(x...) printk(KERN_DEBUG x) |
9856 |
- # else |
9857 |
--# define PRINTK(x...) |
9858 |
-+# define PRINTK(x...) do {} while (0) |
9859 |
- # endif |
9860 |
- #endif |
9861 |
- |
9862 |
-diff -urNp linux-2.6.32.38/drivers/md/dm-ioctl.c linux-2.6.32.38/drivers/md/dm-ioctl.c |
9863 |
---- linux-2.6.32.38/drivers/md/dm-ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
9864 |
-+++ linux-2.6.32.38/drivers/md/dm-ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
9865 |
+diff -urNp linux-2.6.32.39/drivers/md/dm-ioctl.c linux-2.6.32.39/drivers/md/dm-ioctl.c |
9866 |
+--- linux-2.6.32.39/drivers/md/dm-ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
9867 |
++++ linux-2.6.32.39/drivers/md/dm-ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
9868 |
@@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str |
9869 |
cmd == DM_LIST_VERSIONS_CMD) |
9870 |
return 0; |
9871 |
@@ -27993,9 +27391,9 @@ diff -urNp linux-2.6.32.38/drivers/md/dm-ioctl.c linux-2.6.32.38/drivers/md/dm-i |
9872 |
if (!*param->name) { |
9873 |
DMWARN("name not supplied when creating device"); |
9874 |
return -EINVAL; |
9875 |
-diff -urNp linux-2.6.32.38/drivers/md/dm-sysfs.c linux-2.6.32.38/drivers/md/dm-sysfs.c |
9876 |
---- linux-2.6.32.38/drivers/md/dm-sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
9877 |
-+++ linux-2.6.32.38/drivers/md/dm-sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
9878 |
+diff -urNp linux-2.6.32.39/drivers/md/dm-sysfs.c linux-2.6.32.39/drivers/md/dm-sysfs.c |
9879 |
+--- linux-2.6.32.39/drivers/md/dm-sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
9880 |
++++ linux-2.6.32.39/drivers/md/dm-sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
9881 |
@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { |
9882 |
NULL, |
9883 |
}; |
9884 |
@@ -28005,9 +27403,9 @@ diff -urNp linux-2.6.32.38/drivers/md/dm-sysfs.c linux-2.6.32.38/drivers/md/dm-s |
9885 |
.show = dm_attr_show, |
9886 |
}; |
9887 |
|
9888 |
-diff -urNp linux-2.6.32.38/drivers/md/dm-table.c linux-2.6.32.38/drivers/md/dm-table.c |
9889 |
---- linux-2.6.32.38/drivers/md/dm-table.c 2011-03-27 14:31:47.000000000 -0400 |
9890 |
-+++ linux-2.6.32.38/drivers/md/dm-table.c 2011-04-17 15:56:46.000000000 -0400 |
9891 |
+diff -urNp linux-2.6.32.39/drivers/md/dm-table.c linux-2.6.32.39/drivers/md/dm-table.c |
9892 |
+--- linux-2.6.32.39/drivers/md/dm-table.c 2011-03-27 14:31:47.000000000 -0400 |
9893 |
++++ linux-2.6.32.39/drivers/md/dm-table.c 2011-04-17 15:56:46.000000000 -0400 |
9894 |
@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct |
9895 |
if (!dev_size) |
9896 |
return 0; |
9897 |
@@ -28017,9 +27415,9 @@ diff -urNp linux-2.6.32.38/drivers/md/dm-table.c linux-2.6.32.38/drivers/md/dm-t |
9898 |
DMWARN("%s: %s too small for target: " |
9899 |
"start=%llu, len=%llu, dev_size=%llu", |
9900 |
dm_device_name(ti->table->md), bdevname(bdev, b), |
9901 |
-diff -urNp linux-2.6.32.38/drivers/md/md.c linux-2.6.32.38/drivers/md/md.c |
9902 |
---- linux-2.6.32.38/drivers/md/md.c 2011-03-27 14:31:47.000000000 -0400 |
9903 |
-+++ linux-2.6.32.38/drivers/md/md.c 2011-04-17 15:56:46.000000000 -0400 |
9904 |
+diff -urNp linux-2.6.32.39/drivers/md/md.c linux-2.6.32.39/drivers/md/md.c |
9905 |
+--- linux-2.6.32.39/drivers/md/md.c 2011-03-27 14:31:47.000000000 -0400 |
9906 |
++++ linux-2.6.32.39/drivers/md/md.c 2011-04-17 15:56:46.000000000 -0400 |
9907 |
@@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko |
9908 |
mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); |
9909 |
kfree(rdev); |
9910 |
@@ -28066,9 +27464,9 @@ diff -urNp linux-2.6.32.38/drivers/md/md.c linux-2.6.32.38/drivers/md/md.c |
9911 |
/* sync IO will cause sync_io to increase before the disk_stats |
9912 |
* as sync_io is counted when a request starts, and |
9913 |
* disk_stats is counted when it completes. |
9914 |
-diff -urNp linux-2.6.32.38/drivers/md/md.h linux-2.6.32.38/drivers/md/md.h |
9915 |
---- linux-2.6.32.38/drivers/md/md.h 2011-03-27 14:31:47.000000000 -0400 |
9916 |
-+++ linux-2.6.32.38/drivers/md/md.h 2011-04-17 15:56:46.000000000 -0400 |
9917 |
+diff -urNp linux-2.6.32.39/drivers/md/md.h linux-2.6.32.39/drivers/md/md.h |
9918 |
+--- linux-2.6.32.39/drivers/md/md.h 2011-03-27 14:31:47.000000000 -0400 |
9919 |
++++ linux-2.6.32.39/drivers/md/md.h 2011-04-17 15:56:46.000000000 -0400 |
9920 |
@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ |
9921 |
|
9922 |
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) |
9923 |
@@ -28078,9 +27476,9 @@ diff -urNp linux-2.6.32.38/drivers/md/md.h linux-2.6.32.38/drivers/md/md.h |
9924 |
} |
9925 |
|
9926 |
struct mdk_personality |
9927 |
-diff -urNp linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c |
9928 |
---- linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-27 14:31:47.000000000 -0400 |
9929 |
-+++ linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:56:46.000000000 -0400 |
9930 |
+diff -urNp linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c |
9931 |
+--- linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-27 14:31:47.000000000 -0400 |
9932 |
++++ linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:56:46.000000000 -0400 |
9933 |
@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt |
9934 |
const struct dvb_device *template, void *priv, int type) |
9935 |
{ |
9936 |
@@ -28089,9 +27487,9 @@ diff -urNp linux-2.6.32.38/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.38/d |
9937 |
struct file_operations *dvbdevfops; |
9938 |
struct device *clsdev; |
9939 |
int minor; |
9940 |
-diff -urNp linux-2.6.32.38/drivers/media/radio/radio-cadet.c linux-2.6.32.38/drivers/media/radio/radio-cadet.c |
9941 |
---- linux-2.6.32.38/drivers/media/radio/radio-cadet.c 2011-03-27 14:31:47.000000000 -0400 |
9942 |
-+++ linux-2.6.32.38/drivers/media/radio/radio-cadet.c 2011-04-17 15:56:46.000000000 -0400 |
9943 |
+diff -urNp linux-2.6.32.39/drivers/media/radio/radio-cadet.c linux-2.6.32.39/drivers/media/radio/radio-cadet.c |
9944 |
+--- linux-2.6.32.39/drivers/media/radio/radio-cadet.c 2011-03-27 14:31:47.000000000 -0400 |
9945 |
++++ linux-2.6.32.39/drivers/media/radio/radio-cadet.c 2011-04-17 15:56:46.000000000 -0400 |
9946 |
@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f |
9947 |
while (i < count && dev->rdsin != dev->rdsout) |
9948 |
readbuf[i++] = dev->rdsbuf[dev->rdsout++]; |
9949 |
@@ -28101,25 +27499,9 @@ diff -urNp linux-2.6.32.38/drivers/media/radio/radio-cadet.c linux-2.6.32.38/dri |
9950 |
return -EFAULT; |
9951 |
return i; |
9952 |
} |
9953 |
-diff -urNp linux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c |
9954 |
---- linux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-27 14:31:47.000000000 -0400 |
9955 |
-+++ linux-2.6.32.38/drivers/media/video/sn9c102/sn9c102_core.c 2011-04-17 15:56:46.000000000 -0400 |
9956 |
-@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_ |
9957 |
- sn9c102_show_i2c_reg, sn9c102_store_i2c_reg); |
9958 |
- static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR, |
9959 |
- sn9c102_show_i2c_val, sn9c102_store_i2c_val); |
9960 |
--static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green); |
9961 |
--static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue); |
9962 |
--static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red); |
9963 |
-+static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green); |
9964 |
-+static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue); |
9965 |
-+static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red); |
9966 |
- static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL); |
9967 |
- |
9968 |
- |
9969 |
-diff -urNp linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c |
9970 |
---- linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c 2011-03-27 14:31:47.000000000 -0400 |
9971 |
-+++ linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c 2011-04-17 15:56:46.000000000 -0400 |
9972 |
+diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c |
9973 |
+--- linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c 2011-03-27 14:31:47.000000000 -0400 |
9974 |
++++ linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c 2011-04-17 15:56:46.000000000 -0400 |
9975 |
@@ -225,7 +225,7 @@ static void konicawc_register_input(stru |
9976 |
int error; |
9977 |
|
9978 |
@@ -28129,9 +27511,9 @@ diff -urNp linux-2.6.32.38/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. |
9979 |
|
9980 |
cam->input = input_dev = input_allocate_device(); |
9981 |
if (!input_dev) { |
9982 |
-diff -urNp linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c |
9983 |
---- linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c 2011-03-27 14:31:47.000000000 -0400 |
9984 |
-+++ linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c 2011-04-17 15:56:46.000000000 -0400 |
9985 |
+diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c |
9986 |
+--- linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c 2011-03-27 14:31:47.000000000 -0400 |
9987 |
++++ linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c 2011-04-17 15:56:46.000000000 -0400 |
9988 |
@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc |
9989 |
int error; |
9990 |
|
9991 |
@@ -28141,9 +27523,9 @@ diff -urNp linux-2.6.32.38/drivers/media/video/usbvideo/quickcam_messenger.c lin |
9992 |
|
9993 |
cam->input = input_dev = input_allocate_device(); |
9994 |
if (!input_dev) { |
9995 |
-diff -urNp linux-2.6.32.38/drivers/message/fusion/mptbase.c linux-2.6.32.38/drivers/message/fusion/mptbase.c |
9996 |
---- linux-2.6.32.38/drivers/message/fusion/mptbase.c 2011-03-27 14:31:47.000000000 -0400 |
9997 |
-+++ linux-2.6.32.38/drivers/message/fusion/mptbase.c 2011-04-17 15:56:46.000000000 -0400 |
9998 |
+diff -urNp linux-2.6.32.39/drivers/message/fusion/mptbase.c linux-2.6.32.39/drivers/message/fusion/mptbase.c |
9999 |
+--- linux-2.6.32.39/drivers/message/fusion/mptbase.c 2011-03-27 14:31:47.000000000 -0400 |
10000 |
++++ linux-2.6.32.39/drivers/message/fusion/mptbase.c 2011-04-17 15:56:46.000000000 -0400 |
10001 |
@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s |
10002 |
len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); |
10003 |
len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); |
10004 |
@@ -28159,21 +27541,9 @@ diff -urNp linux-2.6.32.38/drivers/message/fusion/mptbase.c linux-2.6.32.38/driv |
10005 |
/* |
10006 |
* Rounding UP to nearest 4-kB boundary here... |
10007 |
*/ |
10008 |
-diff -urNp linux-2.6.32.38/drivers/message/fusion/mptdebug.h linux-2.6.32.38/drivers/message/fusion/mptdebug.h |
10009 |
---- linux-2.6.32.38/drivers/message/fusion/mptdebug.h 2011-03-27 14:31:47.000000000 -0400 |
10010 |
-+++ linux-2.6.32.38/drivers/message/fusion/mptdebug.h 2011-04-17 15:56:46.000000000 -0400 |
10011 |
-@@ -71,7 +71,7 @@ |
10012 |
- CMD; \ |
10013 |
- } |
10014 |
- #else |
10015 |
--#define MPT_CHECK_LOGGING(IOC, CMD, BITS) |
10016 |
-+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) |
10017 |
- #endif |
10018 |
- |
10019 |
- |
10020 |
-diff -urNp linux-2.6.32.38/drivers/message/fusion/mptsas.c linux-2.6.32.38/drivers/message/fusion/mptsas.c |
10021 |
---- linux-2.6.32.38/drivers/message/fusion/mptsas.c 2011-03-27 14:31:47.000000000 -0400 |
10022 |
-+++ linux-2.6.32.38/drivers/message/fusion/mptsas.c 2011-04-17 15:56:46.000000000 -0400 |
10023 |
+diff -urNp linux-2.6.32.39/drivers/message/fusion/mptsas.c linux-2.6.32.39/drivers/message/fusion/mptsas.c |
10024 |
+--- linux-2.6.32.39/drivers/message/fusion/mptsas.c 2011-03-27 14:31:47.000000000 -0400 |
10025 |
++++ linux-2.6.32.39/drivers/message/fusion/mptsas.c 2011-04-17 15:56:46.000000000 -0400 |
10026 |
@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin |
10027 |
return 0; |
10028 |
} |
10029 |
@@ -28222,9 +27592,9 @@ diff -urNp linux-2.6.32.38/drivers/message/fusion/mptsas.c linux-2.6.32.38/drive |
10030 |
static inline struct sas_port * |
10031 |
mptsas_get_port(struct mptsas_phyinfo *phy_info) |
10032 |
{ |
10033 |
-diff -urNp linux-2.6.32.38/drivers/message/fusion/mptscsih.c linux-2.6.32.38/drivers/message/fusion/mptscsih.c |
10034 |
---- linux-2.6.32.38/drivers/message/fusion/mptscsih.c 2011-03-27 14:31:47.000000000 -0400 |
10035 |
-+++ linux-2.6.32.38/drivers/message/fusion/mptscsih.c 2011-04-17 15:56:46.000000000 -0400 |
10036 |
+diff -urNp linux-2.6.32.39/drivers/message/fusion/mptscsih.c linux-2.6.32.39/drivers/message/fusion/mptscsih.c |
10037 |
+--- linux-2.6.32.39/drivers/message/fusion/mptscsih.c 2011-03-27 14:31:47.000000000 -0400 |
10038 |
++++ linux-2.6.32.39/drivers/message/fusion/mptscsih.c 2011-04-17 15:56:46.000000000 -0400 |
10039 |
@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost) |
10040 |
|
10041 |
h = shost_priv(SChost); |
10042 |
@@ -28250,9 +27620,9 @@ diff -urNp linux-2.6.32.38/drivers/message/fusion/mptscsih.c linux-2.6.32.38/dri |
10043 |
|
10044 |
return h->info_kbuf; |
10045 |
} |
10046 |
-diff -urNp linux-2.6.32.38/drivers/message/i2o/i2o_proc.c linux-2.6.32.38/drivers/message/i2o/i2o_proc.c |
10047 |
---- linux-2.6.32.38/drivers/message/i2o/i2o_proc.c 2011-03-27 14:31:47.000000000 -0400 |
10048 |
-+++ linux-2.6.32.38/drivers/message/i2o/i2o_proc.c 2011-04-17 15:56:46.000000000 -0400 |
10049 |
+diff -urNp linux-2.6.32.39/drivers/message/i2o/i2o_proc.c linux-2.6.32.39/drivers/message/i2o/i2o_proc.c |
10050 |
+--- linux-2.6.32.39/drivers/message/i2o/i2o_proc.c 2011-03-27 14:31:47.000000000 -0400 |
10051 |
++++ linux-2.6.32.39/drivers/message/i2o/i2o_proc.c 2011-04-17 15:56:46.000000000 -0400 |
10052 |
@@ -259,13 +259,6 @@ static char *scsi_devices[] = { |
10053 |
"Array Controller Device" |
10054 |
}; |
10055 |
@@ -28339,9 +27709,9 @@ diff -urNp linux-2.6.32.38/drivers/message/i2o/i2o_proc.c linux-2.6.32.38/driver |
10056 |
|
10057 |
return 0; |
10058 |
} |
10059 |
-diff -urNp linux-2.6.32.38/drivers/misc/kgdbts.c linux-2.6.32.38/drivers/misc/kgdbts.c |
10060 |
---- linux-2.6.32.38/drivers/misc/kgdbts.c 2011-03-27 14:31:47.000000000 -0400 |
10061 |
-+++ linux-2.6.32.38/drivers/misc/kgdbts.c 2011-04-17 15:56:46.000000000 -0400 |
10062 |
+diff -urNp linux-2.6.32.39/drivers/misc/kgdbts.c linux-2.6.32.39/drivers/misc/kgdbts.c |
10063 |
+--- linux-2.6.32.39/drivers/misc/kgdbts.c 2011-03-27 14:31:47.000000000 -0400 |
10064 |
++++ linux-2.6.32.39/drivers/misc/kgdbts.c 2011-04-17 15:56:46.000000000 -0400 |
10065 |
@@ -118,7 +118,7 @@ |
10066 |
} while (0) |
10067 |
#define MAX_CONFIG_LEN 40 |
10068 |
@@ -28360,9 +27730,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/kgdbts.c linux-2.6.32.38/drivers/misc/kg |
10069 |
.name = "kgdbts", |
10070 |
.read_char = kgdbts_get_char, |
10071 |
.write_char = kgdbts_put_char, |
10072 |
-diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c |
10073 |
---- linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c 2011-03-27 14:31:47.000000000 -0400 |
10074 |
-+++ linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:56:46.000000000 -0400 |
10075 |
+diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c |
10076 |
+--- linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c 2011-03-27 14:31:47.000000000 -0400 |
10077 |
++++ linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:56:46.000000000 -0400 |
10078 |
@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic |
10079 |
|
10080 |
static void update_mcs_stats(enum mcs_op op, unsigned long clks) |
10081 |
@@ -28374,9 +27744,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.38/dri |
10082 |
if (mcs_op_statistics[op].max < clks) |
10083 |
mcs_op_statistics[op].max = clks; |
10084 |
} |
10085 |
-diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c |
10086 |
---- linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c 2011-03-27 14:31:47.000000000 -0400 |
10087 |
-+++ linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:56:46.000000000 -0400 |
10088 |
+diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c |
10089 |
+--- linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c 2011-03-27 14:31:47.000000000 -0400 |
10090 |
++++ linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:56:46.000000000 -0400 |
10091 |
@@ -32,9 +32,9 @@ |
10092 |
|
10093 |
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f) |
10094 |
@@ -28400,9 +27770,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.38/driv |
10095 |
max = mcs_op_statistics[op].max; |
10096 |
seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, |
10097 |
count ? total / count : 0, max); |
10098 |
-diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h |
10099 |
---- linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h 2011-03-27 14:31:47.000000000 -0400 |
10100 |
-+++ linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:56:46.000000000 -0400 |
10101 |
+diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h |
10102 |
+--- linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h 2011-03-27 14:31:47.000000000 -0400 |
10103 |
++++ linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:56:46.000000000 -0400 |
10104 |
@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; |
10105 |
* GRU statistics. |
10106 |
*/ |
10107 |
@@ -28586,9 +27956,9 @@ diff -urNp linux-2.6.32.38/drivers/misc/sgi-gru/grutables.h linux-2.6.32.38/driv |
10108 |
} while (0) |
10109 |
|
10110 |
#ifdef CONFIG_SGI_GRU_DEBUG |
10111 |
-diff -urNp linux-2.6.32.38/drivers/mtd/devices/doc2000.c linux-2.6.32.38/drivers/mtd/devices/doc2000.c |
10112 |
---- linux-2.6.32.38/drivers/mtd/devices/doc2000.c 2011-03-27 14:31:47.000000000 -0400 |
10113 |
-+++ linux-2.6.32.38/drivers/mtd/devices/doc2000.c 2011-04-17 15:56:46.000000000 -0400 |
10114 |
+diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2000.c linux-2.6.32.39/drivers/mtd/devices/doc2000.c |
10115 |
+--- linux-2.6.32.39/drivers/mtd/devices/doc2000.c 2011-03-27 14:31:47.000000000 -0400 |
10116 |
++++ linux-2.6.32.39/drivers/mtd/devices/doc2000.c 2011-04-17 15:56:46.000000000 -0400 |
10117 |
@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt |
10118 |
|
10119 |
/* The ECC will not be calculated correctly if less than 512 is written */ |
10120 |
@@ -28598,9 +27968,9 @@ diff -urNp linux-2.6.32.38/drivers/mtd/devices/doc2000.c linux-2.6.32.38/drivers |
10121 |
printk(KERN_WARNING |
10122 |
"ECC needs a full sector write (adr: %lx size %lx)\n", |
10123 |
(long) to, (long) len); |
10124 |
-diff -urNp linux-2.6.32.38/drivers/mtd/devices/doc2001.c linux-2.6.32.38/drivers/mtd/devices/doc2001.c |
10125 |
---- linux-2.6.32.38/drivers/mtd/devices/doc2001.c 2011-03-27 14:31:47.000000000 -0400 |
10126 |
-+++ linux-2.6.32.38/drivers/mtd/devices/doc2001.c 2011-04-17 15:56:46.000000000 -0400 |
10127 |
+diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2001.c linux-2.6.32.39/drivers/mtd/devices/doc2001.c |
10128 |
+--- linux-2.6.32.39/drivers/mtd/devices/doc2001.c 2011-03-27 14:31:47.000000000 -0400 |
10129 |
++++ linux-2.6.32.39/drivers/mtd/devices/doc2001.c 2011-04-17 15:56:46.000000000 -0400 |
10130 |
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt |
10131 |
struct Nand *mychip = &this->chips[from >> (this->chipshift)]; |
10132 |
|
10133 |
@@ -28610,9 +27980,9 @@ diff -urNp linux-2.6.32.38/drivers/mtd/devices/doc2001.c linux-2.6.32.38/drivers |
10134 |
return -EINVAL; |
10135 |
|
10136 |
/* Don't allow a single read to cross a 512-byte block boundary */ |
10137 |
-diff -urNp linux-2.6.32.38/drivers/mtd/ubi/build.c linux-2.6.32.38/drivers/mtd/ubi/build.c |
10138 |
---- linux-2.6.32.38/drivers/mtd/ubi/build.c 2011-03-27 14:31:47.000000000 -0400 |
10139 |
-+++ linux-2.6.32.38/drivers/mtd/ubi/build.c 2011-04-17 15:56:46.000000000 -0400 |
10140 |
+diff -urNp linux-2.6.32.39/drivers/mtd/ubi/build.c linux-2.6.32.39/drivers/mtd/ubi/build.c |
10141 |
+--- linux-2.6.32.39/drivers/mtd/ubi/build.c 2011-03-27 14:31:47.000000000 -0400 |
10142 |
++++ linux-2.6.32.39/drivers/mtd/ubi/build.c 2011-04-17 15:56:46.000000000 -0400 |
10143 |
@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); |
10144 |
static int __init bytes_str_to_int(const char *str) |
10145 |
{ |
10146 |
@@ -28652,9 +28022,9 @@ diff -urNp linux-2.6.32.38/drivers/mtd/ubi/build.c linux-2.6.32.38/drivers/mtd/u |
10147 |
} |
10148 |
|
10149 |
/** |
10150 |
-diff -urNp linux-2.6.32.38/drivers/net/e1000e/82571.c linux-2.6.32.38/drivers/net/e1000e/82571.c |
10151 |
---- linux-2.6.32.38/drivers/net/e1000e/82571.c 2011-03-27 14:31:47.000000000 -0400 |
10152 |
-+++ linux-2.6.32.38/drivers/net/e1000e/82571.c 2011-04-17 15:56:46.000000000 -0400 |
10153 |
+diff -urNp linux-2.6.32.39/drivers/net/e1000e/82571.c linux-2.6.32.39/drivers/net/e1000e/82571.c |
10154 |
+--- linux-2.6.32.39/drivers/net/e1000e/82571.c 2011-03-27 14:31:47.000000000 -0400 |
10155 |
++++ linux-2.6.32.39/drivers/net/e1000e/82571.c 2011-04-17 15:56:46.000000000 -0400 |
10156 |
@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s |
10157 |
{ |
10158 |
struct e1000_hw *hw = &adapter->hw; |
10159 |
@@ -28708,9 +28078,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/82571.c linux-2.6.32.38/drivers/ne |
10160 |
.acquire_nvm = e1000_acquire_nvm_82571, |
10161 |
.read_nvm = e1000e_read_nvm_eerd, |
10162 |
.release_nvm = e1000_release_nvm_82571, |
10163 |
-diff -urNp linux-2.6.32.38/drivers/net/e1000e/e1000.h linux-2.6.32.38/drivers/net/e1000e/e1000.h |
10164 |
---- linux-2.6.32.38/drivers/net/e1000e/e1000.h 2011-03-27 14:31:47.000000000 -0400 |
10165 |
-+++ linux-2.6.32.38/drivers/net/e1000e/e1000.h 2011-04-17 15:56:46.000000000 -0400 |
10166 |
+diff -urNp linux-2.6.32.39/drivers/net/e1000e/e1000.h linux-2.6.32.39/drivers/net/e1000e/e1000.h |
10167 |
+--- linux-2.6.32.39/drivers/net/e1000e/e1000.h 2011-03-27 14:31:47.000000000 -0400 |
10168 |
++++ linux-2.6.32.39/drivers/net/e1000e/e1000.h 2011-04-17 15:56:46.000000000 -0400 |
10169 |
@@ -375,9 +375,9 @@ struct e1000_info { |
10170 |
u32 pba; |
10171 |
u32 max_hw_frame_size; |
10172 |
@@ -28724,9 +28094,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/e1000.h linux-2.6.32.38/drivers/ne |
10173 |
}; |
10174 |
|
10175 |
/* hardware capability, feature, and workaround flags */ |
10176 |
-diff -urNp linux-2.6.32.38/drivers/net/e1000e/es2lan.c linux-2.6.32.38/drivers/net/e1000e/es2lan.c |
10177 |
---- linux-2.6.32.38/drivers/net/e1000e/es2lan.c 2011-03-27 14:31:47.000000000 -0400 |
10178 |
-+++ linux-2.6.32.38/drivers/net/e1000e/es2lan.c 2011-04-17 15:56:46.000000000 -0400 |
10179 |
+diff -urNp linux-2.6.32.39/drivers/net/e1000e/es2lan.c linux-2.6.32.39/drivers/net/e1000e/es2lan.c |
10180 |
+--- linux-2.6.32.39/drivers/net/e1000e/es2lan.c 2011-03-27 14:31:47.000000000 -0400 |
10181 |
++++ linux-2.6.32.39/drivers/net/e1000e/es2lan.c 2011-04-17 15:56:46.000000000 -0400 |
10182 |
@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es |
10183 |
{ |
10184 |
struct e1000_hw *hw = &adapter->hw; |
10185 |
@@ -28762,9 +28132,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/es2lan.c linux-2.6.32.38/drivers/n |
10186 |
.acquire_nvm = e1000_acquire_nvm_80003es2lan, |
10187 |
.read_nvm = e1000e_read_nvm_eerd, |
10188 |
.release_nvm = e1000_release_nvm_80003es2lan, |
10189 |
-diff -urNp linux-2.6.32.38/drivers/net/e1000e/hw.h linux-2.6.32.38/drivers/net/e1000e/hw.h |
10190 |
---- linux-2.6.32.38/drivers/net/e1000e/hw.h 2011-03-27 14:31:47.000000000 -0400 |
10191 |
-+++ linux-2.6.32.38/drivers/net/e1000e/hw.h 2011-04-17 15:56:46.000000000 -0400 |
10192 |
+diff -urNp linux-2.6.32.39/drivers/net/e1000e/hw.h linux-2.6.32.39/drivers/net/e1000e/hw.h |
10193 |
+--- linux-2.6.32.39/drivers/net/e1000e/hw.h 2011-03-27 14:31:47.000000000 -0400 |
10194 |
++++ linux-2.6.32.39/drivers/net/e1000e/hw.h 2011-04-17 15:56:46.000000000 -0400 |
10195 |
@@ -756,34 +756,34 @@ struct e1000_mac_operations { |
10196 |
|
10197 |
/* Function pointers for the PHY. */ |
10198 |
@@ -28824,9 +28194,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/hw.h linux-2.6.32.38/drivers/net/e |
10199 |
}; |
10200 |
|
10201 |
struct e1000_mac_info { |
10202 |
-diff -urNp linux-2.6.32.38/drivers/net/e1000e/ich8lan.c linux-2.6.32.38/drivers/net/e1000e/ich8lan.c |
10203 |
---- linux-2.6.32.38/drivers/net/e1000e/ich8lan.c 2011-03-27 14:31:47.000000000 -0400 |
10204 |
-+++ linux-2.6.32.38/drivers/net/e1000e/ich8lan.c 2011-04-17 15:56:46.000000000 -0400 |
10205 |
+diff -urNp linux-2.6.32.39/drivers/net/e1000e/ich8lan.c linux-2.6.32.39/drivers/net/e1000e/ich8lan.c |
10206 |
+--- linux-2.6.32.39/drivers/net/e1000e/ich8lan.c 2011-03-27 14:31:47.000000000 -0400 |
10207 |
++++ linux-2.6.32.39/drivers/net/e1000e/ich8lan.c 2011-04-17 15:56:46.000000000 -0400 |
10208 |
@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan |
10209 |
} |
10210 |
} |
10211 |
@@ -28854,9 +28224,9 @@ diff -urNp linux-2.6.32.38/drivers/net/e1000e/ich8lan.c linux-2.6.32.38/drivers/ |
10212 |
.acquire_nvm = e1000_acquire_nvm_ich8lan, |
10213 |
.read_nvm = e1000_read_nvm_ich8lan, |
10214 |
.release_nvm = e1000_release_nvm_ich8lan, |
10215 |
-diff -urNp linux-2.6.32.38/drivers/net/ibmveth.c linux-2.6.32.38/drivers/net/ibmveth.c |
10216 |
---- linux-2.6.32.38/drivers/net/ibmveth.c 2011-03-27 14:31:47.000000000 -0400 |
10217 |
-+++ linux-2.6.32.38/drivers/net/ibmveth.c 2011-04-17 15:56:46.000000000 -0400 |
10218 |
+diff -urNp linux-2.6.32.39/drivers/net/ibmveth.c linux-2.6.32.39/drivers/net/ibmveth.c |
10219 |
+--- linux-2.6.32.39/drivers/net/ibmveth.c 2011-03-27 14:31:47.000000000 -0400 |
10220 |
++++ linux-2.6.32.39/drivers/net/ibmveth.c 2011-04-17 15:56:46.000000000 -0400 |
10221 |
@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr |
10222 |
NULL, |
10223 |
}; |
10224 |
@@ -28866,9 +28236,9 @@ diff -urNp linux-2.6.32.38/drivers/net/ibmveth.c linux-2.6.32.38/drivers/net/ibm |
10225 |
.show = veth_pool_show, |
10226 |
.store = veth_pool_store, |
10227 |
}; |
10228 |
-diff -urNp linux-2.6.32.38/drivers/net/igb/e1000_82575.c linux-2.6.32.38/drivers/net/igb/e1000_82575.c |
10229 |
---- linux-2.6.32.38/drivers/net/igb/e1000_82575.c 2011-03-27 14:31:47.000000000 -0400 |
10230 |
-+++ linux-2.6.32.38/drivers/net/igb/e1000_82575.c 2011-04-17 15:56:46.000000000 -0400 |
10231 |
+diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_82575.c linux-2.6.32.39/drivers/net/igb/e1000_82575.c |
10232 |
+--- linux-2.6.32.39/drivers/net/igb/e1000_82575.c 2011-03-27 14:31:47.000000000 -0400 |
10233 |
++++ linux-2.6.32.39/drivers/net/igb/e1000_82575.c 2011-04-17 15:56:46.000000000 -0400 |
10234 |
@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct |
10235 |
wr32(E1000_VT_CTL, vt_ctl); |
10236 |
} |
10237 |
@@ -28894,9 +28264,9 @@ diff -urNp linux-2.6.32.38/drivers/net/igb/e1000_82575.c linux-2.6.32.38/drivers |
10238 |
.acquire = igb_acquire_nvm_82575, |
10239 |
.read = igb_read_nvm_eerd, |
10240 |
.release = igb_release_nvm_82575, |
10241 |
-diff -urNp linux-2.6.32.38/drivers/net/igb/e1000_hw.h linux-2.6.32.38/drivers/net/igb/e1000_hw.h |
10242 |
---- linux-2.6.32.38/drivers/net/igb/e1000_hw.h 2011-03-27 14:31:47.000000000 -0400 |
10243 |
-+++ linux-2.6.32.38/drivers/net/igb/e1000_hw.h 2011-04-17 15:56:46.000000000 -0400 |
10244 |
+diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_hw.h linux-2.6.32.39/drivers/net/igb/e1000_hw.h |
10245 |
+--- linux-2.6.32.39/drivers/net/igb/e1000_hw.h 2011-03-27 14:31:47.000000000 -0400 |
10246 |
++++ linux-2.6.32.39/drivers/net/igb/e1000_hw.h 2011-04-17 15:56:46.000000000 -0400 |
10247 |
@@ -305,17 +305,17 @@ struct e1000_phy_operations { |
10248 |
}; |
10249 |
|
10250 |
@@ -28922,28 +28292,9 @@ diff -urNp linux-2.6.32.38/drivers/net/igb/e1000_hw.h linux-2.6.32.38/drivers/ne |
10251 |
}; |
10252 |
|
10253 |
extern const struct e1000_info e1000_82575_info; |
10254 |
-diff -urNp linux-2.6.32.38/drivers/net/irda/vlsi_ir.c linux-2.6.32.38/drivers/net/irda/vlsi_ir.c |
10255 |
---- linux-2.6.32.38/drivers/net/irda/vlsi_ir.c 2011-03-27 14:31:47.000000000 -0400 |
10256 |
-+++ linux-2.6.32.38/drivers/net/irda/vlsi_ir.c 2011-04-17 15:56:46.000000000 -0400 |
10257 |
-@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( |
10258 |
- /* no race - tx-ring already empty */ |
10259 |
- vlsi_set_baud(idev, iobase); |
10260 |
- netif_wake_queue(ndev); |
10261 |
-- } |
10262 |
-- else |
10263 |
-- ; |
10264 |
-+ } else { |
10265 |
- /* keep the speed change pending like it would |
10266 |
- * for any len>0 packet. tx completion interrupt |
10267 |
- * will apply it when the tx ring becomes empty. |
10268 |
- */ |
10269 |
-+ } |
10270 |
- spin_unlock_irqrestore(&idev->lock, flags); |
10271 |
- dev_kfree_skb_any(skb); |
10272 |
- return NETDEV_TX_OK; |
10273 |
-diff -urNp linux-2.6.32.38/drivers/net/iseries_veth.c linux-2.6.32.38/drivers/net/iseries_veth.c |
10274 |
---- linux-2.6.32.38/drivers/net/iseries_veth.c 2011-03-27 14:31:47.000000000 -0400 |
10275 |
-+++ linux-2.6.32.38/drivers/net/iseries_veth.c 2011-04-17 15:56:46.000000000 -0400 |
10276 |
+diff -urNp linux-2.6.32.39/drivers/net/iseries_veth.c linux-2.6.32.39/drivers/net/iseries_veth.c |
10277 |
+--- linux-2.6.32.39/drivers/net/iseries_veth.c 2011-03-27 14:31:47.000000000 -0400 |
10278 |
++++ linux-2.6.32.39/drivers/net/iseries_veth.c 2011-04-17 15:56:46.000000000 -0400 |
10279 |
@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul |
10280 |
NULL |
10281 |
}; |
10282 |
@@ -28962,9 +28313,9 @@ diff -urNp linux-2.6.32.38/drivers/net/iseries_veth.c linux-2.6.32.38/drivers/ne |
10283 |
.show = veth_port_attribute_show |
10284 |
}; |
10285 |
|
10286 |
-diff -urNp linux-2.6.32.38/drivers/net/pcnet32.c linux-2.6.32.38/drivers/net/pcnet32.c |
10287 |
---- linux-2.6.32.38/drivers/net/pcnet32.c 2011-03-27 14:31:47.000000000 -0400 |
10288 |
-+++ linux-2.6.32.38/drivers/net/pcnet32.c 2011-04-17 15:56:46.000000000 -0400 |
10289 |
+diff -urNp linux-2.6.32.39/drivers/net/pcnet32.c linux-2.6.32.39/drivers/net/pcnet32.c |
10290 |
+--- linux-2.6.32.39/drivers/net/pcnet32.c 2011-03-27 14:31:47.000000000 -0400 |
10291 |
++++ linux-2.6.32.39/drivers/net/pcnet32.c 2011-04-17 15:56:46.000000000 -0400 |
10292 |
@@ -79,7 +79,7 @@ static int cards_found; |
10293 |
/* |
10294 |
* VLB I/O addresses |
10295 |
@@ -28974,9 +28325,9 @@ diff -urNp linux-2.6.32.38/drivers/net/pcnet32.c linux-2.6.32.38/drivers/net/pcn |
10296 |
{ 0x300, 0x320, 0x340, 0x360, 0 }; |
10297 |
|
10298 |
static int pcnet32_debug = 0; |
10299 |
-diff -urNp linux-2.6.32.38/drivers/net/tg3.h linux-2.6.32.38/drivers/net/tg3.h |
10300 |
---- linux-2.6.32.38/drivers/net/tg3.h 2011-03-27 14:31:47.000000000 -0400 |
10301 |
-+++ linux-2.6.32.38/drivers/net/tg3.h 2011-04-17 15:56:46.000000000 -0400 |
10302 |
+diff -urNp linux-2.6.32.39/drivers/net/tg3.h linux-2.6.32.39/drivers/net/tg3.h |
10303 |
+--- linux-2.6.32.39/drivers/net/tg3.h 2011-03-27 14:31:47.000000000 -0400 |
10304 |
++++ linux-2.6.32.39/drivers/net/tg3.h 2011-04-17 15:56:46.000000000 -0400 |
10305 |
@@ -95,6 +95,7 @@ |
10306 |
#define CHIPREV_ID_5750_A0 0x4000 |
10307 |
#define CHIPREV_ID_5750_A1 0x4001 |
10308 |
@@ -28985,9 +28336,9 @@ diff -urNp linux-2.6.32.38/drivers/net/tg3.h linux-2.6.32.38/drivers/net/tg3.h |
10309 |
#define CHIPREV_ID_5750_C2 0x4202 |
10310 |
#define CHIPREV_ID_5752_A0_HW 0x5000 |
10311 |
#define CHIPREV_ID_5752_A0 0x6000 |
10312 |
-diff -urNp linux-2.6.32.38/drivers/net/tulip/de4x5.c linux-2.6.32.38/drivers/net/tulip/de4x5.c |
10313 |
---- linux-2.6.32.38/drivers/net/tulip/de4x5.c 2011-03-27 14:31:47.000000000 -0400 |
10314 |
-+++ linux-2.6.32.38/drivers/net/tulip/de4x5.c 2011-04-17 15:56:46.000000000 -0400 |
10315 |
+diff -urNp linux-2.6.32.39/drivers/net/tulip/de4x5.c linux-2.6.32.39/drivers/net/tulip/de4x5.c |
10316 |
+--- linux-2.6.32.39/drivers/net/tulip/de4x5.c 2011-03-27 14:31:47.000000000 -0400 |
10317 |
++++ linux-2.6.32.39/drivers/net/tulip/de4x5.c 2011-04-17 15:56:46.000000000 -0400 |
10318 |
@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru |
10319 |
for (i=0; i<ETH_ALEN; i++) { |
10320 |
tmp.addr[i] = dev->dev_addr[i]; |
10321 |
@@ -29006,9 +28357,9 @@ diff -urNp linux-2.6.32.38/drivers/net/tulip/de4x5.c linux-2.6.32.38/drivers/net |
10322 |
return -EFAULT; |
10323 |
break; |
10324 |
} |
10325 |
-diff -urNp linux-2.6.32.38/drivers/net/usb/hso.c linux-2.6.32.38/drivers/net/usb/hso.c |
10326 |
---- linux-2.6.32.38/drivers/net/usb/hso.c 2011-03-27 14:31:47.000000000 -0400 |
10327 |
-+++ linux-2.6.32.38/drivers/net/usb/hso.c 2011-04-17 15:56:46.000000000 -0400 |
10328 |
+diff -urNp linux-2.6.32.39/drivers/net/usb/hso.c linux-2.6.32.39/drivers/net/usb/hso.c |
10329 |
+--- linux-2.6.32.39/drivers/net/usb/hso.c 2011-03-27 14:31:47.000000000 -0400 |
10330 |
++++ linux-2.6.32.39/drivers/net/usb/hso.c 2011-04-17 15:56:46.000000000 -0400 |
10331 |
@@ -71,7 +71,7 @@ |
10332 |
#include <asm/byteorder.h> |
10333 |
#include <linux/serial_core.h> |
10334 |
@@ -29096,9 +28447,9 @@ diff -urNp linux-2.6.32.38/drivers/net/usb/hso.c linux-2.6.32.38/drivers/net/usb |
10335 |
result = |
10336 |
hso_start_serial_device(serial_table[i], GFP_NOIO); |
10337 |
hso_kick_transmit(dev2ser(serial_table[i])); |
10338 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c |
10339 |
---- linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c 2011-03-27 14:31:47.000000000 -0400 |
10340 |
-+++ linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:56:46.000000000 -0400 |
10341 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c |
10342 |
+--- linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c 2011-03-27 14:31:47.000000000 -0400 |
10343 |
++++ linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:56:46.000000000 -0400 |
10344 |
@@ -43,7 +43,7 @@ static struct dentry *rootdir; |
10345 |
struct b43_debugfs_fops { |
10346 |
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); |
10347 |
@@ -29108,9 +28459,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/b43/debugfs.c linux-2.6.32.38/dr |
10348 |
/* Offset of struct b43_dfs_file in struct b43_dfsentry */ |
10349 |
size_t file_struct_offset; |
10350 |
}; |
10351 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c |
10352 |
---- linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c 2011-03-27 14:31:47.000000000 -0400 |
10353 |
-+++ linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 15:56:46.000000000 -0400 |
10354 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c |
10355 |
+--- linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c 2011-03-27 14:31:47.000000000 -0400 |
10356 |
++++ linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 15:56:46.000000000 -0400 |
10357 |
@@ -44,7 +44,7 @@ static struct dentry *rootdir; |
10358 |
struct b43legacy_debugfs_fops { |
10359 |
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); |
10360 |
@@ -29120,9 +28471,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32 |
10361 |
/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ |
10362 |
size_t file_struct_offset; |
10363 |
/* Take wl->irq_lock before calling read/write? */ |
10364 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c |
10365 |
---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-03-27 14:31:47.000000000 -0400 |
10366 |
-+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-04-17 15:56:46.000000000 -0400 |
10367 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c |
10368 |
+--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-03-27 14:31:47.000000000 -0400 |
10369 |
++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-04-17 15:56:46.000000000 -0400 |
10370 |
@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = |
10371 |
}, |
10372 |
}; |
10373 |
@@ -29132,9 +28483,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. |
10374 |
.ucode = &iwl5000_ucode, |
10375 |
.lib = &iwl1000_lib, |
10376 |
.hcmd = &iwl5000_hcmd, |
10377 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c |
10378 |
---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-03-27 14:31:47.000000000 -0400 |
10379 |
-+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-04-17 15:56:46.000000000 -0400 |
10380 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c |
10381 |
+--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-03-27 14:31:47.000000000 -0400 |
10382 |
++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-04-17 15:56:46.000000000 -0400 |
10383 |
@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 |
10384 |
.build_addsta_hcmd = iwl3945_build_addsta_hcmd, |
10385 |
}; |
10386 |
@@ -29144,9 +28495,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. |
10387 |
.ucode = &iwl3945_ucode, |
10388 |
.lib = &iwl3945_lib, |
10389 |
.hcmd = &iwl3945_hcmd, |
10390 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c |
10391 |
---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-03-27 14:31:47.000000000 -0400 |
10392 |
-+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-04-17 15:56:46.000000000 -0400 |
10393 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c |
10394 |
+--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-03-27 14:31:47.000000000 -0400 |
10395 |
++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-04-17 15:56:46.000000000 -0400 |
10396 |
@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = |
10397 |
}, |
10398 |
}; |
10399 |
@@ -29156,9 +28507,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. |
10400 |
.ucode = &iwl4965_ucode, |
10401 |
.lib = &iwl4965_lib, |
10402 |
.hcmd = &iwl4965_hcmd, |
10403 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c |
10404 |
---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-03-27 14:31:47.000000000 -0400 |
10405 |
-+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-04-17 15:56:46.000000000 -0400 |
10406 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c |
10407 |
+--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-03-27 14:31:47.000000000 -0400 |
10408 |
++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-04-17 15:56:46.000000000 -0400 |
10409 |
@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = |
10410 |
}, |
10411 |
}; |
10412 |
@@ -29176,9 +28527,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. |
10413 |
.ucode = &iwl5000_ucode, |
10414 |
.lib = &iwl5150_lib, |
10415 |
.hcmd = &iwl5000_hcmd, |
10416 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c |
10417 |
---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-03-27 14:31:47.000000000 -0400 |
10418 |
-+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-04-17 15:56:46.000000000 -0400 |
10419 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c |
10420 |
+--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-03-27 14:31:47.000000000 -0400 |
10421 |
++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-04-17 15:56:46.000000000 -0400 |
10422 |
@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 |
10423 |
.calc_rssi = iwl5000_calc_rssi, |
10424 |
}; |
10425 |
@@ -29188,9 +28539,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. |
10426 |
.ucode = &iwl5000_ucode, |
10427 |
.lib = &iwl6000_lib, |
10428 |
.hcmd = &iwl5000_hcmd, |
10429 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h |
10430 |
---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-27 14:31:47.000000000 -0400 |
10431 |
-+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 15:56:46.000000000 -0400 |
10432 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h |
10433 |
+--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-27 14:31:47.000000000 -0400 |
10434 |
++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 15:56:46.000000000 -0400 |
10435 |
@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri |
10436 |
#endif |
10437 |
|
10438 |
@@ -29202,9 +28553,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32 |
10439 |
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, |
10440 |
void *p, u32 len) |
10441 |
{} |
10442 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h |
10443 |
---- linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-03-27 14:31:47.000000000 -0400 |
10444 |
-+++ linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-04-17 15:56:46.000000000 -0400 |
10445 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h |
10446 |
+--- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-03-27 14:31:47.000000000 -0400 |
10447 |
++++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-04-17 15:56:46.000000000 -0400 |
10448 |
@@ -68,7 +68,7 @@ struct iwl_tx_queue; |
10449 |
|
10450 |
/* shared structures from iwl-5000.c */ |
10451 |
@@ -29214,9 +28565,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.3 |
10452 |
extern struct iwl_ucode_ops iwl5000_ucode; |
10453 |
extern struct iwl_lib_ops iwl5000_lib; |
10454 |
extern struct iwl_hcmd_ops iwl5000_hcmd; |
10455 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c |
10456 |
---- linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c 2011-03-27 14:31:47.000000000 -0400 |
10457 |
-+++ linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15:56:46.000000000 -0400 |
10458 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c |
10459 |
+--- linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c 2011-03-27 14:31:47.000000000 -0400 |
10460 |
++++ linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15:56:46.000000000 -0400 |
10461 |
@@ -708,7 +708,7 @@ out_unlock: |
10462 |
struct lbs_debugfs_files { |
10463 |
const char *name; |
10464 |
@@ -29226,9 +28577,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. |
10465 |
}; |
10466 |
|
10467 |
static const struct lbs_debugfs_files debugfs_files[] = { |
10468 |
-diff -urNp linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c |
10469 |
---- linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c 2011-03-27 14:31:47.000000000 -0400 |
10470 |
-+++ linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:56:46.000000000 -0400 |
10471 |
+diff -urNp linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c |
10472 |
+--- linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c 2011-03-27 14:31:47.000000000 -0400 |
10473 |
++++ linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:56:46.000000000 -0400 |
10474 |
@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn |
10475 |
|
10476 |
devdbg(usbdev, "set_rts_threshold %i", rts_threshold); |
10477 |
@@ -29238,9 +28589,9 @@ diff -urNp linux-2.6.32.38/drivers/net/wireless/rndis_wlan.c linux-2.6.32.38/dri |
10478 |
rts_threshold = 2347; |
10479 |
|
10480 |
tmp = cpu_to_le32(rts_threshold); |
10481 |
-diff -urNp linux-2.6.32.38/drivers/oprofile/buffer_sync.c linux-2.6.32.38/drivers/oprofile/buffer_sync.c |
10482 |
---- linux-2.6.32.38/drivers/oprofile/buffer_sync.c 2011-03-27 14:31:47.000000000 -0400 |
10483 |
-+++ linux-2.6.32.38/drivers/oprofile/buffer_sync.c 2011-04-17 15:56:46.000000000 -0400 |
10484 |
+diff -urNp linux-2.6.32.39/drivers/oprofile/buffer_sync.c linux-2.6.32.39/drivers/oprofile/buffer_sync.c |
10485 |
+--- linux-2.6.32.39/drivers/oprofile/buffer_sync.c 2011-03-27 14:31:47.000000000 -0400 |
10486 |
++++ linux-2.6.32.39/drivers/oprofile/buffer_sync.c 2011-04-17 15:56:46.000000000 -0400 |
10487 |
@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en |
10488 |
if (cookie == NO_COOKIE) |
10489 |
offset = pc; |
10490 |
@@ -29276,9 +28627,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/buffer_sync.c linux-2.6.32.38/driver |
10491 |
} |
10492 |
} |
10493 |
release_mm(mm); |
10494 |
-diff -urNp linux-2.6.32.38/drivers/oprofile/event_buffer.c linux-2.6.32.38/drivers/oprofile/event_buffer.c |
10495 |
---- linux-2.6.32.38/drivers/oprofile/event_buffer.c 2011-03-27 14:31:47.000000000 -0400 |
10496 |
-+++ linux-2.6.32.38/drivers/oprofile/event_buffer.c 2011-04-17 15:56:46.000000000 -0400 |
10497 |
+diff -urNp linux-2.6.32.39/drivers/oprofile/event_buffer.c linux-2.6.32.39/drivers/oprofile/event_buffer.c |
10498 |
+--- linux-2.6.32.39/drivers/oprofile/event_buffer.c 2011-03-27 14:31:47.000000000 -0400 |
10499 |
++++ linux-2.6.32.39/drivers/oprofile/event_buffer.c 2011-04-17 15:56:46.000000000 -0400 |
10500 |
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value |
10501 |
} |
10502 |
|
10503 |
@@ -29288,9 +28639,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/event_buffer.c linux-2.6.32.38/drive |
10504 |
return; |
10505 |
} |
10506 |
|
10507 |
-diff -urNp linux-2.6.32.38/drivers/oprofile/oprof.c linux-2.6.32.38/drivers/oprofile/oprof.c |
10508 |
---- linux-2.6.32.38/drivers/oprofile/oprof.c 2011-03-27 14:31:47.000000000 -0400 |
10509 |
-+++ linux-2.6.32.38/drivers/oprofile/oprof.c 2011-04-17 15:56:46.000000000 -0400 |
10510 |
+diff -urNp linux-2.6.32.39/drivers/oprofile/oprof.c linux-2.6.32.39/drivers/oprofile/oprof.c |
10511 |
+--- linux-2.6.32.39/drivers/oprofile/oprof.c 2011-03-27 14:31:47.000000000 -0400 |
10512 |
++++ linux-2.6.32.39/drivers/oprofile/oprof.c 2011-04-17 15:56:46.000000000 -0400 |
10513 |
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st |
10514 |
if (oprofile_ops.switch_events()) |
10515 |
return; |
10516 |
@@ -29300,9 +28651,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprof.c linux-2.6.32.38/drivers/opro |
10517 |
start_switch_worker(); |
10518 |
} |
10519 |
|
10520 |
-diff -urNp linux-2.6.32.38/drivers/oprofile/oprofilefs.c linux-2.6.32.38/drivers/oprofile/oprofilefs.c |
10521 |
---- linux-2.6.32.38/drivers/oprofile/oprofilefs.c 2011-03-27 14:31:47.000000000 -0400 |
10522 |
-+++ linux-2.6.32.38/drivers/oprofile/oprofilefs.c 2011-04-17 15:56:46.000000000 -0400 |
10523 |
+diff -urNp linux-2.6.32.39/drivers/oprofile/oprofilefs.c linux-2.6.32.39/drivers/oprofile/oprofilefs.c |
10524 |
+--- linux-2.6.32.39/drivers/oprofile/oprofilefs.c 2011-03-27 14:31:47.000000000 -0400 |
10525 |
++++ linux-2.6.32.39/drivers/oprofile/oprofilefs.c 2011-04-17 15:56:46.000000000 -0400 |
10526 |
@@ -187,7 +187,7 @@ static const struct file_operations atom |
10527 |
|
10528 |
|
10529 |
@@ -29312,9 +28663,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprofilefs.c linux-2.6.32.38/drivers |
10530 |
{ |
10531 |
struct dentry *d = __oprofilefs_create_file(sb, root, name, |
10532 |
&atomic_ro_fops, 0444); |
10533 |
-diff -urNp linux-2.6.32.38/drivers/oprofile/oprofile_stats.c linux-2.6.32.38/drivers/oprofile/oprofile_stats.c |
10534 |
---- linux-2.6.32.38/drivers/oprofile/oprofile_stats.c 2011-03-27 14:31:47.000000000 -0400 |
10535 |
-+++ linux-2.6.32.38/drivers/oprofile/oprofile_stats.c 2011-04-17 15:56:46.000000000 -0400 |
10536 |
+diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.c linux-2.6.32.39/drivers/oprofile/oprofile_stats.c |
10537 |
+--- linux-2.6.32.39/drivers/oprofile/oprofile_stats.c 2011-03-27 14:31:47.000000000 -0400 |
10538 |
++++ linux-2.6.32.39/drivers/oprofile/oprofile_stats.c 2011-04-17 15:56:46.000000000 -0400 |
10539 |
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) |
10540 |
cpu_buf->sample_invalid_eip = 0; |
10541 |
} |
10542 |
@@ -29332,9 +28683,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprofile_stats.c linux-2.6.32.38/dri |
10543 |
} |
10544 |
|
10545 |
|
10546 |
-diff -urNp linux-2.6.32.38/drivers/oprofile/oprofile_stats.h linux-2.6.32.38/drivers/oprofile/oprofile_stats.h |
10547 |
---- linux-2.6.32.38/drivers/oprofile/oprofile_stats.h 2011-03-27 14:31:47.000000000 -0400 |
10548 |
-+++ linux-2.6.32.38/drivers/oprofile/oprofile_stats.h 2011-04-17 15:56:46.000000000 -0400 |
10549 |
+diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.h linux-2.6.32.39/drivers/oprofile/oprofile_stats.h |
10550 |
+--- linux-2.6.32.39/drivers/oprofile/oprofile_stats.h 2011-03-27 14:31:47.000000000 -0400 |
10551 |
++++ linux-2.6.32.39/drivers/oprofile/oprofile_stats.h 2011-04-17 15:56:46.000000000 -0400 |
10552 |
@@ -13,11 +13,11 @@ |
10553 |
#include <asm/atomic.h> |
10554 |
|
10555 |
@@ -29352,9 +28703,9 @@ diff -urNp linux-2.6.32.38/drivers/oprofile/oprofile_stats.h linux-2.6.32.38/dri |
10556 |
}; |
10557 |
|
10558 |
extern struct oprofile_stat_struct oprofile_stats; |
10559 |
-diff -urNp linux-2.6.32.38/drivers/parisc/pdc_stable.c linux-2.6.32.38/drivers/parisc/pdc_stable.c |
10560 |
---- linux-2.6.32.38/drivers/parisc/pdc_stable.c 2011-03-27 14:31:47.000000000 -0400 |
10561 |
-+++ linux-2.6.32.38/drivers/parisc/pdc_stable.c 2011-04-17 15:56:46.000000000 -0400 |
10562 |
+diff -urNp linux-2.6.32.39/drivers/parisc/pdc_stable.c linux-2.6.32.39/drivers/parisc/pdc_stable.c |
10563 |
+--- linux-2.6.32.39/drivers/parisc/pdc_stable.c 2011-03-27 14:31:47.000000000 -0400 |
10564 |
++++ linux-2.6.32.39/drivers/parisc/pdc_stable.c 2011-04-17 15:56:46.000000000 -0400 |
10565 |
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj |
10566 |
return ret; |
10567 |
} |
10568 |
@@ -29364,9 +28715,9 @@ diff -urNp linux-2.6.32.38/drivers/parisc/pdc_stable.c linux-2.6.32.38/drivers/p |
10569 |
.show = pdcspath_attr_show, |
10570 |
.store = pdcspath_attr_store, |
10571 |
}; |
10572 |
-diff -urNp linux-2.6.32.38/drivers/parport/procfs.c linux-2.6.32.38/drivers/parport/procfs.c |
10573 |
---- linux-2.6.32.38/drivers/parport/procfs.c 2011-03-27 14:31:47.000000000 -0400 |
10574 |
-+++ linux-2.6.32.38/drivers/parport/procfs.c 2011-04-17 15:56:46.000000000 -0400 |
10575 |
+diff -urNp linux-2.6.32.39/drivers/parport/procfs.c linux-2.6.32.39/drivers/parport/procfs.c |
10576 |
+--- linux-2.6.32.39/drivers/parport/procfs.c 2011-03-27 14:31:47.000000000 -0400 |
10577 |
++++ linux-2.6.32.39/drivers/parport/procfs.c 2011-04-17 15:56:46.000000000 -0400 |
10578 |
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t |
10579 |
|
10580 |
*ppos += len; |
10581 |
@@ -29385,9 +28736,9 @@ diff -urNp linux-2.6.32.38/drivers/parport/procfs.c linux-2.6.32.38/drivers/parp |
10582 |
} |
10583 |
#endif /* IEEE1284.3 support. */ |
10584 |
|
10585 |
-diff -urNp linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c |
10586 |
---- linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c 2011-03-27 14:31:47.000000000 -0400 |
10587 |
-+++ linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:56:46.000000000 -0400 |
10588 |
+diff -urNp linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c |
10589 |
+--- linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c 2011-03-27 14:31:47.000000000 -0400 |
10590 |
++++ linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:56:46.000000000 -0400 |
10591 |
@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif |
10592 |
} |
10593 |
|
10594 |
@@ -29397,9 +28748,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.38/dr |
10595 |
.handler = handle_hotplug_event_func, |
10596 |
}; |
10597 |
|
10598 |
-diff -urNp linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c |
10599 |
---- linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-27 14:31:47.000000000 -0400 |
10600 |
-+++ linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:56:46.000000000 -0400 |
10601 |
+diff -urNp linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c |
10602 |
+--- linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-27 14:31:47.000000000 -0400 |
10603 |
++++ linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:56:46.000000000 -0400 |
10604 |
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ |
10605 |
|
10606 |
void compaq_nvram_init (void __iomem *rom_start) |
10607 |
@@ -29414,9 +28765,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.38/dr |
10608 |
dbg("int15 entry = %p\n", compaq_int15_entry_point); |
10609 |
|
10610 |
/* initialize our int15 lock */ |
10611 |
-diff -urNp linux-2.6.32.38/drivers/pci/hotplug/fakephp.c linux-2.6.32.38/drivers/pci/hotplug/fakephp.c |
10612 |
---- linux-2.6.32.38/drivers/pci/hotplug/fakephp.c 2011-03-27 14:31:47.000000000 -0400 |
10613 |
-+++ linux-2.6.32.38/drivers/pci/hotplug/fakephp.c 2011-04-17 15:56:46.000000000 -0400 |
10614 |
+diff -urNp linux-2.6.32.39/drivers/pci/hotplug/fakephp.c linux-2.6.32.39/drivers/pci/hotplug/fakephp.c |
10615 |
+--- linux-2.6.32.39/drivers/pci/hotplug/fakephp.c 2011-03-27 14:31:47.000000000 -0400 |
10616 |
++++ linux-2.6.32.39/drivers/pci/hotplug/fakephp.c 2011-04-17 15:56:46.000000000 -0400 |
10617 |
@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec |
10618 |
} |
10619 |
|
10620 |
@@ -29426,9 +28777,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/hotplug/fakephp.c linux-2.6.32.38/drivers |
10621 |
.store = legacy_store, .show = legacy_show |
10622 |
}, |
10623 |
.release = &legacy_release, |
10624 |
-diff -urNp linux-2.6.32.38/drivers/pci/intel-iommu.c linux-2.6.32.38/drivers/pci/intel-iommu.c |
10625 |
---- linux-2.6.32.38/drivers/pci/intel-iommu.c 2011-03-27 14:31:47.000000000 -0400 |
10626 |
-+++ linux-2.6.32.38/drivers/pci/intel-iommu.c 2011-04-17 15:56:46.000000000 -0400 |
10627 |
+diff -urNp linux-2.6.32.39/drivers/pci/intel-iommu.c linux-2.6.32.39/drivers/pci/intel-iommu.c |
10628 |
+--- linux-2.6.32.39/drivers/pci/intel-iommu.c 2011-03-27 14:31:47.000000000 -0400 |
10629 |
++++ linux-2.6.32.39/drivers/pci/intel-iommu.c 2011-04-17 15:56:46.000000000 -0400 |
10630 |
@@ -2643,7 +2643,7 @@ error: |
10631 |
return 0; |
10632 |
} |
10633 |
@@ -29498,9 +28849,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/intel-iommu.c linux-2.6.32.38/drivers/pci |
10634 |
.alloc_coherent = intel_alloc_coherent, |
10635 |
.free_coherent = intel_free_coherent, |
10636 |
.map_sg = intel_map_sg, |
10637 |
-diff -urNp linux-2.6.32.38/drivers/pci/pcie/aspm.c linux-2.6.32.38/drivers/pci/pcie/aspm.c |
10638 |
---- linux-2.6.32.38/drivers/pci/pcie/aspm.c 2011-03-27 14:31:47.000000000 -0400 |
10639 |
-+++ linux-2.6.32.38/drivers/pci/pcie/aspm.c 2011-04-17 15:56:46.000000000 -0400 |
10640 |
+diff -urNp linux-2.6.32.39/drivers/pci/pcie/aspm.c linux-2.6.32.39/drivers/pci/pcie/aspm.c |
10641 |
+--- linux-2.6.32.39/drivers/pci/pcie/aspm.c 2011-03-27 14:31:47.000000000 -0400 |
10642 |
++++ linux-2.6.32.39/drivers/pci/pcie/aspm.c 2011-04-17 15:56:46.000000000 -0400 |
10643 |
@@ -27,9 +27,9 @@ |
10644 |
#define MODULE_PARAM_PREFIX "pcie_aspm." |
10645 |
|
10646 |
@@ -29514,21 +28865,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/pcie/aspm.c linux-2.6.32.38/drivers/pci/p |
10647 |
#define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) |
10648 |
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) |
10649 |
|
10650 |
-diff -urNp linux-2.6.32.38/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.38/drivers/pci/pcie/portdrv_pci.c |
10651 |
---- linux-2.6.32.38/drivers/pci/pcie/portdrv_pci.c 2011-03-27 14:31:47.000000000 -0400 |
10652 |
-+++ linux-2.6.32.38/drivers/pci/pcie/portdrv_pci.c 2011-04-17 15:56:46.000000000 -0400 |
10653 |
-@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru |
10654 |
- static const struct pci_device_id port_pci_ids[] = { { |
10655 |
- /* handle any PCI-Express port */ |
10656 |
- PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0), |
10657 |
-- }, { /* end: all zeroes */ } |
10658 |
-+ }, { 0, 0, 0, 0, 0, 0, 0 } |
10659 |
- }; |
10660 |
- MODULE_DEVICE_TABLE(pci, port_pci_ids); |
10661 |
- |
10662 |
-diff -urNp linux-2.6.32.38/drivers/pci/probe.c linux-2.6.32.38/drivers/pci/probe.c |
10663 |
---- linux-2.6.32.38/drivers/pci/probe.c 2011-03-27 14:31:47.000000000 -0400 |
10664 |
-+++ linux-2.6.32.38/drivers/pci/probe.c 2011-04-17 15:56:46.000000000 -0400 |
10665 |
+diff -urNp linux-2.6.32.39/drivers/pci/probe.c linux-2.6.32.39/drivers/pci/probe.c |
10666 |
+--- linux-2.6.32.39/drivers/pci/probe.c 2011-03-27 14:31:47.000000000 -0400 |
10667 |
++++ linux-2.6.32.39/drivers/pci/probe.c 2011-04-17 15:56:46.000000000 -0400 |
10668 |
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( |
10669 |
return ret; |
10670 |
} |
10671 |
@@ -29546,9 +28885,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/probe.c linux-2.6.32.38/drivers/pci/probe |
10672 |
struct device_attribute *attr, |
10673 |
char *buf) |
10674 |
{ |
10675 |
-diff -urNp linux-2.6.32.38/drivers/pci/proc.c linux-2.6.32.38/drivers/pci/proc.c |
10676 |
---- linux-2.6.32.38/drivers/pci/proc.c 2011-03-27 14:31:47.000000000 -0400 |
10677 |
-+++ linux-2.6.32.38/drivers/pci/proc.c 2011-04-17 15:56:46.000000000 -0400 |
10678 |
+diff -urNp linux-2.6.32.39/drivers/pci/proc.c linux-2.6.32.39/drivers/pci/proc.c |
10679 |
+--- linux-2.6.32.39/drivers/pci/proc.c 2011-03-27 14:31:47.000000000 -0400 |
10680 |
++++ linux-2.6.32.39/drivers/pci/proc.c 2011-04-17 15:56:46.000000000 -0400 |
10681 |
@@ -480,7 +480,16 @@ static const struct file_operations proc |
10682 |
static int __init pci_proc_init(void) |
10683 |
{ |
10684 |
@@ -29566,9 +28905,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/proc.c linux-2.6.32.38/drivers/pci/proc.c |
10685 |
proc_create("devices", 0, proc_bus_pci_dir, |
10686 |
&proc_bus_pci_dev_operations); |
10687 |
proc_initialized = 1; |
10688 |
-diff -urNp linux-2.6.32.38/drivers/pci/slot.c linux-2.6.32.38/drivers/pci/slot.c |
10689 |
---- linux-2.6.32.38/drivers/pci/slot.c 2011-03-27 14:31:47.000000000 -0400 |
10690 |
-+++ linux-2.6.32.38/drivers/pci/slot.c 2011-04-17 15:56:46.000000000 -0400 |
10691 |
+diff -urNp linux-2.6.32.39/drivers/pci/slot.c linux-2.6.32.39/drivers/pci/slot.c |
10692 |
+--- linux-2.6.32.39/drivers/pci/slot.c 2011-03-27 14:31:47.000000000 -0400 |
10693 |
++++ linux-2.6.32.39/drivers/pci/slot.c 2011-04-17 15:56:46.000000000 -0400 |
10694 |
@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc |
10695 |
return attribute->store ? attribute->store(slot, buf, len) : -EIO; |
10696 |
} |
10697 |
@@ -29578,9 +28917,9 @@ diff -urNp linux-2.6.32.38/drivers/pci/slot.c linux-2.6.32.38/drivers/pci/slot.c |
10698 |
.show = pci_slot_attr_show, |
10699 |
.store = pci_slot_attr_store, |
10700 |
}; |
10701 |
-diff -urNp linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c |
10702 |
---- linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
10703 |
-+++ linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
10704 |
+diff -urNp linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c |
10705 |
+--- linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
10706 |
++++ linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
10707 |
@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode |
10708 |
return -EFAULT; |
10709 |
} |
10710 |
@@ -29590,33 +28929,9 @@ diff -urNp linux-2.6.32.38/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.38/drivers |
10711 |
if (!buf) |
10712 |
return -ENOMEM; |
10713 |
|
10714 |
-diff -urNp linux-2.6.32.38/drivers/pcmcia/ti113x.h linux-2.6.32.38/drivers/pcmcia/ti113x.h |
10715 |
---- linux-2.6.32.38/drivers/pcmcia/ti113x.h 2011-03-27 14:31:47.000000000 -0400 |
10716 |
-+++ linux-2.6.32.38/drivers/pcmcia/ti113x.h 2011-04-17 15:56:46.000000000 -0400 |
10717 |
-@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl |
10718 |
- DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, |
10719 |
- ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), |
10720 |
- |
10721 |
-- {} |
10722 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
10723 |
- }; |
10724 |
- |
10725 |
- static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) |
10726 |
-diff -urNp linux-2.6.32.38/drivers/pcmcia/yenta_socket.c linux-2.6.32.38/drivers/pcmcia/yenta_socket.c |
10727 |
---- linux-2.6.32.38/drivers/pcmcia/yenta_socket.c 2011-03-27 14:31:47.000000000 -0400 |
10728 |
-+++ linux-2.6.32.38/drivers/pcmcia/yenta_socket.c 2011-04-17 15:56:46.000000000 -0400 |
10729 |
-@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table |
10730 |
- |
10731 |
- /* match any cardbus bridge */ |
10732 |
- CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT), |
10733 |
-- { /* all zeroes */ } |
10734 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
10735 |
- }; |
10736 |
- MODULE_DEVICE_TABLE(pci, yenta_table); |
10737 |
- |
10738 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/acer-wmi.c linux-2.6.32.38/drivers/platform/x86/acer-wmi.c |
10739 |
---- linux-2.6.32.38/drivers/platform/x86/acer-wmi.c 2011-03-27 14:31:47.000000000 -0400 |
10740 |
-+++ linux-2.6.32.38/drivers/platform/x86/acer-wmi.c 2011-04-17 15:56:46.000000000 -0400 |
10741 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/acer-wmi.c linux-2.6.32.39/drivers/platform/x86/acer-wmi.c |
10742 |
+--- linux-2.6.32.39/drivers/platform/x86/acer-wmi.c 2011-03-27 14:31:47.000000000 -0400 |
10743 |
++++ linux-2.6.32.39/drivers/platform/x86/acer-wmi.c 2011-04-17 15:56:46.000000000 -0400 |
10744 |
@@ -918,7 +918,7 @@ static int update_bl_status(struct backl |
10745 |
return 0; |
10746 |
} |
10747 |
@@ -29626,9 +28941,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/acer-wmi.c linux-2.6.32.38/drive |
10748 |
.get_brightness = read_brightness, |
10749 |
.update_status = update_bl_status, |
10750 |
}; |
10751 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/asus_acpi.c linux-2.6.32.38/drivers/platform/x86/asus_acpi.c |
10752 |
---- linux-2.6.32.38/drivers/platform/x86/asus_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
10753 |
-+++ linux-2.6.32.38/drivers/platform/x86/asus_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
10754 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/asus_acpi.c linux-2.6.32.39/drivers/platform/x86/asus_acpi.c |
10755 |
+--- linux-2.6.32.39/drivers/platform/x86/asus_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
10756 |
++++ linux-2.6.32.39/drivers/platform/x86/asus_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
10757 |
@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_ |
10758 |
return 0; |
10759 |
} |
10760 |
@@ -29638,9 +28953,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/asus_acpi.c linux-2.6.32.38/driv |
10761 |
.get_brightness = read_brightness, |
10762 |
.update_status = set_brightness_status, |
10763 |
}; |
10764 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/asus-laptop.c linux-2.6.32.38/drivers/platform/x86/asus-laptop.c |
10765 |
---- linux-2.6.32.38/drivers/platform/x86/asus-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10766 |
-+++ linux-2.6.32.38/drivers/platform/x86/asus-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10767 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/asus-laptop.c linux-2.6.32.39/drivers/platform/x86/asus-laptop.c |
10768 |
+--- linux-2.6.32.39/drivers/platform/x86/asus-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10769 |
++++ linux-2.6.32.39/drivers/platform/x86/asus-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10770 |
@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac |
10771 |
*/ |
10772 |
static int read_brightness(struct backlight_device *bd); |
10773 |
@@ -29650,9 +28965,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/asus-laptop.c linux-2.6.32.38/dr |
10774 |
.get_brightness = read_brightness, |
10775 |
.update_status = update_bl_status, |
10776 |
}; |
10777 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/compal-laptop.c linux-2.6.32.38/drivers/platform/x86/compal-laptop.c |
10778 |
---- linux-2.6.32.38/drivers/platform/x86/compal-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10779 |
-+++ linux-2.6.32.38/drivers/platform/x86/compal-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10780 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/compal-laptop.c linux-2.6.32.39/drivers/platform/x86/compal-laptop.c |
10781 |
+--- linux-2.6.32.39/drivers/platform/x86/compal-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10782 |
++++ linux-2.6.32.39/drivers/platform/x86/compal-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10783 |
@@ -163,7 +163,7 @@ static int bl_update_status(struct backl |
10784 |
return set_lcd_level(b->props.brightness); |
10785 |
} |
10786 |
@@ -29662,9 +28977,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/compal-laptop.c linux-2.6.32.38/ |
10787 |
.get_brightness = bl_get_brightness, |
10788 |
.update_status = bl_update_status, |
10789 |
}; |
10790 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/dell-laptop.c linux-2.6.32.38/drivers/platform/x86/dell-laptop.c |
10791 |
---- linux-2.6.32.38/drivers/platform/x86/dell-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10792 |
-+++ linux-2.6.32.38/drivers/platform/x86/dell-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10793 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/dell-laptop.c linux-2.6.32.39/drivers/platform/x86/dell-laptop.c |
10794 |
+--- linux-2.6.32.39/drivers/platform/x86/dell-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10795 |
++++ linux-2.6.32.39/drivers/platform/x86/dell-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10796 |
@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac |
10797 |
return buffer.output[1]; |
10798 |
} |
10799 |
@@ -29674,9 +28989,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/dell-laptop.c linux-2.6.32.38/dr |
10800 |
.get_brightness = dell_get_intensity, |
10801 |
.update_status = dell_send_intensity, |
10802 |
}; |
10803 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c |
10804 |
---- linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10805 |
-+++ linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10806 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c |
10807 |
+--- linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10808 |
++++ linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10809 |
@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device |
10810 |
*/ |
10811 |
static int read_brightness(struct backlight_device *bd); |
10812 |
@@ -29686,9 +29001,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.38/d |
10813 |
.get_brightness = read_brightness, |
10814 |
.update_status = update_bl_status, |
10815 |
}; |
10816 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c |
10817 |
---- linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10818 |
-+++ linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10819 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c |
10820 |
+--- linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10821 |
++++ linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10822 |
@@ -436,7 +436,7 @@ static int bl_update_status(struct backl |
10823 |
return ret; |
10824 |
} |
10825 |
@@ -29698,9 +29013,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.38 |
10826 |
.get_brightness = bl_get_brightness, |
10827 |
.update_status = bl_update_status, |
10828 |
}; |
10829 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/msi-laptop.c linux-2.6.32.38/drivers/platform/x86/msi-laptop.c |
10830 |
---- linux-2.6.32.38/drivers/platform/x86/msi-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10831 |
-+++ linux-2.6.32.38/drivers/platform/x86/msi-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10832 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/msi-laptop.c linux-2.6.32.39/drivers/platform/x86/msi-laptop.c |
10833 |
+--- linux-2.6.32.39/drivers/platform/x86/msi-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10834 |
++++ linux-2.6.32.39/drivers/platform/x86/msi-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10835 |
@@ -161,7 +161,7 @@ static int bl_update_status(struct backl |
10836 |
return set_lcd_level(b->props.brightness); |
10837 |
} |
10838 |
@@ -29710,9 +29025,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/msi-laptop.c linux-2.6.32.38/dri |
10839 |
.get_brightness = bl_get_brightness, |
10840 |
.update_status = bl_update_status, |
10841 |
}; |
10842 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c |
10843 |
---- linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10844 |
-+++ linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10845 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c |
10846 |
+--- linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10847 |
++++ linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10848 |
@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh |
10849 |
return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); |
10850 |
} |
10851 |
@@ -29722,9 +29037,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. |
10852 |
.get_brightness = bl_get, |
10853 |
.update_status = bl_set_status, |
10854 |
}; |
10855 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/sony-laptop.c linux-2.6.32.38/drivers/platform/x86/sony-laptop.c |
10856 |
---- linux-2.6.32.38/drivers/platform/x86/sony-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10857 |
-+++ linux-2.6.32.38/drivers/platform/x86/sony-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10858 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/sony-laptop.c linux-2.6.32.39/drivers/platform/x86/sony-laptop.c |
10859 |
+--- linux-2.6.32.39/drivers/platform/x86/sony-laptop.c 2011-03-27 14:31:47.000000000 -0400 |
10860 |
++++ linux-2.6.32.39/drivers/platform/x86/sony-laptop.c 2011-04-17 15:56:46.000000000 -0400 |
10861 |
@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness |
10862 |
} |
10863 |
|
10864 |
@@ -29734,9 +29049,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/sony-laptop.c linux-2.6.32.38/dr |
10865 |
.update_status = sony_backlight_update_status, |
10866 |
.get_brightness = sony_backlight_get_brightness, |
10867 |
}; |
10868 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c |
10869 |
---- linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
10870 |
-+++ linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
10871 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c |
10872 |
+--- linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
10873 |
++++ linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
10874 |
@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha |
10875 |
BACKLIGHT_UPDATE_HOTKEY); |
10876 |
} |
10877 |
@@ -29746,9 +29061,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.38/ |
10878 |
.get_brightness = brightness_get, |
10879 |
.update_status = brightness_update_status, |
10880 |
}; |
10881 |
-diff -urNp linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c |
10882 |
---- linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
10883 |
-+++ linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
10884 |
+diff -urNp linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c |
10885 |
+--- linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c 2011-03-27 14:31:47.000000000 -0400 |
10886 |
++++ linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c 2011-04-17 15:56:46.000000000 -0400 |
10887 |
@@ -671,7 +671,7 @@ static acpi_status remove_device(void) |
10888 |
return AE_OK; |
10889 |
} |
10890 |
@@ -29758,9 +29073,9 @@ diff -urNp linux-2.6.32.38/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.38/d |
10891 |
.get_brightness = get_lcd, |
10892 |
.update_status = set_lcd_status, |
10893 |
}; |
10894 |
-diff -urNp linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c |
10895 |
---- linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c 2011-03-27 14:31:47.000000000 -0400 |
10896 |
-+++ linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:56:46.000000000 -0400 |
10897 |
+diff -urNp linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c |
10898 |
+--- linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c 2011-03-27 14:31:47.000000000 -0400 |
10899 |
++++ linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:56:46.000000000 -0400 |
10900 |
@@ -60,7 +60,7 @@ do { \ |
10901 |
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ |
10902 |
} while(0) |
10903 |
@@ -29817,21 +29132,9 @@ diff -urNp linux-2.6.32.38/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.38/drive |
10904 |
+ |
10905 |
+ pax_close_kernel(); |
10906 |
} |
10907 |
-diff -urNp linux-2.6.32.38/drivers/pnp/quirks.c linux-2.6.32.38/drivers/pnp/quirks.c |
10908 |
---- linux-2.6.32.38/drivers/pnp/quirks.c 2011-03-27 14:31:47.000000000 -0400 |
10909 |
-+++ linux-2.6.32.38/drivers/pnp/quirks.c 2011-04-17 15:56:46.000000000 -0400 |
10910 |
-@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { |
10911 |
- /* PnP resources that might overlap PCI BARs */ |
10912 |
- {"PNP0c01", quirk_system_pci_resources}, |
10913 |
- {"PNP0c02", quirk_system_pci_resources}, |
10914 |
-- {""} |
10915 |
-+ {"", NULL} |
10916 |
- }; |
10917 |
- |
10918 |
- void pnp_fixup_device(struct pnp_dev *dev) |
10919 |
-diff -urNp linux-2.6.32.38/drivers/pnp/resource.c linux-2.6.32.38/drivers/pnp/resource.c |
10920 |
---- linux-2.6.32.38/drivers/pnp/resource.c 2011-03-27 14:31:47.000000000 -0400 |
10921 |
-+++ linux-2.6.32.38/drivers/pnp/resource.c 2011-04-17 15:56:46.000000000 -0400 |
10922 |
+diff -urNp linux-2.6.32.39/drivers/pnp/resource.c linux-2.6.32.39/drivers/pnp/resource.c |
10923 |
+--- linux-2.6.32.39/drivers/pnp/resource.c 2011-03-27 14:31:47.000000000 -0400 |
10924 |
++++ linux-2.6.32.39/drivers/pnp/resource.c 2011-04-17 15:56:46.000000000 -0400 |
10925 |
@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s |
10926 |
return 1; |
10927 |
|
10928 |
@@ -29850,9 +29153,9 @@ diff -urNp linux-2.6.32.38/drivers/pnp/resource.c linux-2.6.32.38/drivers/pnp/re |
10929 |
return 0; |
10930 |
|
10931 |
/* check if the resource is reserved */ |
10932 |
-diff -urNp linux-2.6.32.38/drivers/rtc/rtc-dev.c linux-2.6.32.38/drivers/rtc/rtc-dev.c |
10933 |
---- linux-2.6.32.38/drivers/rtc/rtc-dev.c 2011-03-27 14:31:47.000000000 -0400 |
10934 |
-+++ linux-2.6.32.38/drivers/rtc/rtc-dev.c 2011-04-17 15:56:46.000000000 -0400 |
10935 |
+diff -urNp linux-2.6.32.39/drivers/rtc/rtc-dev.c linux-2.6.32.39/drivers/rtc/rtc-dev.c |
10936 |
+--- linux-2.6.32.39/drivers/rtc/rtc-dev.c 2011-03-27 14:31:47.000000000 -0400 |
10937 |
++++ linux-2.6.32.39/drivers/rtc/rtc-dev.c 2011-04-17 15:56:46.000000000 -0400 |
10938 |
@@ -14,6 +14,7 @@ |
10939 |
#include <linux/module.h> |
10940 |
#include <linux/rtc.h> |
10941 |
@@ -29870,9 +29173,9 @@ diff -urNp linux-2.6.32.38/drivers/rtc/rtc-dev.c linux-2.6.32.38/drivers/rtc/rtc |
10942 |
return rtc_set_time(rtc, &tm); |
10943 |
|
10944 |
case RTC_PIE_ON: |
10945 |
-diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_perf.c linux-2.6.32.38/drivers/s390/cio/qdio_perf.c |
10946 |
---- linux-2.6.32.38/drivers/s390/cio/qdio_perf.c 2011-03-27 14:31:47.000000000 -0400 |
10947 |
-+++ linux-2.6.32.38/drivers/s390/cio/qdio_perf.c 2011-04-17 15:56:46.000000000 -0400 |
10948 |
+diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.c linux-2.6.32.39/drivers/s390/cio/qdio_perf.c |
10949 |
+--- linux-2.6.32.39/drivers/s390/cio/qdio_perf.c 2011-03-27 14:31:47.000000000 -0400 |
10950 |
++++ linux-2.6.32.39/drivers/s390/cio/qdio_perf.c 2011-04-17 15:56:46.000000000 -0400 |
10951 |
@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ |
10952 |
static int qdio_perf_proc_show(struct seq_file *m, void *v) |
10953 |
{ |
10954 |
@@ -29948,9 +29251,9 @@ diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_perf.c linux-2.6.32.38/drivers/ |
10955 |
seq_printf(m, "\n"); |
10956 |
return 0; |
10957 |
} |
10958 |
-diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_perf.h linux-2.6.32.38/drivers/s390/cio/qdio_perf.h |
10959 |
---- linux-2.6.32.38/drivers/s390/cio/qdio_perf.h 2011-03-27 14:31:47.000000000 -0400 |
10960 |
-+++ linux-2.6.32.38/drivers/s390/cio/qdio_perf.h 2011-04-17 15:56:46.000000000 -0400 |
10961 |
+diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.h linux-2.6.32.39/drivers/s390/cio/qdio_perf.h |
10962 |
+--- linux-2.6.32.39/drivers/s390/cio/qdio_perf.h 2011-03-27 14:31:47.000000000 -0400 |
10963 |
++++ linux-2.6.32.39/drivers/s390/cio/qdio_perf.h 2011-04-17 15:56:46.000000000 -0400 |
10964 |
@@ -13,46 +13,46 @@ |
10965 |
|
10966 |
struct qdio_perf_stats { |
10967 |
@@ -30023,9 +29326,9 @@ diff -urNp linux-2.6.32.38/drivers/s390/cio/qdio_perf.h linux-2.6.32.38/drivers/ |
10968 |
} |
10969 |
|
10970 |
int qdio_setup_perf_stats(void); |
10971 |
-diff -urNp linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c |
10972 |
---- linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-27 14:31:47.000000000 -0400 |
10973 |
-+++ linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:56:46.000000000 -0400 |
10974 |
+diff -urNp linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c |
10975 |
+--- linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-27 14:31:47.000000000 -0400 |
10976 |
++++ linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:56:46.000000000 -0400 |
10977 |
@@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru |
10978 |
flash_error_table[i].reason); |
10979 |
} |
10980 |
@@ -30035,9 +29338,9 @@ diff -urNp linux-2.6.32.38/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.38/d |
10981 |
asd_show_update_bios, asd_store_update_bios); |
10982 |
|
10983 |
static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) |
10984 |
-diff -urNp linux-2.6.32.38/drivers/scsi/ipr.c linux-2.6.32.38/drivers/scsi/ipr.c |
10985 |
---- linux-2.6.32.38/drivers/scsi/ipr.c 2011-03-27 14:31:47.000000000 -0400 |
10986 |
-+++ linux-2.6.32.38/drivers/scsi/ipr.c 2011-04-17 15:56:46.000000000 -0400 |
10987 |
+diff -urNp linux-2.6.32.39/drivers/scsi/ipr.c linux-2.6.32.39/drivers/scsi/ipr.c |
10988 |
+--- linux-2.6.32.39/drivers/scsi/ipr.c 2011-03-27 14:31:47.000000000 -0400 |
10989 |
++++ linux-2.6.32.39/drivers/scsi/ipr.c 2011-04-17 15:56:46.000000000 -0400 |
10990 |
@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q |
10991 |
return true; |
10992 |
} |
10993 |
@@ -30047,9 +29350,9 @@ diff -urNp linux-2.6.32.38/drivers/scsi/ipr.c linux-2.6.32.38/drivers/scsi/ipr.c |
10994 |
.phy_reset = ipr_ata_phy_reset, |
10995 |
.hardreset = ipr_sata_reset, |
10996 |
.post_internal_cmd = ipr_ata_post_internal, |
10997 |
-diff -urNp linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c |
10998 |
---- linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c 2011-03-27 14:31:47.000000000 -0400 |
10999 |
-+++ linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:56:46.000000000 -0400 |
11000 |
+diff -urNp linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c |
11001 |
+--- linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c 2011-03-27 14:31:47.000000000 -0400 |
11002 |
++++ linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:56:46.000000000 -0400 |
11003 |
@@ -86,12 +86,12 @@ struct fc_exch_mgr { |
11004 |
* all together if not used XXX |
11005 |
*/ |
11006 |
@@ -30171,10 +29474,10 @@ diff -urNp linux-2.6.32.38/drivers/scsi/libfc/fc_exch.c linux-2.6.32.38/drivers/ |
11007 |
|
11008 |
fc_frame_free(fp); |
11009 |
} |
11010 |
-diff -urNp linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c |
11011 |
---- linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c 2011-03-27 14:31:47.000000000 -0400 |
11012 |
-+++ linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c 2011-04-17 15:56:46.000000000 -0400 |
11013 |
-@@ -343,10 +343,10 @@ static int sas_ata_scr_read(struct ata_l |
11014 |
+diff -urNp linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c |
11015 |
+--- linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c 2011-03-27 14:31:47.000000000 -0400 |
11016 |
++++ linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c 2011-04-23 12:56:11.000000000 -0400 |
11017 |
+@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l |
11018 |
} |
11019 |
} |
11020 |
|
11021 |
@@ -30182,38 +29485,10 @@ diff -urNp linux-2.6.32.38/drivers/scsi/libsas/sas_ata.c linux-2.6.32.38/drivers |
11022 |
+static const struct ata_port_operations sas_sata_ops = { |
11023 |
.phy_reset = sas_ata_phy_reset, |
11024 |
.post_internal_cmd = sas_ata_post_internal, |
11025 |
-- .qc_defer = ata_std_qc_defer, |
11026 |
-+ .qc_defer = ata_std_qc_defer, |
11027 |
- .qc_prep = ata_noop_qc_prep, |
11028 |
- .qc_issue = sas_ata_qc_issue, |
11029 |
- .qc_fill_rtf = sas_ata_qc_fill_rtf, |
11030 |
-diff -urNp linux-2.6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h |
11031 |
---- linux-2.6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-27 14:31:47.000000000 -0400 |
11032 |
-+++ linux-2.6.32.38/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-04-17 15:56:46.000000000 -0400 |
11033 |
-@@ -79,7 +79,7 @@ |
11034 |
- CMD; \ |
11035 |
- } |
11036 |
- #else |
11037 |
--#define MPT_CHECK_LOGGING(IOC, CMD, BITS) |
11038 |
-+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) |
11039 |
- #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ |
11040 |
- |
11041 |
- |
11042 |
-diff -urNp linux-2.6.32.38/drivers/scsi/scsi_logging.h linux-2.6.32.38/drivers/scsi/scsi_logging.h |
11043 |
---- linux-2.6.32.38/drivers/scsi/scsi_logging.h 2011-03-27 14:31:47.000000000 -0400 |
11044 |
-+++ linux-2.6.32.38/drivers/scsi/scsi_logging.h 2011-04-17 15:56:46.000000000 -0400 |
11045 |
-@@ -51,7 +51,7 @@ do { \ |
11046 |
- } while (0); \ |
11047 |
- } while (0) |
11048 |
- #else |
11049 |
--#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) |
11050 |
-+#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) do {} while (0) |
11051 |
- #endif /* CONFIG_SCSI_LOGGING */ |
11052 |
- |
11053 |
- /* |
11054 |
-diff -urNp linux-2.6.32.38/drivers/scsi/sg.c linux-2.6.32.38/drivers/scsi/sg.c |
11055 |
---- linux-2.6.32.38/drivers/scsi/sg.c 2011-03-27 14:31:47.000000000 -0400 |
11056 |
-+++ linux-2.6.32.38/drivers/scsi/sg.c 2011-04-17 15:56:46.000000000 -0400 |
11057 |
+ .qc_defer = ata_std_qc_defer, |
11058 |
+diff -urNp linux-2.6.32.39/drivers/scsi/sg.c linux-2.6.32.39/drivers/scsi/sg.c |
11059 |
+--- linux-2.6.32.39/drivers/scsi/sg.c 2011-03-27 14:31:47.000000000 -0400 |
11060 |
++++ linux-2.6.32.39/drivers/scsi/sg.c 2011-04-17 15:56:46.000000000 -0400 |
11061 |
@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { |
11062 |
const struct file_operations * fops; |
11063 |
}; |
11064 |
@@ -30232,21 +29507,9 @@ diff -urNp linux-2.6.32.38/drivers/scsi/sg.c linux-2.6.32.38/drivers/scsi/sg.c |
11065 |
|
11066 |
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); |
11067 |
if (!sg_proc_sgp) |
11068 |
-diff -urNp linux-2.6.32.38/drivers/serial/8250_pci.c linux-2.6.32.38/drivers/serial/8250_pci.c |
11069 |
---- linux-2.6.32.38/drivers/serial/8250_pci.c 2011-03-27 14:31:47.000000000 -0400 |
11070 |
-+++ linux-2.6.32.38/drivers/serial/8250_pci.c 2011-04-17 15:56:46.000000000 -0400 |
11071 |
-@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t |
11072 |
- PCI_ANY_ID, PCI_ANY_ID, |
11073 |
- PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, |
11074 |
- 0xffff00, pbn_default }, |
11075 |
-- { 0, } |
11076 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
11077 |
- }; |
11078 |
- |
11079 |
- static struct pci_driver serial_pci_driver = { |
11080 |
-diff -urNp linux-2.6.32.38/drivers/serial/kgdboc.c linux-2.6.32.38/drivers/serial/kgdboc.c |
11081 |
---- linux-2.6.32.38/drivers/serial/kgdboc.c 2011-03-27 14:31:47.000000000 -0400 |
11082 |
-+++ linux-2.6.32.38/drivers/serial/kgdboc.c 2011-04-17 15:56:46.000000000 -0400 |
11083 |
+diff -urNp linux-2.6.32.39/drivers/serial/kgdboc.c linux-2.6.32.39/drivers/serial/kgdboc.c |
11084 |
+--- linux-2.6.32.39/drivers/serial/kgdboc.c 2011-03-27 14:31:47.000000000 -0400 |
11085 |
++++ linux-2.6.32.39/drivers/serial/kgdboc.c 2011-04-17 15:56:46.000000000 -0400 |
11086 |
@@ -18,7 +18,7 @@ |
11087 |
|
11088 |
#define MAX_CONFIG_LEN 40 |
11089 |
@@ -30265,9 +29528,9 @@ diff -urNp linux-2.6.32.38/drivers/serial/kgdboc.c linux-2.6.32.38/drivers/seria |
11090 |
.name = "kgdboc", |
11091 |
.read_char = kgdboc_get_char, |
11092 |
.write_char = kgdboc_put_char, |
11093 |
-diff -urNp linux-2.6.32.38/drivers/staging/android/binder.c linux-2.6.32.38/drivers/staging/android/binder.c |
11094 |
---- linux-2.6.32.38/drivers/staging/android/binder.c 2011-03-27 14:31:47.000000000 -0400 |
11095 |
-+++ linux-2.6.32.38/drivers/staging/android/binder.c 2011-04-17 15:56:46.000000000 -0400 |
11096 |
+diff -urNp linux-2.6.32.39/drivers/staging/android/binder.c linux-2.6.32.39/drivers/staging/android/binder.c |
11097 |
+--- linux-2.6.32.39/drivers/staging/android/binder.c 2011-03-27 14:31:47.000000000 -0400 |
11098 |
++++ linux-2.6.32.39/drivers/staging/android/binder.c 2011-04-17 15:56:46.000000000 -0400 |
11099 |
@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a |
11100 |
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); |
11101 |
} |
11102 |
@@ -30277,9 +29540,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/android/binder.c linux-2.6.32.38/driv |
11103 |
.open = binder_vma_open, |
11104 |
.close = binder_vma_close, |
11105 |
}; |
11106 |
-diff -urNp linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c |
11107 |
---- linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c 2011-03-27 14:31:47.000000000 -0400 |
11108 |
-+++ linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c 2011-04-17 15:56:46.000000000 -0400 |
11109 |
+diff -urNp linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c |
11110 |
+--- linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c 2011-03-27 14:31:47.000000000 -0400 |
11111 |
++++ linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c 2011-04-17 15:56:46.000000000 -0400 |
11112 |
@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are |
11113 |
return VM_FAULT_NOPAGE; |
11114 |
} |
11115 |
@@ -30298,9 +29561,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.38/drivers |
11116 |
.owner = THIS_MODULE, |
11117 |
.open = b3dfg_open, |
11118 |
.release = b3dfg_release, |
11119 |
-diff -urNp linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c |
11120 |
---- linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c 2011-03-27 14:31:47.000000000 -0400 |
11121 |
-+++ linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:56:46.000000000 -0400 |
11122 |
+diff -urNp linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c |
11123 |
+--- linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c 2011-03-27 14:31:47.000000000 -0400 |
11124 |
++++ linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:56:46.000000000 -0400 |
11125 |
@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct |
11126 |
mutex_unlock(&dev->mutex); |
11127 |
} |
11128 |
@@ -30310,9 +29573,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/comedi/comedi_fops.c linux-2.6.32.38/ |
11129 |
.close = comedi_unmap, |
11130 |
}; |
11131 |
|
11132 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c |
11133 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c 2011-03-27 14:31:47.000000000 -0400 |
11134 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c 2011-04-17 15:56:46.000000000 -0400 |
11135 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c |
11136 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c 2011-03-27 14:31:47.000000000 -0400 |
11137 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c 2011-04-17 15:56:46.000000000 -0400 |
11138 |
@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi |
11139 |
static dev_t adsp_devno; |
11140 |
static struct class *adsp_class; |
11141 |
@@ -30322,9 +29585,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3 |
11142 |
.owner = THIS_MODULE, |
11143 |
.open = adsp_open, |
11144 |
.unlocked_ioctl = adsp_ioctl, |
11145 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c |
11146 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c 2011-03-27 14:31:47.000000000 -0400 |
11147 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c 2011-04-17 15:56:46.000000000 -0400 |
11148 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c |
11149 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c 2011-03-27 14:31:47.000000000 -0400 |
11150 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c 2011-04-17 15:56:46.000000000 -0400 |
11151 |
@@ -1022,7 +1022,7 @@ done: |
11152 |
return rc; |
11153 |
} |
11154 |
@@ -30334,9 +29597,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. |
11155 |
.owner = THIS_MODULE, |
11156 |
.open = audio_open, |
11157 |
.release = audio_release, |
11158 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c |
11159 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-03-27 14:31:47.000000000 -0400 |
11160 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-04-17 15:56:46.000000000 -0400 |
11161 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c |
11162 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-03-27 14:31:47.000000000 -0400 |
11163 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-04-17 15:56:46.000000000 -0400 |
11164 |
@@ -833,7 +833,7 @@ done: |
11165 |
return rc; |
11166 |
} |
11167 |
@@ -30346,9 +29609,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 |
11168 |
.owner = THIS_MODULE, |
11169 |
.open = audamrnb_open, |
11170 |
.release = audamrnb_release, |
11171 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c |
11172 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c 2011-03-27 14:31:47.000000000 -0400 |
11173 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c 2011-04-17 15:56:46.000000000 -0400 |
11174 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c |
11175 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c 2011-03-27 14:31:47.000000000 -0400 |
11176 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c 2011-04-17 15:56:46.000000000 -0400 |
11177 |
@@ -805,7 +805,7 @@ dma_fail: |
11178 |
return rc; |
11179 |
} |
11180 |
@@ -30358,9 +29621,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 |
11181 |
.owner = THIS_MODULE, |
11182 |
.open = audevrc_open, |
11183 |
.release = audevrc_release, |
11184 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c |
11185 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c 2011-03-27 14:31:47.000000000 -0400 |
11186 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c 2011-04-17 15:56:46.000000000 -0400 |
11187 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c |
11188 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c 2011-03-27 14:31:47.000000000 -0400 |
11189 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c 2011-04-17 15:56:46.000000000 -0400 |
11190 |
@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino |
11191 |
return 0; |
11192 |
} |
11193 |
@@ -30379,9 +29642,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.3 |
11194 |
.owner = THIS_MODULE, |
11195 |
.open = audpre_open, |
11196 |
.unlocked_ioctl = audpre_ioctl, |
11197 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c |
11198 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c 2011-03-27 14:31:47.000000000 -0400 |
11199 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c 2011-04-17 15:56:46.000000000 -0400 |
11200 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c |
11201 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c 2011-03-27 14:31:47.000000000 -0400 |
11202 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c 2011-04-17 15:56:46.000000000 -0400 |
11203 |
@@ -941,7 +941,7 @@ done: |
11204 |
return rc; |
11205 |
} |
11206 |
@@ -30391,9 +29654,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. |
11207 |
.owner = THIS_MODULE, |
11208 |
.open = audio_open, |
11209 |
.release = audio_release, |
11210 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c |
11211 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c 2011-03-27 14:31:47.000000000 -0400 |
11212 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c 2011-04-17 15:56:46.000000000 -0400 |
11213 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c |
11214 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c 2011-03-27 14:31:47.000000000 -0400 |
11215 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c 2011-04-17 15:56:46.000000000 -0400 |
11216 |
@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod |
11217 |
return 0; |
11218 |
} |
11219 |
@@ -30412,9 +29675,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. |
11220 |
.owner = THIS_MODULE, |
11221 |
.open = audpp_open, |
11222 |
.unlocked_ioctl = audpp_ioctl, |
11223 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c |
11224 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-03-27 14:31:47.000000000 -0400 |
11225 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-04-17 15:56:46.000000000 -0400 |
11226 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c |
11227 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-03-27 14:31:47.000000000 -0400 |
11228 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-04-17 15:56:46.000000000 -0400 |
11229 |
@@ -816,7 +816,7 @@ err: |
11230 |
return rc; |
11231 |
} |
11232 |
@@ -30424,9 +29687,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 |
11233 |
.owner = THIS_MODULE, |
11234 |
.open = audqcelp_open, |
11235 |
.release = audqcelp_release, |
11236 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c |
11237 |
---- linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c 2011-03-27 14:31:47.000000000 -0400 |
11238 |
-+++ linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c 2011-04-17 15:56:46.000000000 -0400 |
11239 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c |
11240 |
+--- linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c 2011-03-27 14:31:47.000000000 -0400 |
11241 |
++++ linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c 2011-04-17 15:56:46.000000000 -0400 |
11242 |
@@ -242,7 +242,7 @@ err: |
11243 |
return rc; |
11244 |
} |
11245 |
@@ -30436,9 +29699,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.38/dri |
11246 |
.owner = THIS_MODULE, |
11247 |
.open = snd_open, |
11248 |
.release = snd_release, |
11249 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c |
11250 |
---- linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c 2011-03-27 14:31:47.000000000 -0400 |
11251 |
-+++ linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c 2011-04-17 15:56:46.000000000 -0400 |
11252 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c |
11253 |
+--- linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c 2011-03-27 14:31:47.000000000 -0400 |
11254 |
++++ linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c 2011-04-17 15:56:46.000000000 -0400 |
11255 |
@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, |
11256 |
return 0; |
11257 |
} |
11258 |
@@ -30448,9 +29711,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.38/d |
11259 |
.owner = THIS_MODULE, |
11260 |
.read = qmi_read, |
11261 |
.write = qmi_write, |
11262 |
-diff -urNp linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c |
11263 |
---- linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-03-27 14:31:47.000000000 -0400 |
11264 |
-+++ linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-04-17 15:56:46.000000000 -0400 |
11265 |
+diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c |
11266 |
+--- linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-03-27 14:31:47.000000000 -0400 |
11267 |
++++ linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-04-17 15:56:46.000000000 -0400 |
11268 |
@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file |
11269 |
return rc; |
11270 |
} |
11271 |
@@ -30469,9 +29732,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dream/smd/smd_rpcrouter_device.c linu |
11272 |
.owner = THIS_MODULE, |
11273 |
.open = rpcrouter_open, |
11274 |
.release = rpcrouter_release, |
11275 |
-diff -urNp linux-2.6.32.38/drivers/staging/dst/dcore.c linux-2.6.32.38/drivers/staging/dst/dcore.c |
11276 |
---- linux-2.6.32.38/drivers/staging/dst/dcore.c 2011-03-27 14:31:47.000000000 -0400 |
11277 |
-+++ linux-2.6.32.38/drivers/staging/dst/dcore.c 2011-04-17 15:56:46.000000000 -0400 |
11278 |
+diff -urNp linux-2.6.32.39/drivers/staging/dst/dcore.c linux-2.6.32.39/drivers/staging/dst/dcore.c |
11279 |
+--- linux-2.6.32.39/drivers/staging/dst/dcore.c 2011-03-27 14:31:47.000000000 -0400 |
11280 |
++++ linux-2.6.32.39/drivers/staging/dst/dcore.c 2011-04-17 15:56:46.000000000 -0400 |
11281 |
@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi |
11282 |
return 0; |
11283 |
} |
11284 |
@@ -30490,9 +29753,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dst/dcore.c linux-2.6.32.38/drivers/s |
11285 |
snprintf(n->name, sizeof(n->name), "%s", ctl->name); |
11286 |
|
11287 |
err = dst_node_sysfs_init(n); |
11288 |
-diff -urNp linux-2.6.32.38/drivers/staging/dst/trans.c linux-2.6.32.38/drivers/staging/dst/trans.c |
11289 |
---- linux-2.6.32.38/drivers/staging/dst/trans.c 2011-03-27 14:31:47.000000000 -0400 |
11290 |
-+++ linux-2.6.32.38/drivers/staging/dst/trans.c 2011-04-17 15:56:46.000000000 -0400 |
11291 |
+diff -urNp linux-2.6.32.39/drivers/staging/dst/trans.c linux-2.6.32.39/drivers/staging/dst/trans.c |
11292 |
+--- linux-2.6.32.39/drivers/staging/dst/trans.c 2011-03-27 14:31:47.000000000 -0400 |
11293 |
++++ linux-2.6.32.39/drivers/staging/dst/trans.c 2011-04-17 15:56:46.000000000 -0400 |
11294 |
@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, |
11295 |
t->error = 0; |
11296 |
t->retries = 0; |
11297 |
@@ -30502,9 +29765,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/dst/trans.c linux-2.6.32.38/drivers/s |
11298 |
|
11299 |
t->enc = bio_data_dir(bio); |
11300 |
dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); |
11301 |
-diff -urNp linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c |
11302 |
---- linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c 2011-03-27 14:31:47.000000000 -0400 |
11303 |
-+++ linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:56:46.000000000 -0400 |
11304 |
+diff -urNp linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c |
11305 |
+--- linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c 2011-03-27 14:31:47.000000000 -0400 |
11306 |
++++ linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:56:46.000000000 -0400 |
11307 |
@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are |
11308 |
return 0; |
11309 |
} |
11310 |
@@ -30514,9 +29777,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.38/ |
11311 |
.open = go7007_vm_open, |
11312 |
.close = go7007_vm_close, |
11313 |
.fault = go7007_vm_fault, |
11314 |
-diff -urNp linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c |
11315 |
---- linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c 2011-03-27 14:31:47.000000000 -0400 |
11316 |
-+++ linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c 2011-04-17 15:56:46.000000000 -0400 |
11317 |
+diff -urNp linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c |
11318 |
+--- linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c 2011-03-27 14:31:47.000000000 -0400 |
11319 |
++++ linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c 2011-04-17 15:56:46.000000000 -0400 |
11320 |
@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV |
11321 |
/* The one and only one */ |
11322 |
static struct blkvsc_driver_context g_blkvsc_drv; |
11323 |
@@ -30526,9 +29789,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.38/drive |
11324 |
.owner = THIS_MODULE, |
11325 |
.open = blkvsc_open, |
11326 |
.release = blkvsc_release, |
11327 |
-diff -urNp linux-2.6.32.38/drivers/staging/hv/Hv.c linux-2.6.32.38/drivers/staging/hv/Hv.c |
11328 |
---- linux-2.6.32.38/drivers/staging/hv/Hv.c 2011-03-27 14:31:47.000000000 -0400 |
11329 |
-+++ linux-2.6.32.38/drivers/staging/hv/Hv.c 2011-04-17 15:56:46.000000000 -0400 |
11330 |
+diff -urNp linux-2.6.32.39/drivers/staging/hv/Hv.c linux-2.6.32.39/drivers/staging/hv/Hv.c |
11331 |
+--- linux-2.6.32.39/drivers/staging/hv/Hv.c 2011-03-27 14:31:47.000000000 -0400 |
11332 |
++++ linux-2.6.32.39/drivers/staging/hv/Hv.c 2011-04-17 15:56:46.000000000 -0400 |
11333 |
@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo |
11334 |
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; |
11335 |
u32 outputAddressHi = outputAddress >> 32; |
11336 |
@@ -30538,9 +29801,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/hv/Hv.c linux-2.6.32.38/drivers/stagi |
11337 |
|
11338 |
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", |
11339 |
Control, Input, Output); |
11340 |
-diff -urNp linux-2.6.32.38/drivers/staging/panel/panel.c linux-2.6.32.38/drivers/staging/panel/panel.c |
11341 |
---- linux-2.6.32.38/drivers/staging/panel/panel.c 2011-03-27 14:31:47.000000000 -0400 |
11342 |
-+++ linux-2.6.32.38/drivers/staging/panel/panel.c 2011-04-17 15:56:46.000000000 -0400 |
11343 |
+diff -urNp linux-2.6.32.39/drivers/staging/panel/panel.c linux-2.6.32.39/drivers/staging/panel/panel.c |
11344 |
+--- linux-2.6.32.39/drivers/staging/panel/panel.c 2011-03-27 14:31:47.000000000 -0400 |
11345 |
++++ linux-2.6.32.39/drivers/staging/panel/panel.c 2011-04-17 15:56:46.000000000 -0400 |
11346 |
@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino |
11347 |
return 0; |
11348 |
} |
11349 |
@@ -30559,9 +29822,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/panel/panel.c linux-2.6.32.38/drivers |
11350 |
.read = keypad_read, /* read */ |
11351 |
.open = keypad_open, /* open */ |
11352 |
.release = keypad_release, /* close */ |
11353 |
-diff -urNp linux-2.6.32.38/drivers/staging/phison/phison.c linux-2.6.32.38/drivers/staging/phison/phison.c |
11354 |
---- linux-2.6.32.38/drivers/staging/phison/phison.c 2011-03-27 14:31:47.000000000 -0400 |
11355 |
-+++ linux-2.6.32.38/drivers/staging/phison/phison.c 2011-04-17 15:56:46.000000000 -0400 |
11356 |
+diff -urNp linux-2.6.32.39/drivers/staging/phison/phison.c linux-2.6.32.39/drivers/staging/phison/phison.c |
11357 |
+--- linux-2.6.32.39/drivers/staging/phison/phison.c 2011-03-27 14:31:47.000000000 -0400 |
11358 |
++++ linux-2.6.32.39/drivers/staging/phison/phison.c 2011-04-17 15:56:46.000000000 -0400 |
11359 |
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ |
11360 |
ATA_BMDMA_SHT(DRV_NAME), |
11361 |
}; |
11362 |
@@ -30571,9 +29834,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/phison/phison.c linux-2.6.32.38/drive |
11363 |
.inherits = &ata_bmdma_port_ops, |
11364 |
.prereset = phison_pre_reset, |
11365 |
}; |
11366 |
-diff -urNp linux-2.6.32.38/drivers/staging/poch/poch.c linux-2.6.32.38/drivers/staging/poch/poch.c |
11367 |
---- linux-2.6.32.38/drivers/staging/poch/poch.c 2011-03-27 14:31:47.000000000 -0400 |
11368 |
-+++ linux-2.6.32.38/drivers/staging/poch/poch.c 2011-04-17 15:56:46.000000000 -0400 |
11369 |
+diff -urNp linux-2.6.32.39/drivers/staging/poch/poch.c linux-2.6.32.39/drivers/staging/poch/poch.c |
11370 |
+--- linux-2.6.32.39/drivers/staging/poch/poch.c 2011-03-27 14:31:47.000000000 -0400 |
11371 |
++++ linux-2.6.32.39/drivers/staging/poch/poch.c 2011-04-17 15:56:46.000000000 -0400 |
11372 |
@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod |
11373 |
return 0; |
11374 |
} |
11375 |
@@ -30583,9 +29846,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/poch/poch.c linux-2.6.32.38/drivers/s |
11376 |
.owner = THIS_MODULE, |
11377 |
.open = poch_open, |
11378 |
.release = poch_release, |
11379 |
-diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/inode.c linux-2.6.32.38/drivers/staging/pohmelfs/inode.c |
11380 |
---- linux-2.6.32.38/drivers/staging/pohmelfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
11381 |
-+++ linux-2.6.32.38/drivers/staging/pohmelfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
11382 |
+diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/inode.c linux-2.6.32.39/drivers/staging/pohmelfs/inode.c |
11383 |
+--- linux-2.6.32.39/drivers/staging/pohmelfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
11384 |
++++ linux-2.6.32.39/drivers/staging/pohmelfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
11385 |
@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su |
11386 |
mutex_init(&psb->mcache_lock); |
11387 |
psb->mcache_root = RB_ROOT; |
11388 |
@@ -30595,9 +29858,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/inode.c linux-2.6.32.38/driv |
11389 |
|
11390 |
psb->trans_max_pages = 100; |
11391 |
|
11392 |
-diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c |
11393 |
---- linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c 2011-03-27 14:31:47.000000000 -0400 |
11394 |
-+++ linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:56:46.000000000 -0400 |
11395 |
+diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c |
11396 |
+--- linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c 2011-03-27 14:31:47.000000000 -0400 |
11397 |
++++ linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:56:46.000000000 -0400 |
11398 |
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ |
11399 |
m->data = data; |
11400 |
m->start = start; |
11401 |
@@ -30607,9 +29870,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/mcache.c linux-2.6.32.38/dri |
11402 |
|
11403 |
mutex_lock(&psb->mcache_lock); |
11404 |
err = pohmelfs_mcache_insert(psb, m); |
11405 |
-diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h |
11406 |
---- linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h 2011-03-27 14:31:47.000000000 -0400 |
11407 |
-+++ linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:56:46.000000000 -0400 |
11408 |
+diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h |
11409 |
+--- linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h 2011-03-27 14:31:47.000000000 -0400 |
11410 |
++++ linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:56:46.000000000 -0400 |
11411 |
@@ -570,7 +570,7 @@ struct pohmelfs_config; |
11412 |
struct pohmelfs_sb { |
11413 |
struct rb_root mcache_root; |
11414 |
@@ -30619,9 +29882,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/pohmelfs/netfs.h linux-2.6.32.38/driv |
11415 |
unsigned long mcache_timeout; |
11416 |
|
11417 |
unsigned int idx; |
11418 |
-diff -urNp linux-2.6.32.38/drivers/staging/sep/sep_driver.c linux-2.6.32.38/drivers/staging/sep/sep_driver.c |
11419 |
---- linux-2.6.32.38/drivers/staging/sep/sep_driver.c 2011-03-27 14:31:47.000000000 -0400 |
11420 |
-+++ linux-2.6.32.38/drivers/staging/sep/sep_driver.c 2011-04-17 15:56:46.000000000 -0400 |
11421 |
+diff -urNp linux-2.6.32.39/drivers/staging/sep/sep_driver.c linux-2.6.32.39/drivers/staging/sep/sep_driver.c |
11422 |
+--- linux-2.6.32.39/drivers/staging/sep/sep_driver.c 2011-03-27 14:31:47.000000000 -0400 |
11423 |
++++ linux-2.6.32.39/drivers/staging/sep/sep_driver.c 2011-04-17 15:56:46.000000000 -0400 |
11424 |
@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver |
11425 |
static dev_t sep_devno; |
11426 |
|
11427 |
@@ -30631,9 +29894,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/sep/sep_driver.c linux-2.6.32.38/driv |
11428 |
.owner = THIS_MODULE, |
11429 |
.ioctl = sep_ioctl, |
11430 |
.poll = sep_poll, |
11431 |
-diff -urNp linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c |
11432 |
---- linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c 2011-03-27 14:31:47.000000000 -0400 |
11433 |
-+++ linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:56:46.000000000 -0400 |
11434 |
+diff -urNp linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c |
11435 |
+--- linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c 2011-03-27 14:31:47.000000000 -0400 |
11436 |
++++ linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:56:46.000000000 -0400 |
11437 |
@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * |
11438 |
static int __init vme_user_probe(struct device *, int, int); |
11439 |
static int __exit vme_user_remove(struct device *, int, int); |
11440 |
@@ -30643,9 +29906,9 @@ diff -urNp linux-2.6.32.38/drivers/staging/vme/devices/vme_user.c linux-2.6.32.3 |
11441 |
.open = vme_user_open, |
11442 |
.release = vme_user_release, |
11443 |
.read = vme_user_read, |
11444 |
-diff -urNp linux-2.6.32.38/drivers/uio/uio.c linux-2.6.32.38/drivers/uio/uio.c |
11445 |
---- linux-2.6.32.38/drivers/uio/uio.c 2011-03-27 14:31:47.000000000 -0400 |
11446 |
-+++ linux-2.6.32.38/drivers/uio/uio.c 2011-04-17 15:56:46.000000000 -0400 |
11447 |
+diff -urNp linux-2.6.32.39/drivers/uio/uio.c linux-2.6.32.39/drivers/uio/uio.c |
11448 |
+--- linux-2.6.32.39/drivers/uio/uio.c 2011-03-27 14:31:47.000000000 -0400 |
11449 |
++++ linux-2.6.32.39/drivers/uio/uio.c 2011-04-17 15:56:46.000000000 -0400 |
11450 |
@@ -23,6 +23,7 @@ |
11451 |
#include <linux/string.h> |
11452 |
#include <linux/kobject.h> |
11453 |
@@ -30697,9 +29960,9 @@ diff -urNp linux-2.6.32.38/drivers/uio/uio.c linux-2.6.32.38/drivers/uio/uio.c |
11454 |
} |
11455 |
|
11456 |
static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
11457 |
-diff -urNp linux-2.6.32.38/drivers/usb/atm/usbatm.c linux-2.6.32.38/drivers/usb/atm/usbatm.c |
11458 |
---- linux-2.6.32.38/drivers/usb/atm/usbatm.c 2011-03-27 14:31:47.000000000 -0400 |
11459 |
-+++ linux-2.6.32.38/drivers/usb/atm/usbatm.c 2011-04-17 15:56:46.000000000 -0400 |
11460 |
+diff -urNp linux-2.6.32.39/drivers/usb/atm/usbatm.c linux-2.6.32.39/drivers/usb/atm/usbatm.c |
11461 |
+--- linux-2.6.32.39/drivers/usb/atm/usbatm.c 2011-03-27 14:31:47.000000000 -0400 |
11462 |
++++ linux-2.6.32.39/drivers/usb/atm/usbatm.c 2011-04-17 15:56:46.000000000 -0400 |
11463 |
@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru |
11464 |
if (printk_ratelimit()) |
11465 |
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", |
11466 |
@@ -30779,21 +30042,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/atm/usbatm.c linux-2.6.32.38/drivers/usb/ |
11467 |
|
11468 |
if (!left--) { |
11469 |
if (instance->disconnected) |
11470 |
-diff -urNp linux-2.6.32.38/drivers/usb/class/cdc-acm.c linux-2.6.32.38/drivers/usb/class/cdc-acm.c |
11471 |
---- linux-2.6.32.38/drivers/usb/class/cdc-acm.c 2011-03-27 14:31:47.000000000 -0400 |
11472 |
-+++ linux-2.6.32.38/drivers/usb/class/cdc-acm.c 2011-04-17 15:56:46.000000000 -0400 |
11473 |
-@@ -1624,7 +1624,7 @@ static struct usb_device_id acm_ids[] = |
11474 |
- { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, |
11475 |
- USB_CDC_ACM_PROTO_AT_CDMA) }, |
11476 |
- |
11477 |
-- { } |
11478 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } |
11479 |
- }; |
11480 |
- |
11481 |
- MODULE_DEVICE_TABLE(usb, acm_ids); |
11482 |
-diff -urNp linux-2.6.32.38/drivers/usb/class/cdc-wdm.c linux-2.6.32.38/drivers/usb/class/cdc-wdm.c |
11483 |
---- linux-2.6.32.38/drivers/usb/class/cdc-wdm.c 2011-03-27 14:31:47.000000000 -0400 |
11484 |
-+++ linux-2.6.32.38/drivers/usb/class/cdc-wdm.c 2011-04-17 15:56:46.000000000 -0400 |
11485 |
+diff -urNp linux-2.6.32.39/drivers/usb/class/cdc-wdm.c linux-2.6.32.39/drivers/usb/class/cdc-wdm.c |
11486 |
+--- linux-2.6.32.39/drivers/usb/class/cdc-wdm.c 2011-03-27 14:31:47.000000000 -0400 |
11487 |
++++ linux-2.6.32.39/drivers/usb/class/cdc-wdm.c 2011-04-17 15:56:46.000000000 -0400 |
11488 |
@@ -314,7 +314,7 @@ static ssize_t wdm_write |
11489 |
if (r < 0) |
11490 |
goto outnp; |
11491 |
@@ -30803,30 +30054,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/class/cdc-wdm.c linux-2.6.32.38/drivers/u |
11492 |
r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, |
11493 |
&desc->flags)); |
11494 |
else |
11495 |
-diff -urNp linux-2.6.32.38/drivers/usb/class/usblp.c linux-2.6.32.38/drivers/usb/class/usblp.c |
11496 |
---- linux-2.6.32.38/drivers/usb/class/usblp.c 2011-03-27 14:31:47.000000000 -0400 |
11497 |
-+++ linux-2.6.32.38/drivers/usb/class/usblp.c 2011-04-17 15:56:46.000000000 -0400 |
11498 |
-@@ -228,7 +228,7 @@ static const struct quirk_printer_struct |
11499 |
- { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@×××.de> */ |
11500 |
- { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ |
11501 |
- { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */ |
11502 |
-- { 0, 0 } |
11503 |
-+ { 0, 0, 0 } |
11504 |
- }; |
11505 |
- |
11506 |
- static int usblp_wwait(struct usblp *usblp, int nonblock); |
11507 |
-@@ -1412,7 +1412,7 @@ static struct usb_device_id usblp_ids [] |
11508 |
- { USB_INTERFACE_INFO(7, 1, 2) }, |
11509 |
- { USB_INTERFACE_INFO(7, 1, 3) }, |
11510 |
- { USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C */ |
11511 |
-- { } /* Terminating entry */ |
11512 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ |
11513 |
- }; |
11514 |
- |
11515 |
- MODULE_DEVICE_TABLE (usb, usblp_ids); |
11516 |
-diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.c linux-2.6.32.38/drivers/usb/core/hcd.c |
11517 |
---- linux-2.6.32.38/drivers/usb/core/hcd.c 2011-03-27 14:31:47.000000000 -0400 |
11518 |
-+++ linux-2.6.32.38/drivers/usb/core/hcd.c 2011-04-17 15:56:46.000000000 -0400 |
11519 |
+diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.c linux-2.6.32.39/drivers/usb/core/hcd.c |
11520 |
+--- linux-2.6.32.39/drivers/usb/core/hcd.c 2011-03-27 14:31:47.000000000 -0400 |
11521 |
++++ linux-2.6.32.39/drivers/usb/core/hcd.c 2011-04-17 15:56:46.000000000 -0400 |
11522 |
@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd |
11523 |
|
11524 |
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
11525 |
@@ -30845,9 +30075,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.c linux-2.6.32.38/drivers/usb/co |
11526 |
{ |
11527 |
|
11528 |
if (mon_ops) |
11529 |
-diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.h linux-2.6.32.38/drivers/usb/core/hcd.h |
11530 |
---- linux-2.6.32.38/drivers/usb/core/hcd.h 2011-03-27 14:31:47.000000000 -0400 |
11531 |
-+++ linux-2.6.32.38/drivers/usb/core/hcd.h 2011-04-17 15:56:46.000000000 -0400 |
11532 |
+diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.h linux-2.6.32.39/drivers/usb/core/hcd.h |
11533 |
+--- linux-2.6.32.39/drivers/usb/core/hcd.h 2011-03-27 14:31:47.000000000 -0400 |
11534 |
++++ linux-2.6.32.39/drivers/usb/core/hcd.h 2011-04-17 15:56:46.000000000 -0400 |
11535 |
@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { |
11536 |
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
11537 |
|
11538 |
@@ -30875,21 +30105,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/core/hcd.h linux-2.6.32.38/drivers/usb/co |
11539 |
void usb_mon_deregister(void); |
11540 |
|
11541 |
#else |
11542 |
-diff -urNp linux-2.6.32.38/drivers/usb/core/hub.c linux-2.6.32.38/drivers/usb/core/hub.c |
11543 |
---- linux-2.6.32.38/drivers/usb/core/hub.c 2011-03-27 14:31:47.000000000 -0400 |
11544 |
-+++ linux-2.6.32.38/drivers/usb/core/hub.c 2011-04-17 15:56:46.000000000 -0400 |
11545 |
-@@ -3430,7 +3430,7 @@ static struct usb_device_id hub_id_table |
11546 |
- .bDeviceClass = USB_CLASS_HUB}, |
11547 |
- { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, |
11548 |
- .bInterfaceClass = USB_CLASS_HUB}, |
11549 |
-- { } /* Terminating entry */ |
11550 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ |
11551 |
- }; |
11552 |
- |
11553 |
- MODULE_DEVICE_TABLE (usb, hub_id_table); |
11554 |
-diff -urNp linux-2.6.32.38/drivers/usb/core/message.c linux-2.6.32.38/drivers/usb/core/message.c |
11555 |
---- linux-2.6.32.38/drivers/usb/core/message.c 2011-03-27 14:31:47.000000000 -0400 |
11556 |
-+++ linux-2.6.32.38/drivers/usb/core/message.c 2011-04-17 15:56:46.000000000 -0400 |
11557 |
+diff -urNp linux-2.6.32.39/drivers/usb/core/message.c linux-2.6.32.39/drivers/usb/core/message.c |
11558 |
+--- linux-2.6.32.39/drivers/usb/core/message.c 2011-03-27 14:31:47.000000000 -0400 |
11559 |
++++ linux-2.6.32.39/drivers/usb/core/message.c 2011-04-17 15:56:46.000000000 -0400 |
11560 |
@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device |
11561 |
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); |
11562 |
if (buf) { |
11563 |
@@ -30901,33 +30119,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/core/message.c linux-2.6.32.38/drivers/us |
11564 |
if (!smallbuf) |
11565 |
return buf; |
11566 |
memcpy(smallbuf, buf, len); |
11567 |
-diff -urNp linux-2.6.32.38/drivers/usb/host/ehci-pci.c linux-2.6.32.38/drivers/usb/host/ehci-pci.c |
11568 |
---- linux-2.6.32.38/drivers/usb/host/ehci-pci.c 2011-03-27 14:31:47.000000000 -0400 |
11569 |
-+++ linux-2.6.32.38/drivers/usb/host/ehci-pci.c 2011-04-17 15:56:46.000000000 -0400 |
11570 |
-@@ -461,7 +461,7 @@ static const struct pci_device_id pci_id |
11571 |
- PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), |
11572 |
- .driver_data = (unsigned long) &ehci_pci_hc_driver, |
11573 |
- }, |
11574 |
-- { /* end: all zeroes */ } |
11575 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
11576 |
- }; |
11577 |
- MODULE_DEVICE_TABLE(pci, pci_ids); |
11578 |
- |
11579 |
-diff -urNp linux-2.6.32.38/drivers/usb/host/uhci-hcd.c linux-2.6.32.38/drivers/usb/host/uhci-hcd.c |
11580 |
---- linux-2.6.32.38/drivers/usb/host/uhci-hcd.c 2011-03-27 14:31:47.000000000 -0400 |
11581 |
-+++ linux-2.6.32.38/drivers/usb/host/uhci-hcd.c 2011-04-17 15:56:46.000000000 -0400 |
11582 |
-@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p |
11583 |
- /* handle any USB UHCI controller */ |
11584 |
- PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), |
11585 |
- .driver_data = (unsigned long) &uhci_driver, |
11586 |
-- }, { /* end: all zeroes */ } |
11587 |
-+ }, { 0, 0, 0, 0, 0, 0, 0 } |
11588 |
- }; |
11589 |
- |
11590 |
- MODULE_DEVICE_TABLE(pci, uhci_pci_ids); |
11591 |
-diff -urNp linux-2.6.32.38/drivers/usb/misc/appledisplay.c linux-2.6.32.38/drivers/usb/misc/appledisplay.c |
11592 |
---- linux-2.6.32.38/drivers/usb/misc/appledisplay.c 2011-03-27 14:31:47.000000000 -0400 |
11593 |
-+++ linux-2.6.32.38/drivers/usb/misc/appledisplay.c 2011-04-17 15:56:46.000000000 -0400 |
11594 |
+diff -urNp linux-2.6.32.39/drivers/usb/misc/appledisplay.c linux-2.6.32.39/drivers/usb/misc/appledisplay.c |
11595 |
+--- linux-2.6.32.39/drivers/usb/misc/appledisplay.c 2011-03-27 14:31:47.000000000 -0400 |
11596 |
++++ linux-2.6.32.39/drivers/usb/misc/appledisplay.c 2011-04-17 15:56:46.000000000 -0400 |
11597 |
@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes |
11598 |
return pdata->msgdata[1]; |
11599 |
} |
11600 |
@@ -30937,9 +30131,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/misc/appledisplay.c linux-2.6.32.38/drive |
11601 |
.get_brightness = appledisplay_bl_get_brightness, |
11602 |
.update_status = appledisplay_bl_update_status, |
11603 |
}; |
11604 |
-diff -urNp linux-2.6.32.38/drivers/usb/mon/mon_main.c linux-2.6.32.38/drivers/usb/mon/mon_main.c |
11605 |
---- linux-2.6.32.38/drivers/usb/mon/mon_main.c 2011-03-27 14:31:47.000000000 -0400 |
11606 |
-+++ linux-2.6.32.38/drivers/usb/mon/mon_main.c 2011-04-17 15:56:46.000000000 -0400 |
11607 |
+diff -urNp linux-2.6.32.39/drivers/usb/mon/mon_main.c linux-2.6.32.39/drivers/usb/mon/mon_main.c |
11608 |
+--- linux-2.6.32.39/drivers/usb/mon/mon_main.c 2011-03-27 14:31:47.000000000 -0400 |
11609 |
++++ linux-2.6.32.39/drivers/usb/mon/mon_main.c 2011-04-17 15:56:46.000000000 -0400 |
11610 |
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { |
11611 |
/* |
11612 |
* Ops |
11613 |
@@ -30949,49 +30143,9 @@ diff -urNp linux-2.6.32.38/drivers/usb/mon/mon_main.c linux-2.6.32.38/drivers/us |
11614 |
.urb_submit = mon_submit, |
11615 |
.urb_submit_error = mon_submit_error, |
11616 |
.urb_complete = mon_complete, |
11617 |
-diff -urNp linux-2.6.32.38/drivers/usb/storage/debug.h linux-2.6.32.38/drivers/usb/storage/debug.h |
11618 |
---- linux-2.6.32.38/drivers/usb/storage/debug.h 2011-03-27 14:31:47.000000000 -0400 |
11619 |
-+++ linux-2.6.32.38/drivers/usb/storage/debug.h 2011-04-17 15:56:46.000000000 -0400 |
11620 |
-@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char |
11621 |
- #define US_DEBUGPX(x...) printk( x ) |
11622 |
- #define US_DEBUG(x) x |
11623 |
- #else |
11624 |
--#define US_DEBUGP(x...) |
11625 |
--#define US_DEBUGPX(x...) |
11626 |
--#define US_DEBUG(x) |
11627 |
-+#define US_DEBUGP(x...) do {} while (0) |
11628 |
-+#define US_DEBUGPX(x...) do {} while (0) |
11629 |
-+#define US_DEBUG(x) do {} while (0) |
11630 |
- #endif |
11631 |
- |
11632 |
- #endif |
11633 |
-diff -urNp linux-2.6.32.38/drivers/usb/storage/usb.c linux-2.6.32.38/drivers/usb/storage/usb.c |
11634 |
---- linux-2.6.32.38/drivers/usb/storage/usb.c 2011-03-27 14:31:47.000000000 -0400 |
11635 |
-+++ linux-2.6.32.38/drivers/usb/storage/usb.c 2011-04-17 15:56:46.000000000 -0400 |
11636 |
-@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l |
11637 |
- |
11638 |
- static struct us_unusual_dev us_unusual_dev_list[] = { |
11639 |
- # include "unusual_devs.h" |
11640 |
-- { } /* Terminating entry */ |
11641 |
-+ { NULL, NULL, 0, 0, NULL } /* Terminating entry */ |
11642 |
- }; |
11643 |
- |
11644 |
- #undef UNUSUAL_DEV |
11645 |
-diff -urNp linux-2.6.32.38/drivers/usb/storage/usual-tables.c linux-2.6.32.38/drivers/usb/storage/usual-tables.c |
11646 |
---- linux-2.6.32.38/drivers/usb/storage/usual-tables.c 2011-03-27 14:31:47.000000000 -0400 |
11647 |
-+++ linux-2.6.32.38/drivers/usb/storage/usual-tables.c 2011-04-17 15:56:46.000000000 -0400 |
11648 |
-@@ -48,7 +48,7 @@ |
11649 |
- |
11650 |
- struct usb_device_id usb_storage_usb_ids[] = { |
11651 |
- # include "unusual_devs.h" |
11652 |
-- { } /* Terminating entry */ |
11653 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ |
11654 |
- }; |
11655 |
- EXPORT_SYMBOL_GPL(usb_storage_usb_ids); |
11656 |
- |
11657 |
-diff -urNp linux-2.6.32.38/drivers/uwb/wlp/messages.c linux-2.6.32.38/drivers/uwb/wlp/messages.c |
11658 |
---- linux-2.6.32.38/drivers/uwb/wlp/messages.c 2011-03-27 14:31:47.000000000 -0400 |
11659 |
-+++ linux-2.6.32.38/drivers/uwb/wlp/messages.c 2011-04-17 15:56:46.000000000 -0400 |
11660 |
+diff -urNp linux-2.6.32.39/drivers/uwb/wlp/messages.c linux-2.6.32.39/drivers/uwb/wlp/messages.c |
11661 |
+--- linux-2.6.32.39/drivers/uwb/wlp/messages.c 2011-03-27 14:31:47.000000000 -0400 |
11662 |
++++ linux-2.6.32.39/drivers/uwb/wlp/messages.c 2011-04-17 15:56:46.000000000 -0400 |
11663 |
@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct |
11664 |
size_t len = skb->len; |
11665 |
size_t used; |
11666 |
@@ -31001,9 +30155,9 @@ diff -urNp linux-2.6.32.38/drivers/uwb/wlp/messages.c linux-2.6.32.38/drivers/uw |
11667 |
enum wlp_assc_error assc_err; |
11668 |
char enonce_buf[WLP_WSS_NONCE_STRSIZE]; |
11669 |
char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; |
11670 |
-diff -urNp linux-2.6.32.38/drivers/uwb/wlp/sysfs.c linux-2.6.32.38/drivers/uwb/wlp/sysfs.c |
11671 |
---- linux-2.6.32.38/drivers/uwb/wlp/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
11672 |
-+++ linux-2.6.32.38/drivers/uwb/wlp/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
11673 |
+diff -urNp linux-2.6.32.39/drivers/uwb/wlp/sysfs.c linux-2.6.32.39/drivers/uwb/wlp/sysfs.c |
11674 |
+--- linux-2.6.32.39/drivers/uwb/wlp/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
11675 |
++++ linux-2.6.32.39/drivers/uwb/wlp/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
11676 |
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec |
11677 |
return ret; |
11678 |
} |
11679 |
@@ -31014,9 +30168,9 @@ diff -urNp linux-2.6.32.38/drivers/uwb/wlp/sysfs.c linux-2.6.32.38/drivers/uwb/w |
11680 |
.show = wlp_wss_attr_show, |
11681 |
.store = wlp_wss_attr_store, |
11682 |
}; |
11683 |
-diff -urNp linux-2.6.32.38/drivers/video/atmel_lcdfb.c linux-2.6.32.38/drivers/video/atmel_lcdfb.c |
11684 |
---- linux-2.6.32.38/drivers/video/atmel_lcdfb.c 2011-03-27 14:31:47.000000000 -0400 |
11685 |
-+++ linux-2.6.32.38/drivers/video/atmel_lcdfb.c 2011-04-17 15:56:46.000000000 -0400 |
11686 |
+diff -urNp linux-2.6.32.39/drivers/video/atmel_lcdfb.c linux-2.6.32.39/drivers/video/atmel_lcdfb.c |
11687 |
+--- linux-2.6.32.39/drivers/video/atmel_lcdfb.c 2011-03-27 14:31:47.000000000 -0400 |
11688 |
++++ linux-2.6.32.39/drivers/video/atmel_lcdfb.c 2011-04-17 15:56:46.000000000 -0400 |
11689 |
@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc |
11690 |
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); |
11691 |
} |
11692 |
@@ -31026,9 +30180,9 @@ diff -urNp linux-2.6.32.38/drivers/video/atmel_lcdfb.c linux-2.6.32.38/drivers/v |
11693 |
.update_status = atmel_bl_update_status, |
11694 |
.get_brightness = atmel_bl_get_brightness, |
11695 |
}; |
11696 |
-diff -urNp linux-2.6.32.38/drivers/video/aty/aty128fb.c linux-2.6.32.38/drivers/video/aty/aty128fb.c |
11697 |
---- linux-2.6.32.38/drivers/video/aty/aty128fb.c 2011-03-27 14:31:47.000000000 -0400 |
11698 |
-+++ linux-2.6.32.38/drivers/video/aty/aty128fb.c 2011-04-17 15:56:46.000000000 -0400 |
11699 |
+diff -urNp linux-2.6.32.39/drivers/video/aty/aty128fb.c linux-2.6.32.39/drivers/video/aty/aty128fb.c |
11700 |
+--- linux-2.6.32.39/drivers/video/aty/aty128fb.c 2011-03-27 14:31:47.000000000 -0400 |
11701 |
++++ linux-2.6.32.39/drivers/video/aty/aty128fb.c 2011-04-17 15:56:46.000000000 -0400 |
11702 |
@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru |
11703 |
return bd->props.brightness; |
11704 |
} |
11705 |
@@ -31038,9 +30192,9 @@ diff -urNp linux-2.6.32.38/drivers/video/aty/aty128fb.c linux-2.6.32.38/drivers/ |
11706 |
.get_brightness = aty128_bl_get_brightness, |
11707 |
.update_status = aty128_bl_update_status, |
11708 |
}; |
11709 |
-diff -urNp linux-2.6.32.38/drivers/video/aty/atyfb_base.c linux-2.6.32.38/drivers/video/aty/atyfb_base.c |
11710 |
---- linux-2.6.32.38/drivers/video/aty/atyfb_base.c 2011-03-27 14:31:47.000000000 -0400 |
11711 |
-+++ linux-2.6.32.38/drivers/video/aty/atyfb_base.c 2011-04-17 15:56:46.000000000 -0400 |
11712 |
+diff -urNp linux-2.6.32.39/drivers/video/aty/atyfb_base.c linux-2.6.32.39/drivers/video/aty/atyfb_base.c |
11713 |
+--- linux-2.6.32.39/drivers/video/aty/atyfb_base.c 2011-03-27 14:31:47.000000000 -0400 |
11714 |
++++ linux-2.6.32.39/drivers/video/aty/atyfb_base.c 2011-04-17 15:56:46.000000000 -0400 |
11715 |
@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct |
11716 |
return bd->props.brightness; |
11717 |
} |
11718 |
@@ -31050,9 +30204,9 @@ diff -urNp linux-2.6.32.38/drivers/video/aty/atyfb_base.c linux-2.6.32.38/driver |
11719 |
.get_brightness = aty_bl_get_brightness, |
11720 |
.update_status = aty_bl_update_status, |
11721 |
}; |
11722 |
-diff -urNp linux-2.6.32.38/drivers/video/aty/radeon_backlight.c linux-2.6.32.38/drivers/video/aty/radeon_backlight.c |
11723 |
---- linux-2.6.32.38/drivers/video/aty/radeon_backlight.c 2011-03-27 14:31:47.000000000 -0400 |
11724 |
-+++ linux-2.6.32.38/drivers/video/aty/radeon_backlight.c 2011-04-17 15:56:46.000000000 -0400 |
11725 |
+diff -urNp linux-2.6.32.39/drivers/video/aty/radeon_backlight.c linux-2.6.32.39/drivers/video/aty/radeon_backlight.c |
11726 |
+--- linux-2.6.32.39/drivers/video/aty/radeon_backlight.c 2011-03-27 14:31:47.000000000 -0400 |
11727 |
++++ linux-2.6.32.39/drivers/video/aty/radeon_backlight.c 2011-04-17 15:56:46.000000000 -0400 |
11728 |
@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru |
11729 |
return bd->props.brightness; |
11730 |
} |
11731 |
@@ -31062,9 +30216,9 @@ diff -urNp linux-2.6.32.38/drivers/video/aty/radeon_backlight.c linux-2.6.32.38/ |
11732 |
.get_brightness = radeon_bl_get_brightness, |
11733 |
.update_status = radeon_bl_update_status, |
11734 |
}; |
11735 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c |
11736 |
---- linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11737 |
-+++ linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11738 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c |
11739 |
+--- linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11740 |
++++ linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11741 |
@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str |
11742 |
return error ? data->current_brightness : reg_val; |
11743 |
} |
11744 |
@@ -31074,9 +30228,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/adp5520_bl.c linux-2.6.32.38/ |
11745 |
.update_status = adp5520_bl_update_status, |
11746 |
.get_brightness = adp5520_bl_get_brightness, |
11747 |
}; |
11748 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/adx_bl.c linux-2.6.32.38/drivers/video/backlight/adx_bl.c |
11749 |
---- linux-2.6.32.38/drivers/video/backlight/adx_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11750 |
-+++ linux-2.6.32.38/drivers/video/backlight/adx_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11751 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/adx_bl.c linux-2.6.32.39/drivers/video/backlight/adx_bl.c |
11752 |
+--- linux-2.6.32.39/drivers/video/backlight/adx_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11753 |
++++ linux-2.6.32.39/drivers/video/backlight/adx_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11754 |
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct |
11755 |
return 1; |
11756 |
} |
11757 |
@@ -31086,9 +30240,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/adx_bl.c linux-2.6.32.38/driv |
11758 |
.options = 0, |
11759 |
.update_status = adx_backlight_update_status, |
11760 |
.get_brightness = adx_backlight_get_brightness, |
11761 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c |
11762 |
---- linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c 2011-03-27 14:31:47.000000000 -0400 |
11763 |
-+++ linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c 2011-04-17 15:56:46.000000000 -0400 |
11764 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c |
11765 |
+--- linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c 2011-03-27 14:31:47.000000000 -0400 |
11766 |
++++ linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c 2011-04-17 15:56:46.000000000 -0400 |
11767 |
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct |
11768 |
return pwm_channel_enable(&pwmbl->pwmc); |
11769 |
} |
11770 |
@@ -31098,9 +30252,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.3 |
11771 |
.get_brightness = atmel_pwm_bl_get_intensity, |
11772 |
.update_status = atmel_pwm_bl_set_intensity, |
11773 |
}; |
11774 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/backlight.c linux-2.6.32.38/drivers/video/backlight/backlight.c |
11775 |
---- linux-2.6.32.38/drivers/video/backlight/backlight.c 2011-03-27 14:31:47.000000000 -0400 |
11776 |
-+++ linux-2.6.32.38/drivers/video/backlight/backlight.c 2011-04-17 15:56:46.000000000 -0400 |
11777 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/backlight.c linux-2.6.32.39/drivers/video/backlight/backlight.c |
11778 |
+--- linux-2.6.32.39/drivers/video/backlight/backlight.c 2011-03-27 14:31:47.000000000 -0400 |
11779 |
++++ linux-2.6.32.39/drivers/video/backlight/backlight.c 2011-04-17 15:56:46.000000000 -0400 |
11780 |
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); |
11781 |
* ERR_PTR() or a pointer to the newly allocated device. |
11782 |
*/ |
11783 |
@@ -31110,9 +30264,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/backlight.c linux-2.6.32.38/d |
11784 |
{ |
11785 |
struct backlight_device *new_bd; |
11786 |
int rc; |
11787 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c |
11788 |
---- linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c 2011-03-27 14:31:47.000000000 -0400 |
11789 |
-+++ linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c 2011-04-17 15:56:46.000000000 -0400 |
11790 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c |
11791 |
+--- linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c 2011-03-27 14:31:47.000000000 -0400 |
11792 |
++++ linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c 2011-04-17 15:56:46.000000000 -0400 |
11793 |
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit |
11794 |
} |
11795 |
EXPORT_SYMBOL(corgi_lcd_limit_intensity); |
11796 |
@@ -31122,9 +30276,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/corgi_lcd.c linux-2.6.32.38/d |
11797 |
.get_brightness = corgi_bl_get_intensity, |
11798 |
.update_status = corgi_bl_update_status, |
11799 |
}; |
11800 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c |
11801 |
---- linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c 2011-03-27 14:31:47.000000000 -0400 |
11802 |
-+++ linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c 2011-04-17 15:56:46.000000000 -0400 |
11803 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c |
11804 |
+--- linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c 2011-03-27 14:31:47.000000000 -0400 |
11805 |
++++ linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c 2011-04-17 15:56:46.000000000 -0400 |
11806 |
@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st |
11807 |
return intensity; |
11808 |
} |
11809 |
@@ -31134,9 +30288,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/cr_bllcd.c linux-2.6.32.38/dr |
11810 |
.get_brightness = cr_backlight_get_intensity, |
11811 |
.update_status = cr_backlight_set_intensity, |
11812 |
}; |
11813 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/da903x_bl.c linux-2.6.32.38/drivers/video/backlight/da903x_bl.c |
11814 |
---- linux-2.6.32.38/drivers/video/backlight/da903x_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11815 |
-+++ linux-2.6.32.38/drivers/video/backlight/da903x_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11816 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/da903x_bl.c linux-2.6.32.39/drivers/video/backlight/da903x_bl.c |
11817 |
+--- linux-2.6.32.39/drivers/video/backlight/da903x_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11818 |
++++ linux-2.6.32.39/drivers/video/backlight/da903x_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11819 |
@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne |
11820 |
return data->current_brightness; |
11821 |
} |
11822 |
@@ -31146,9 +30300,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/da903x_bl.c linux-2.6.32.38/d |
11823 |
.update_status = da903x_backlight_update_status, |
11824 |
.get_brightness = da903x_backlight_get_brightness, |
11825 |
}; |
11826 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/generic_bl.c linux-2.6.32.38/drivers/video/backlight/generic_bl.c |
11827 |
---- linux-2.6.32.38/drivers/video/backlight/generic_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11828 |
-+++ linux-2.6.32.38/drivers/video/backlight/generic_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11829 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/generic_bl.c linux-2.6.32.39/drivers/video/backlight/generic_bl.c |
11830 |
+--- linux-2.6.32.39/drivers/video/backlight/generic_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11831 |
++++ linux-2.6.32.39/drivers/video/backlight/generic_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11832 |
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) |
11833 |
} |
11834 |
EXPORT_SYMBOL(corgibl_limit_intensity); |
11835 |
@@ -31158,9 +30312,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/generic_bl.c linux-2.6.32.38/ |
11836 |
.options = BL_CORE_SUSPENDRESUME, |
11837 |
.get_brightness = genericbl_get_intensity, |
11838 |
.update_status = genericbl_send_intensity, |
11839 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/hp680_bl.c linux-2.6.32.38/drivers/video/backlight/hp680_bl.c |
11840 |
---- linux-2.6.32.38/drivers/video/backlight/hp680_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11841 |
-+++ linux-2.6.32.38/drivers/video/backlight/hp680_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11842 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/hp680_bl.c linux-2.6.32.39/drivers/video/backlight/hp680_bl.c |
11843 |
+--- linux-2.6.32.39/drivers/video/backlight/hp680_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11844 |
++++ linux-2.6.32.39/drivers/video/backlight/hp680_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11845 |
@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct |
11846 |
return current_intensity; |
11847 |
} |
11848 |
@@ -31170,9 +30324,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/hp680_bl.c linux-2.6.32.38/dr |
11849 |
.get_brightness = hp680bl_get_intensity, |
11850 |
.update_status = hp680bl_set_intensity, |
11851 |
}; |
11852 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c |
11853 |
---- linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11854 |
-+++ linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11855 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c |
11856 |
+--- linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11857 |
++++ linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11858 |
@@ -93,7 +93,7 @@ out: |
11859 |
return ret; |
11860 |
} |
11861 |
@@ -31182,9 +30336,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/jornada720_bl.c linux-2.6.32. |
11862 |
.get_brightness = jornada_bl_get_brightness, |
11863 |
.update_status = jornada_bl_update_status, |
11864 |
.options = BL_CORE_SUSPENDRESUME, |
11865 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c |
11866 |
---- linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11867 |
-+++ linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11868 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c |
11869 |
+--- linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11870 |
++++ linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11871 |
@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct |
11872 |
return kb3886bl_intensity; |
11873 |
} |
11874 |
@@ -31194,9 +30348,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/kb3886_bl.c linux-2.6.32.38/d |
11875 |
.get_brightness = kb3886bl_get_intensity, |
11876 |
.update_status = kb3886bl_send_intensity, |
11877 |
}; |
11878 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/locomolcd.c linux-2.6.32.38/drivers/video/backlight/locomolcd.c |
11879 |
---- linux-2.6.32.38/drivers/video/backlight/locomolcd.c 2011-03-27 14:31:47.000000000 -0400 |
11880 |
-+++ linux-2.6.32.38/drivers/video/backlight/locomolcd.c 2011-04-17 15:56:46.000000000 -0400 |
11881 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/locomolcd.c linux-2.6.32.39/drivers/video/backlight/locomolcd.c |
11882 |
+--- linux-2.6.32.39/drivers/video/backlight/locomolcd.c 2011-03-27 14:31:47.000000000 -0400 |
11883 |
++++ linux-2.6.32.39/drivers/video/backlight/locomolcd.c 2011-04-17 15:56:46.000000000 -0400 |
11884 |
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc |
11885 |
return current_intensity; |
11886 |
} |
11887 |
@@ -31206,9 +30360,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/locomolcd.c linux-2.6.32.38/d |
11888 |
.get_brightness = locomolcd_get_intensity, |
11889 |
.update_status = locomolcd_set_intensity, |
11890 |
}; |
11891 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c |
11892 |
---- linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11893 |
-+++ linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11894 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c |
11895 |
+--- linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11896 |
++++ linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11897 |
@@ -33,7 +33,7 @@ struct dmi_match_data { |
11898 |
unsigned long iostart; |
11899 |
unsigned long iolen; |
11900 |
@@ -31218,9 +30372,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. |
11901 |
}; |
11902 |
|
11903 |
/* Module parameters. */ |
11904 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/omap1_bl.c linux-2.6.32.38/drivers/video/backlight/omap1_bl.c |
11905 |
---- linux-2.6.32.38/drivers/video/backlight/omap1_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11906 |
-+++ linux-2.6.32.38/drivers/video/backlight/omap1_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11907 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/omap1_bl.c linux-2.6.32.39/drivers/video/backlight/omap1_bl.c |
11908 |
+--- linux-2.6.32.39/drivers/video/backlight/omap1_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11909 |
++++ linux-2.6.32.39/drivers/video/backlight/omap1_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11910 |
@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b |
11911 |
return bl->current_intensity; |
11912 |
} |
11913 |
@@ -31230,9 +30384,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/omap1_bl.c linux-2.6.32.38/dr |
11914 |
.get_brightness = omapbl_get_intensity, |
11915 |
.update_status = omapbl_update_status, |
11916 |
}; |
11917 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/progear_bl.c linux-2.6.32.38/drivers/video/backlight/progear_bl.c |
11918 |
---- linux-2.6.32.38/drivers/video/backlight/progear_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11919 |
-+++ linux-2.6.32.38/drivers/video/backlight/progear_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11920 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/progear_bl.c linux-2.6.32.39/drivers/video/backlight/progear_bl.c |
11921 |
+--- linux-2.6.32.39/drivers/video/backlight/progear_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11922 |
++++ linux-2.6.32.39/drivers/video/backlight/progear_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11923 |
@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc |
11924 |
return intensity - HW_LEVEL_MIN; |
11925 |
} |
11926 |
@@ -31242,9 +30396,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/progear_bl.c linux-2.6.32.38/ |
11927 |
.get_brightness = progearbl_get_intensity, |
11928 |
.update_status = progearbl_set_intensity, |
11929 |
}; |
11930 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/pwm_bl.c linux-2.6.32.38/drivers/video/backlight/pwm_bl.c |
11931 |
---- linux-2.6.32.38/drivers/video/backlight/pwm_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11932 |
-+++ linux-2.6.32.38/drivers/video/backlight/pwm_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11933 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/pwm_bl.c linux-2.6.32.39/drivers/video/backlight/pwm_bl.c |
11934 |
+--- linux-2.6.32.39/drivers/video/backlight/pwm_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11935 |
++++ linux-2.6.32.39/drivers/video/backlight/pwm_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11936 |
@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( |
11937 |
return bl->props.brightness; |
11938 |
} |
11939 |
@@ -31254,9 +30408,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/pwm_bl.c linux-2.6.32.38/driv |
11940 |
.update_status = pwm_backlight_update_status, |
11941 |
.get_brightness = pwm_backlight_get_brightness, |
11942 |
}; |
11943 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/tosa_bl.c linux-2.6.32.38/drivers/video/backlight/tosa_bl.c |
11944 |
---- linux-2.6.32.38/drivers/video/backlight/tosa_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11945 |
-+++ linux-2.6.32.38/drivers/video/backlight/tosa_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11946 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/tosa_bl.c linux-2.6.32.39/drivers/video/backlight/tosa_bl.c |
11947 |
+--- linux-2.6.32.39/drivers/video/backlight/tosa_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11948 |
++++ linux-2.6.32.39/drivers/video/backlight/tosa_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11949 |
@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct |
11950 |
return props->brightness; |
11951 |
} |
11952 |
@@ -31266,9 +30420,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/tosa_bl.c linux-2.6.32.38/dri |
11953 |
.get_brightness = tosa_bl_get_brightness, |
11954 |
.update_status = tosa_bl_update_status, |
11955 |
}; |
11956 |
-diff -urNp linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c |
11957 |
---- linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11958 |
-+++ linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11959 |
+diff -urNp linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c |
11960 |
+--- linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c 2011-03-27 14:31:47.000000000 -0400 |
11961 |
++++ linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c 2011-04-17 15:56:46.000000000 -0400 |
11962 |
@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne |
11963 |
return data->current_brightness; |
11964 |
} |
11965 |
@@ -31278,9 +30432,9 @@ diff -urNp linux-2.6.32.38/drivers/video/backlight/wm831x_bl.c linux-2.6.32.38/d |
11966 |
.options = BL_CORE_SUSPENDRESUME, |
11967 |
.update_status = wm831x_backlight_update_status, |
11968 |
.get_brightness = wm831x_backlight_get_brightness, |
11969 |
-diff -urNp linux-2.6.32.38/drivers/video/bf54x-lq043fb.c linux-2.6.32.38/drivers/video/bf54x-lq043fb.c |
11970 |
---- linux-2.6.32.38/drivers/video/bf54x-lq043fb.c 2011-03-27 14:31:47.000000000 -0400 |
11971 |
-+++ linux-2.6.32.38/drivers/video/bf54x-lq043fb.c 2011-04-17 15:56:46.000000000 -0400 |
11972 |
+diff -urNp linux-2.6.32.39/drivers/video/bf54x-lq043fb.c linux-2.6.32.39/drivers/video/bf54x-lq043fb.c |
11973 |
+--- linux-2.6.32.39/drivers/video/bf54x-lq043fb.c 2011-03-27 14:31:47.000000000 -0400 |
11974 |
++++ linux-2.6.32.39/drivers/video/bf54x-lq043fb.c 2011-04-17 15:56:46.000000000 -0400 |
11975 |
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back |
11976 |
return 0; |
11977 |
} |
11978 |
@@ -31290,9 +30444,9 @@ diff -urNp linux-2.6.32.38/drivers/video/bf54x-lq043fb.c linux-2.6.32.38/drivers |
11979 |
.get_brightness = bl_get_brightness, |
11980 |
}; |
11981 |
|
11982 |
-diff -urNp linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c |
11983 |
---- linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c 2011-03-27 14:31:47.000000000 -0400 |
11984 |
-+++ linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c 2011-04-17 15:56:46.000000000 -0400 |
11985 |
+diff -urNp linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c |
11986 |
+--- linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c 2011-03-27 14:31:47.000000000 -0400 |
11987 |
++++ linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c 2011-04-17 15:56:46.000000000 -0400 |
11988 |
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back |
11989 |
return 0; |
11990 |
} |
11991 |
@@ -31302,9 +30456,9 @@ diff -urNp linux-2.6.32.38/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.38/driv |
11992 |
.get_brightness = bl_get_brightness, |
11993 |
}; |
11994 |
|
11995 |
-diff -urNp linux-2.6.32.38/drivers/video/fbcmap.c linux-2.6.32.38/drivers/video/fbcmap.c |
11996 |
---- linux-2.6.32.38/drivers/video/fbcmap.c 2011-03-27 14:31:47.000000000 -0400 |
11997 |
-+++ linux-2.6.32.38/drivers/video/fbcmap.c 2011-04-17 15:56:46.000000000 -0400 |
11998 |
+diff -urNp linux-2.6.32.39/drivers/video/fbcmap.c linux-2.6.32.39/drivers/video/fbcmap.c |
11999 |
+--- linux-2.6.32.39/drivers/video/fbcmap.c 2011-03-27 14:31:47.000000000 -0400 |
12000 |
++++ linux-2.6.32.39/drivers/video/fbcmap.c 2011-04-17 15:56:46.000000000 -0400 |
12001 |
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user |
12002 |
rc = -ENODEV; |
12003 |
goto out; |
12004 |
@@ -31315,9 +30469,9 @@ diff -urNp linux-2.6.32.38/drivers/video/fbcmap.c linux-2.6.32.38/drivers/video/ |
12005 |
rc = -EINVAL; |
12006 |
goto out1; |
12007 |
} |
12008 |
-diff -urNp linux-2.6.32.38/drivers/video/fbmem.c linux-2.6.32.38/drivers/video/fbmem.c |
12009 |
---- linux-2.6.32.38/drivers/video/fbmem.c 2011-03-27 14:31:47.000000000 -0400 |
12010 |
-+++ linux-2.6.32.38/drivers/video/fbmem.c 2011-04-17 15:56:46.000000000 -0400 |
12011 |
+diff -urNp linux-2.6.32.39/drivers/video/fbmem.c linux-2.6.32.39/drivers/video/fbmem.c |
12012 |
+--- linux-2.6.32.39/drivers/video/fbmem.c 2011-03-27 14:31:47.000000000 -0400 |
12013 |
++++ linux-2.6.32.39/drivers/video/fbmem.c 2011-04-17 15:56:46.000000000 -0400 |
12014 |
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in |
12015 |
image->dx += image->width + 8; |
12016 |
} |
12017 |
@@ -31345,21 +30499,9 @@ diff -urNp linux-2.6.32.38/drivers/video/fbmem.c linux-2.6.32.38/drivers/video/f |
12018 |
return -EINVAL; |
12019 |
if (!registered_fb[con2fb.framebuffer]) |
12020 |
request_module("fb%d", con2fb.framebuffer); |
12021 |
-diff -urNp linux-2.6.32.38/drivers/video/fbmon.c linux-2.6.32.38/drivers/video/fbmon.c |
12022 |
---- linux-2.6.32.38/drivers/video/fbmon.c 2011-03-27 14:31:47.000000000 -0400 |
12023 |
-+++ linux-2.6.32.38/drivers/video/fbmon.c 2011-04-17 15:56:46.000000000 -0400 |
12024 |
-@@ -45,7 +45,7 @@ |
12025 |
- #ifdef DEBUG |
12026 |
- #define DPRINTK(fmt, args...) printk(fmt,## args) |
12027 |
- #else |
12028 |
--#define DPRINTK(fmt, args...) |
12029 |
-+#define DPRINTK(fmt, args...) do {} while (0) |
12030 |
- #endif |
12031 |
- |
12032 |
- #define FBMON_FIX_HEADER 1 |
12033 |
-diff -urNp linux-2.6.32.38/drivers/video/i810/i810_accel.c linux-2.6.32.38/drivers/video/i810/i810_accel.c |
12034 |
---- linux-2.6.32.38/drivers/video/i810/i810_accel.c 2011-03-27 14:31:47.000000000 -0400 |
12035 |
-+++ linux-2.6.32.38/drivers/video/i810/i810_accel.c 2011-04-17 15:56:46.000000000 -0400 |
12036 |
+diff -urNp linux-2.6.32.39/drivers/video/i810/i810_accel.c linux-2.6.32.39/drivers/video/i810/i810_accel.c |
12037 |
+--- linux-2.6.32.39/drivers/video/i810/i810_accel.c 2011-03-27 14:31:47.000000000 -0400 |
12038 |
++++ linux-2.6.32.39/drivers/video/i810/i810_accel.c 2011-04-17 15:56:46.000000000 -0400 |
12039 |
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct |
12040 |
} |
12041 |
} |
12042 |
@@ -31368,324 +30510,9 @@ diff -urNp linux-2.6.32.38/drivers/video/i810/i810_accel.c linux-2.6.32.38/drive |
12043 |
i810_report_error(mmio); |
12044 |
par->dev_flags |= LOCKUP; |
12045 |
info->pixmap.scan_align = 1; |
12046 |
-diff -urNp linux-2.6.32.38/drivers/video/i810/i810_main.c linux-2.6.32.38/drivers/video/i810/i810_main.c |
12047 |
---- linux-2.6.32.38/drivers/video/i810/i810_main.c 2011-03-27 14:31:47.000000000 -0400 |
12048 |
-+++ linux-2.6.32.38/drivers/video/i810/i810_main.c 2011-04-17 15:56:46.000000000 -0400 |
12049 |
-@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t |
12050 |
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, |
12051 |
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, |
12052 |
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 }, |
12053 |
-- { 0 }, |
12054 |
-+ { 0, 0, 0, 0, 0, 0, 0 }, |
12055 |
- }; |
12056 |
- |
12057 |
- static struct pci_driver i810fb_driver = { |
12058 |
-diff -urNp linux-2.6.32.38/drivers/video/modedb.c linux-2.6.32.38/drivers/video/modedb.c |
12059 |
---- linux-2.6.32.38/drivers/video/modedb.c 2011-03-27 14:31:47.000000000 -0400 |
12060 |
-+++ linux-2.6.32.38/drivers/video/modedb.c 2011-04-17 15:56:46.000000000 -0400 |
12061 |
-@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ |
12062 |
- { |
12063 |
- /* 640x400 @ 70 Hz, 31.5 kHz hsync */ |
12064 |
- NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, |
12065 |
-- 0, FB_VMODE_NONINTERLACED |
12066 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12067 |
- }, { |
12068 |
- /* 640x480 @ 60 Hz, 31.5 kHz hsync */ |
12069 |
- NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, |
12070 |
-- 0, FB_VMODE_NONINTERLACED |
12071 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12072 |
- }, { |
12073 |
- /* 800x600 @ 56 Hz, 35.15 kHz hsync */ |
12074 |
- NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, |
12075 |
-- 0, FB_VMODE_NONINTERLACED |
12076 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12077 |
- }, { |
12078 |
- /* 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync */ |
12079 |
- NULL, 87, 1024, 768, 22271, 56, 24, 33, 8, 160, 8, |
12080 |
-- 0, FB_VMODE_INTERLACED |
12081 |
-+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN |
12082 |
- }, { |
12083 |
- /* 640x400 @ 85 Hz, 37.86 kHz hsync */ |
12084 |
- NULL, 85, 640, 400, 31746, 96, 32, 41, 1, 64, 3, |
12085 |
-- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12086 |
-+ FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12087 |
- }, { |
12088 |
- /* 640x480 @ 72 Hz, 36.5 kHz hsync */ |
12089 |
- NULL, 72, 640, 480, 31746, 144, 40, 30, 8, 40, 3, |
12090 |
-- 0, FB_VMODE_NONINTERLACED |
12091 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12092 |
- }, { |
12093 |
- /* 640x480 @ 75 Hz, 37.50 kHz hsync */ |
12094 |
- NULL, 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3, |
12095 |
-- 0, FB_VMODE_NONINTERLACED |
12096 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12097 |
- }, { |
12098 |
- /* 800x600 @ 60 Hz, 37.8 kHz hsync */ |
12099 |
- NULL, 60, 800, 600, 25000, 88, 40, 23, 1, 128, 4, |
12100 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12101 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12102 |
- }, { |
12103 |
- /* 640x480 @ 85 Hz, 43.27 kHz hsync */ |
12104 |
- NULL, 85, 640, 480, 27777, 80, 56, 25, 1, 56, 3, |
12105 |
-- 0, FB_VMODE_NONINTERLACED |
12106 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12107 |
- }, { |
12108 |
- /* 1152x864 @ 89 Hz interlaced, 44 kHz hsync */ |
12109 |
- NULL, 89, 1152, 864, 15384, 96, 16, 110, 1, 216, 10, |
12110 |
-- 0, FB_VMODE_INTERLACED |
12111 |
-+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN |
12112 |
- }, { |
12113 |
- /* 800x600 @ 72 Hz, 48.0 kHz hsync */ |
12114 |
- NULL, 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6, |
12115 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12116 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12117 |
- }, { |
12118 |
- /* 1024x768 @ 60 Hz, 48.4 kHz hsync */ |
12119 |
- NULL, 60, 1024, 768, 15384, 168, 8, 29, 3, 144, 6, |
12120 |
-- 0, FB_VMODE_NONINTERLACED |
12121 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12122 |
- }, { |
12123 |
- /* 640x480 @ 100 Hz, 53.01 kHz hsync */ |
12124 |
- NULL, 100, 640, 480, 21834, 96, 32, 36, 8, 96, 6, |
12125 |
-- 0, FB_VMODE_NONINTERLACED |
12126 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12127 |
- }, { |
12128 |
- /* 1152x864 @ 60 Hz, 53.5 kHz hsync */ |
12129 |
- NULL, 60, 1152, 864, 11123, 208, 64, 16, 4, 256, 8, |
12130 |
-- 0, FB_VMODE_NONINTERLACED |
12131 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12132 |
- }, { |
12133 |
- /* 800x600 @ 85 Hz, 55.84 kHz hsync */ |
12134 |
- NULL, 85, 800, 600, 16460, 160, 64, 36, 16, 64, 5, |
12135 |
-- 0, FB_VMODE_NONINTERLACED |
12136 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12137 |
- }, { |
12138 |
- /* 1024x768 @ 70 Hz, 56.5 kHz hsync */ |
12139 |
- NULL, 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, |
12140 |
-- 0, FB_VMODE_NONINTERLACED |
12141 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12142 |
- }, { |
12143 |
- /* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */ |
12144 |
- NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12, |
12145 |
-- 0, FB_VMODE_INTERLACED |
12146 |
-+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN |
12147 |
- }, { |
12148 |
- /* 800x600 @ 100 Hz, 64.02 kHz hsync */ |
12149 |
- NULL, 100, 800, 600, 14357, 160, 64, 30, 4, 64, 6, |
12150 |
-- 0, FB_VMODE_NONINTERLACED |
12151 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12152 |
- }, { |
12153 |
- /* 1024x768 @ 76 Hz, 62.5 kHz hsync */ |
12154 |
- NULL, 76, 1024, 768, 11764, 208, 8, 36, 16, 120, 3, |
12155 |
-- 0, FB_VMODE_NONINTERLACED |
12156 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12157 |
- }, { |
12158 |
- /* 1152x864 @ 70 Hz, 62.4 kHz hsync */ |
12159 |
- NULL, 70, 1152, 864, 10869, 106, 56, 20, 1, 160, 10, |
12160 |
-- 0, FB_VMODE_NONINTERLACED |
12161 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12162 |
- }, { |
12163 |
- /* 1280x1024 @ 61 Hz, 64.2 kHz hsync */ |
12164 |
- NULL, 61, 1280, 1024, 9090, 200, 48, 26, 1, 184, 3, |
12165 |
-- 0, FB_VMODE_NONINTERLACED |
12166 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12167 |
- }, { |
12168 |
- /* 1400x1050 @ 60Hz, 63.9 kHz hsync */ |
12169 |
- NULL, 60, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3, |
12170 |
-- 0, FB_VMODE_NONINTERLACED |
12171 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12172 |
- }, { |
12173 |
- /* 1400x1050 @ 75,107 Hz, 82,392 kHz +hsync +vsync*/ |
12174 |
- NULL, 75, 1400, 1050, 7190, 120, 56, 23, 10, 112, 13, |
12175 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12176 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12177 |
- }, { |
12178 |
- /* 1400x1050 @ 60 Hz, ? kHz +hsync +vsync*/ |
12179 |
- NULL, 60, 1400, 1050, 9259, 128, 40, 12, 0, 112, 3, |
12180 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12181 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12182 |
- }, { |
12183 |
- /* 1024x768 @ 85 Hz, 70.24 kHz hsync */ |
12184 |
- NULL, 85, 1024, 768, 10111, 192, 32, 34, 14, 160, 6, |
12185 |
-- 0, FB_VMODE_NONINTERLACED |
12186 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12187 |
- }, { |
12188 |
- /* 1152x864 @ 78 Hz, 70.8 kHz hsync */ |
12189 |
- NULL, 78, 1152, 864, 9090, 228, 88, 32, 0, 84, 12, |
12190 |
-- 0, FB_VMODE_NONINTERLACED |
12191 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12192 |
- }, { |
12193 |
- /* 1280x1024 @ 70 Hz, 74.59 kHz hsync */ |
12194 |
- NULL, 70, 1280, 1024, 7905, 224, 32, 28, 8, 160, 8, |
12195 |
-- 0, FB_VMODE_NONINTERLACED |
12196 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12197 |
- }, { |
12198 |
- /* 1600x1200 @ 60Hz, 75.00 kHz hsync */ |
12199 |
- NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3, |
12200 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12201 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12202 |
- }, { |
12203 |
- /* 1152x864 @ 84 Hz, 76.0 kHz hsync */ |
12204 |
- NULL, 84, 1152, 864, 7407, 184, 312, 32, 0, 128, 12, |
12205 |
-- 0, FB_VMODE_NONINTERLACED |
12206 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12207 |
- }, { |
12208 |
- /* 1280x1024 @ 74 Hz, 78.85 kHz hsync */ |
12209 |
- NULL, 74, 1280, 1024, 7407, 256, 32, 34, 3, 144, 3, |
12210 |
-- 0, FB_VMODE_NONINTERLACED |
12211 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12212 |
- }, { |
12213 |
- /* 1024x768 @ 100Hz, 80.21 kHz hsync */ |
12214 |
- NULL, 100, 1024, 768, 8658, 192, 32, 21, 3, 192, 10, |
12215 |
-- 0, FB_VMODE_NONINTERLACED |
12216 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12217 |
- }, { |
12218 |
- /* 1280x1024 @ 76 Hz, 81.13 kHz hsync */ |
12219 |
- NULL, 76, 1280, 1024, 7407, 248, 32, 34, 3, 104, 3, |
12220 |
-- 0, FB_VMODE_NONINTERLACED |
12221 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12222 |
- }, { |
12223 |
- /* 1600x1200 @ 70 Hz, 87.50 kHz hsync */ |
12224 |
- NULL, 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3, |
12225 |
-- 0, FB_VMODE_NONINTERLACED |
12226 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12227 |
- }, { |
12228 |
- /* 1152x864 @ 100 Hz, 89.62 kHz hsync */ |
12229 |
- NULL, 100, 1152, 864, 7264, 224, 32, 17, 2, 128, 19, |
12230 |
-- 0, FB_VMODE_NONINTERLACED |
12231 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12232 |
- }, { |
12233 |
- /* 1280x1024 @ 85 Hz, 91.15 kHz hsync */ |
12234 |
- NULL, 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3, |
12235 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12236 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12237 |
- }, { |
12238 |
- /* 1600x1200 @ 75 Hz, 93.75 kHz hsync */ |
12239 |
- NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, |
12240 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12241 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12242 |
- }, { |
12243 |
- /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */ |
12244 |
- NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6, |
12245 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12246 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12247 |
- }, { |
12248 |
- /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */ |
12249 |
- NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3, |
12250 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12251 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12252 |
- }, { |
12253 |
- /* 1280x1024 @ 100 Hz, 107.16 kHz hsync */ |
12254 |
- NULL, 100, 1280, 1024, 5502, 256, 32, 26, 7, 128, 15, |
12255 |
-- 0, FB_VMODE_NONINTERLACED |
12256 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12257 |
- }, { |
12258 |
- /* 1800x1440 @ 64Hz, 96.15 kHz hsync */ |
12259 |
- NULL, 64, 1800, 1440, 4347, 304, 96, 46, 1, 192, 3, |
12260 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12261 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12262 |
- }, { |
12263 |
- /* 1800x1440 @ 70Hz, 104.52 kHz hsync */ |
12264 |
- NULL, 70, 1800, 1440, 4000, 304, 96, 46, 1, 192, 3, |
12265 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12266 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12267 |
- }, { |
12268 |
- /* 512x384 @ 78 Hz, 31.50 kHz hsync */ |
12269 |
- NULL, 78, 512, 384, 49603, 48, 16, 16, 1, 64, 3, |
12270 |
-- 0, FB_VMODE_NONINTERLACED |
12271 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12272 |
- }, { |
12273 |
- /* 512x384 @ 85 Hz, 34.38 kHz hsync */ |
12274 |
- NULL, 85, 512, 384, 45454, 48, 16, 16, 1, 64, 3, |
12275 |
-- 0, FB_VMODE_NONINTERLACED |
12276 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12277 |
- }, { |
12278 |
- /* 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio */ |
12279 |
- NULL, 70, 320, 200, 79440, 16, 16, 20, 4, 48, 1, |
12280 |
-- 0, FB_VMODE_DOUBLE |
12281 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12282 |
- }, { |
12283 |
- /* 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio */ |
12284 |
- NULL, 60, 320, 240, 79440, 16, 16, 16, 5, 48, 1, |
12285 |
-- 0, FB_VMODE_DOUBLE |
12286 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12287 |
- }, { |
12288 |
- /* 320x240 @ 72 Hz, 36.5 kHz hsync */ |
12289 |
- NULL, 72, 320, 240, 63492, 16, 16, 16, 4, 48, 2, |
12290 |
-- 0, FB_VMODE_DOUBLE |
12291 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12292 |
- }, { |
12293 |
- /* 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio */ |
12294 |
- NULL, 56, 400, 300, 55555, 64, 16, 10, 1, 32, 1, |
12295 |
-- 0, FB_VMODE_DOUBLE |
12296 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12297 |
- }, { |
12298 |
- /* 400x300 @ 60 Hz, 37.8 kHz hsync */ |
12299 |
- NULL, 60, 400, 300, 50000, 48, 16, 11, 1, 64, 2, |
12300 |
-- 0, FB_VMODE_DOUBLE |
12301 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12302 |
- }, { |
12303 |
- /* 400x300 @ 72 Hz, 48.0 kHz hsync */ |
12304 |
- NULL, 72, 400, 300, 40000, 32, 24, 11, 19, 64, 3, |
12305 |
-- 0, FB_VMODE_DOUBLE |
12306 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12307 |
- }, { |
12308 |
- /* 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio */ |
12309 |
- NULL, 56, 480, 300, 46176, 80, 16, 10, 1, 40, 1, |
12310 |
-- 0, FB_VMODE_DOUBLE |
12311 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12312 |
- }, { |
12313 |
- /* 480x300 @ 60 Hz, 37.8 kHz hsync */ |
12314 |
- NULL, 60, 480, 300, 41858, 56, 16, 11, 1, 80, 2, |
12315 |
-- 0, FB_VMODE_DOUBLE |
12316 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12317 |
- }, { |
12318 |
- /* 480x300 @ 63 Hz, 39.6 kHz hsync */ |
12319 |
- NULL, 63, 480, 300, 40000, 56, 16, 11, 1, 80, 2, |
12320 |
-- 0, FB_VMODE_DOUBLE |
12321 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12322 |
- }, { |
12323 |
- /* 480x300 @ 72 Hz, 48.0 kHz hsync */ |
12324 |
- NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, |
12325 |
-- 0, FB_VMODE_DOUBLE |
12326 |
-+ 0, FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN |
12327 |
- }, { |
12328 |
- /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ |
12329 |
- NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, |
12330 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
12331 |
-- FB_VMODE_NONINTERLACED |
12332 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12333 |
- }, { |
12334 |
- /* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */ |
12335 |
- NULL, 60, 1152, 768, 14047, 158, 26, 29, 3, 136, 6, |
12336 |
-- FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED |
12337 |
-+ FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12338 |
- }, { |
12339 |
- /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */ |
12340 |
- NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5, |
12341 |
-- 0, FB_VMODE_NONINTERLACED |
12342 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12343 |
- }, { |
12344 |
- /* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */ |
12345 |
- NULL, 60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3, |
12346 |
-- 0, FB_VMODE_NONINTERLACED |
12347 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN |
12348 |
- }, { |
12349 |
- /* 720x576i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ |
12350 |
- NULL, 50, 720, 576, 74074, 64, 16, 39, 5, 64, 5, |
12351 |
-- 0, FB_VMODE_INTERLACED |
12352 |
-+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN |
12353 |
- }, { |
12354 |
- /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ |
12355 |
- NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5, |
12356 |
-- 0, FB_VMODE_INTERLACED |
12357 |
-+ 0, FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN |
12358 |
- }, |
12359 |
- }; |
12360 |
- |
12361 |
-diff -urNp linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c |
12362 |
---- linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c 2011-03-27 14:31:47.000000000 -0400 |
12363 |
-+++ linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c 2011-04-17 15:56:46.000000000 -0400 |
12364 |
+diff -urNp linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c |
12365 |
+--- linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c 2011-03-27 14:31:47.000000000 -0400 |
12366 |
++++ linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c 2011-04-17 15:56:46.000000000 -0400 |
12367 |
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru |
12368 |
return bd->props.brightness; |
12369 |
} |
12370 |
@@ -31695,9 +30522,9 @@ diff -urNp linux-2.6.32.38/drivers/video/nvidia/nv_backlight.c linux-2.6.32.38/d |
12371 |
.get_brightness = nvidia_bl_get_brightness, |
12372 |
.update_status = nvidia_bl_update_status, |
12373 |
}; |
12374 |
-diff -urNp linux-2.6.32.38/drivers/video/riva/fbdev.c linux-2.6.32.38/drivers/video/riva/fbdev.c |
12375 |
---- linux-2.6.32.38/drivers/video/riva/fbdev.c 2011-03-27 14:31:47.000000000 -0400 |
12376 |
-+++ linux-2.6.32.38/drivers/video/riva/fbdev.c 2011-04-17 15:56:46.000000000 -0400 |
12377 |
+diff -urNp linux-2.6.32.39/drivers/video/riva/fbdev.c linux-2.6.32.39/drivers/video/riva/fbdev.c |
12378 |
+--- linux-2.6.32.39/drivers/video/riva/fbdev.c 2011-03-27 14:31:47.000000000 -0400 |
12379 |
++++ linux-2.6.32.39/drivers/video/riva/fbdev.c 2011-04-17 15:56:46.000000000 -0400 |
12380 |
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct |
12381 |
return bd->props.brightness; |
12382 |
} |
12383 |
@@ -31707,9 +30534,9 @@ diff -urNp linux-2.6.32.38/drivers/video/riva/fbdev.c linux-2.6.32.38/drivers/vi |
12384 |
.get_brightness = riva_bl_get_brightness, |
12385 |
.update_status = riva_bl_update_status, |
12386 |
}; |
12387 |
-diff -urNp linux-2.6.32.38/drivers/video/uvesafb.c linux-2.6.32.38/drivers/video/uvesafb.c |
12388 |
---- linux-2.6.32.38/drivers/video/uvesafb.c 2011-03-27 14:31:47.000000000 -0400 |
12389 |
-+++ linux-2.6.32.38/drivers/video/uvesafb.c 2011-04-17 15:56:46.000000000 -0400 |
12390 |
+diff -urNp linux-2.6.32.39/drivers/video/uvesafb.c linux-2.6.32.39/drivers/video/uvesafb.c |
12391 |
+--- linux-2.6.32.39/drivers/video/uvesafb.c 2011-03-27 14:31:47.000000000 -0400 |
12392 |
++++ linux-2.6.32.39/drivers/video/uvesafb.c 2011-04-17 15:56:46.000000000 -0400 |
12393 |
@@ -18,6 +18,7 @@ |
12394 |
#include <linux/fb.h> |
12395 |
#include <linux/io.h> |
12396 |
@@ -31785,9 +30612,9 @@ diff -urNp linux-2.6.32.38/drivers/video/uvesafb.c linux-2.6.32.38/drivers/video |
12397 |
} |
12398 |
|
12399 |
framebuffer_release(info); |
12400 |
-diff -urNp linux-2.6.32.38/drivers/video/vesafb.c linux-2.6.32.38/drivers/video/vesafb.c |
12401 |
---- linux-2.6.32.38/drivers/video/vesafb.c 2011-03-27 14:31:47.000000000 -0400 |
12402 |
-+++ linux-2.6.32.38/drivers/video/vesafb.c 2011-04-17 15:56:46.000000000 -0400 |
12403 |
+diff -urNp linux-2.6.32.39/drivers/video/vesafb.c linux-2.6.32.39/drivers/video/vesafb.c |
12404 |
+--- linux-2.6.32.39/drivers/video/vesafb.c 2011-03-27 14:31:47.000000000 -0400 |
12405 |
++++ linux-2.6.32.39/drivers/video/vesafb.c 2011-04-17 15:56:46.000000000 -0400 |
12406 |
@@ -9,6 +9,7 @@ |
12407 |
*/ |
12408 |
|
12409 |
@@ -31891,9 +30718,9 @@ diff -urNp linux-2.6.32.38/drivers/video/vesafb.c linux-2.6.32.38/drivers/video/ |
12410 |
if (info->screen_base) |
12411 |
iounmap(info->screen_base); |
12412 |
framebuffer_release(info); |
12413 |
-diff -urNp linux-2.6.32.38/drivers/xen/sys-hypervisor.c linux-2.6.32.38/drivers/xen/sys-hypervisor.c |
12414 |
---- linux-2.6.32.38/drivers/xen/sys-hypervisor.c 2011-03-27 14:31:47.000000000 -0400 |
12415 |
-+++ linux-2.6.32.38/drivers/xen/sys-hypervisor.c 2011-04-17 15:56:46.000000000 -0400 |
12416 |
+diff -urNp linux-2.6.32.39/drivers/xen/sys-hypervisor.c linux-2.6.32.39/drivers/xen/sys-hypervisor.c |
12417 |
+--- linux-2.6.32.39/drivers/xen/sys-hypervisor.c 2011-03-27 14:31:47.000000000 -0400 |
12418 |
++++ linux-2.6.32.39/drivers/xen/sys-hypervisor.c 2011-04-17 15:56:46.000000000 -0400 |
12419 |
@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko |
12420 |
return 0; |
12421 |
} |
12422 |
@@ -31903,9 +30730,9 @@ diff -urNp linux-2.6.32.38/drivers/xen/sys-hypervisor.c linux-2.6.32.38/drivers/ |
12423 |
.show = hyp_sysfs_show, |
12424 |
.store = hyp_sysfs_store, |
12425 |
}; |
12426 |
-diff -urNp linux-2.6.32.38/fs/9p/vfs_inode.c linux-2.6.32.38/fs/9p/vfs_inode.c |
12427 |
---- linux-2.6.32.38/fs/9p/vfs_inode.c 2011-03-27 14:31:47.000000000 -0400 |
12428 |
-+++ linux-2.6.32.38/fs/9p/vfs_inode.c 2011-04-17 15:56:46.000000000 -0400 |
12429 |
+diff -urNp linux-2.6.32.39/fs/9p/vfs_inode.c linux-2.6.32.39/fs/9p/vfs_inode.c |
12430 |
+--- linux-2.6.32.39/fs/9p/vfs_inode.c 2011-03-27 14:31:47.000000000 -0400 |
12431 |
++++ linux-2.6.32.39/fs/9p/vfs_inode.c 2011-04-17 15:56:46.000000000 -0400 |
12432 |
@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct |
12433 |
static void |
12434 |
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) |
12435 |
@@ -31915,9 +30742,9 @@ diff -urNp linux-2.6.32.38/fs/9p/vfs_inode.c linux-2.6.32.38/fs/9p/vfs_inode.c |
12436 |
|
12437 |
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, |
12438 |
IS_ERR(s) ? "<error>" : s); |
12439 |
-diff -urNp linux-2.6.32.38/fs/aio.c linux-2.6.32.38/fs/aio.c |
12440 |
---- linux-2.6.32.38/fs/aio.c 2011-03-27 14:31:47.000000000 -0400 |
12441 |
-+++ linux-2.6.32.38/fs/aio.c 2011-04-17 15:56:46.000000000 -0400 |
12442 |
+diff -urNp linux-2.6.32.39/fs/aio.c linux-2.6.32.39/fs/aio.c |
12443 |
+--- linux-2.6.32.39/fs/aio.c 2011-03-27 14:31:47.000000000 -0400 |
12444 |
++++ linux-2.6.32.39/fs/aio.c 2011-04-17 15:56:46.000000000 -0400 |
12445 |
@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx |
12446 |
size += sizeof(struct io_event) * nr_events; |
12447 |
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; |
12448 |
@@ -31927,9 +30754,9 @@ diff -urNp linux-2.6.32.38/fs/aio.c linux-2.6.32.38/fs/aio.c |
12449 |
return -EINVAL; |
12450 |
|
12451 |
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); |
12452 |
-diff -urNp linux-2.6.32.38/fs/attr.c linux-2.6.32.38/fs/attr.c |
12453 |
---- linux-2.6.32.38/fs/attr.c 2011-03-27 14:31:47.000000000 -0400 |
12454 |
-+++ linux-2.6.32.38/fs/attr.c 2011-04-17 15:56:46.000000000 -0400 |
12455 |
+diff -urNp linux-2.6.32.39/fs/attr.c linux-2.6.32.39/fs/attr.c |
12456 |
+--- linux-2.6.32.39/fs/attr.c 2011-03-27 14:31:47.000000000 -0400 |
12457 |
++++ linux-2.6.32.39/fs/attr.c 2011-04-17 15:56:46.000000000 -0400 |
12458 |
@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode |
12459 |
unsigned long limit; |
12460 |
|
12461 |
@@ -31938,9 +30765,9 @@ diff -urNp linux-2.6.32.38/fs/attr.c linux-2.6.32.38/fs/attr.c |
12462 |
if (limit != RLIM_INFINITY && offset > limit) |
12463 |
goto out_sig; |
12464 |
if (offset > inode->i_sb->s_maxbytes) |
12465 |
-diff -urNp linux-2.6.32.38/fs/autofs/root.c linux-2.6.32.38/fs/autofs/root.c |
12466 |
---- linux-2.6.32.38/fs/autofs/root.c 2011-03-27 14:31:47.000000000 -0400 |
12467 |
-+++ linux-2.6.32.38/fs/autofs/root.c 2011-04-17 15:56:46.000000000 -0400 |
12468 |
+diff -urNp linux-2.6.32.39/fs/autofs/root.c linux-2.6.32.39/fs/autofs/root.c |
12469 |
+--- linux-2.6.32.39/fs/autofs/root.c 2011-03-27 14:31:47.000000000 -0400 |
12470 |
++++ linux-2.6.32.39/fs/autofs/root.c 2011-04-17 15:56:46.000000000 -0400 |
12471 |
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in |
12472 |
set_bit(n,sbi->symlink_bitmap); |
12473 |
sl = &sbi->symlink[n]; |
12474 |
@@ -31951,9 +30778,9 @@ diff -urNp linux-2.6.32.38/fs/autofs/root.c linux-2.6.32.38/fs/autofs/root.c |
12475 |
if (!sl->data) { |
12476 |
clear_bit(n,sbi->symlink_bitmap); |
12477 |
unlock_kernel(); |
12478 |
-diff -urNp linux-2.6.32.38/fs/autofs4/symlink.c linux-2.6.32.38/fs/autofs4/symlink.c |
12479 |
---- linux-2.6.32.38/fs/autofs4/symlink.c 2011-03-27 14:31:47.000000000 -0400 |
12480 |
-+++ linux-2.6.32.38/fs/autofs4/symlink.c 2011-04-17 15:56:46.000000000 -0400 |
12481 |
+diff -urNp linux-2.6.32.39/fs/autofs4/symlink.c linux-2.6.32.39/fs/autofs4/symlink.c |
12482 |
+--- linux-2.6.32.39/fs/autofs4/symlink.c 2011-03-27 14:31:47.000000000 -0400 |
12483 |
++++ linux-2.6.32.39/fs/autofs4/symlink.c 2011-04-17 15:56:46.000000000 -0400 |
12484 |
@@ -15,7 +15,7 @@ |
12485 |
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) |
12486 |
{ |
12487 |
@@ -31963,9 +30790,9 @@ diff -urNp linux-2.6.32.38/fs/autofs4/symlink.c linux-2.6.32.38/fs/autofs4/symli |
12488 |
return NULL; |
12489 |
} |
12490 |
|
12491 |
-diff -urNp linux-2.6.32.38/fs/befs/linuxvfs.c linux-2.6.32.38/fs/befs/linuxvfs.c |
12492 |
---- linux-2.6.32.38/fs/befs/linuxvfs.c 2011-03-27 14:31:47.000000000 -0400 |
12493 |
-+++ linux-2.6.32.38/fs/befs/linuxvfs.c 2011-04-17 15:56:46.000000000 -0400 |
12494 |
+diff -urNp linux-2.6.32.39/fs/befs/linuxvfs.c linux-2.6.32.39/fs/befs/linuxvfs.c |
12495 |
+--- linux-2.6.32.39/fs/befs/linuxvfs.c 2011-03-27 14:31:47.000000000 -0400 |
12496 |
++++ linux-2.6.32.39/fs/befs/linuxvfs.c 2011-04-17 15:56:46.000000000 -0400 |
12497 |
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry |
12498 |
{ |
12499 |
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); |
12500 |
@@ -31975,9 +30802,9 @@ diff -urNp linux-2.6.32.38/fs/befs/linuxvfs.c linux-2.6.32.38/fs/befs/linuxvfs.c |
12501 |
if (!IS_ERR(link)) |
12502 |
kfree(link); |
12503 |
} |
12504 |
-diff -urNp linux-2.6.32.38/fs/binfmt_aout.c linux-2.6.32.38/fs/binfmt_aout.c |
12505 |
---- linux-2.6.32.38/fs/binfmt_aout.c 2011-03-27 14:31:47.000000000 -0400 |
12506 |
-+++ linux-2.6.32.38/fs/binfmt_aout.c 2011-04-17 15:56:46.000000000 -0400 |
12507 |
+diff -urNp linux-2.6.32.39/fs/binfmt_aout.c linux-2.6.32.39/fs/binfmt_aout.c |
12508 |
+--- linux-2.6.32.39/fs/binfmt_aout.c 2011-03-27 14:31:47.000000000 -0400 |
12509 |
++++ linux-2.6.32.39/fs/binfmt_aout.c 2011-04-17 15:56:46.000000000 -0400 |
12510 |
@@ -16,6 +16,7 @@ |
12511 |
#include <linux/string.h> |
12512 |
#include <linux/fs.h> |
12513 |
@@ -32065,9 +30892,9 @@ diff -urNp linux-2.6.32.38/fs/binfmt_aout.c linux-2.6.32.38/fs/binfmt_aout.c |
12514 |
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, |
12515 |
fd_offset + ex.a_text); |
12516 |
up_write(¤t->mm->mmap_sem); |
12517 |
-diff -urNp linux-2.6.32.38/fs/binfmt_elf.c linux-2.6.32.38/fs/binfmt_elf.c |
12518 |
---- linux-2.6.32.38/fs/binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 |
12519 |
-+++ linux-2.6.32.38/fs/binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400 |
12520 |
+diff -urNp linux-2.6.32.39/fs/binfmt_elf.c linux-2.6.32.39/fs/binfmt_elf.c |
12521 |
+--- linux-2.6.32.39/fs/binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 |
12522 |
++++ linux-2.6.32.39/fs/binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400 |
12523 |
@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str |
12524 |
#define elf_core_dump NULL |
12525 |
#endif |
12526 |
@@ -32739,9 +31566,9 @@ diff -urNp linux-2.6.32.38/fs/binfmt_elf.c linux-2.6.32.38/fs/binfmt_elf.c |
12527 |
static int __init init_elf_binfmt(void) |
12528 |
{ |
12529 |
return register_binfmt(&elf_format); |
12530 |
-diff -urNp linux-2.6.32.38/fs/binfmt_flat.c linux-2.6.32.38/fs/binfmt_flat.c |
12531 |
---- linux-2.6.32.38/fs/binfmt_flat.c 2011-03-27 14:31:47.000000000 -0400 |
12532 |
-+++ linux-2.6.32.38/fs/binfmt_flat.c 2011-04-17 15:56:46.000000000 -0400 |
12533 |
+diff -urNp linux-2.6.32.39/fs/binfmt_flat.c linux-2.6.32.39/fs/binfmt_flat.c |
12534 |
+--- linux-2.6.32.39/fs/binfmt_flat.c 2011-03-27 14:31:47.000000000 -0400 |
12535 |
++++ linux-2.6.32.39/fs/binfmt_flat.c 2011-04-17 15:56:46.000000000 -0400 |
12536 |
@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b |
12537 |
realdatastart = (unsigned long) -ENOMEM; |
12538 |
printk("Unable to allocate RAM for process data, errno %d\n", |
12539 |
@@ -32774,21 +31601,9 @@ diff -urNp linux-2.6.32.38/fs/binfmt_flat.c linux-2.6.32.38/fs/binfmt_flat.c |
12540 |
ret = result; |
12541 |
goto err; |
12542 |
} |
12543 |
-diff -urNp linux-2.6.32.38/fs/binfmt_misc.c linux-2.6.32.38/fs/binfmt_misc.c |
12544 |
---- linux-2.6.32.38/fs/binfmt_misc.c 2011-03-27 14:31:47.000000000 -0400 |
12545 |
-+++ linux-2.6.32.38/fs/binfmt_misc.c 2011-04-17 15:56:46.000000000 -0400 |
12546 |
-@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl |
12547 |
- static struct tree_descr bm_files[] = { |
12548 |
- [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, |
12549 |
- [3] = {"register", &bm_register_operations, S_IWUSR}, |
12550 |
-- /* last one */ {""} |
12551 |
-+ /* last one */ {"", NULL, 0} |
12552 |
- }; |
12553 |
- int err = simple_fill_super(sb, 0x42494e4d, bm_files); |
12554 |
- if (!err) |
12555 |
-diff -urNp linux-2.6.32.38/fs/bio.c linux-2.6.32.38/fs/bio.c |
12556 |
---- linux-2.6.32.38/fs/bio.c 2011-03-27 14:31:47.000000000 -0400 |
12557 |
-+++ linux-2.6.32.38/fs/bio.c 2011-04-17 15:56:46.000000000 -0400 |
12558 |
+diff -urNp linux-2.6.32.39/fs/bio.c linux-2.6.32.39/fs/bio.c |
12559 |
+--- linux-2.6.32.39/fs/bio.c 2011-03-27 14:31:47.000000000 -0400 |
12560 |
++++ linux-2.6.32.39/fs/bio.c 2011-04-17 15:56:46.000000000 -0400 |
12561 |
@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr |
12562 |
|
12563 |
i = 0; |
12564 |
@@ -32807,9 +31622,9 @@ diff -urNp linux-2.6.32.38/fs/bio.c linux-2.6.32.38/fs/bio.c |
12565 |
|
12566 |
__bio_for_each_segment(bvec, bio, i, 0) { |
12567 |
char *addr = page_address(bvec->bv_page); |
12568 |
-diff -urNp linux-2.6.32.38/fs/block_dev.c linux-2.6.32.38/fs/block_dev.c |
12569 |
---- linux-2.6.32.38/fs/block_dev.c 2011-03-27 14:31:47.000000000 -0400 |
12570 |
-+++ linux-2.6.32.38/fs/block_dev.c 2011-04-17 15:56:46.000000000 -0400 |
12571 |
+diff -urNp linux-2.6.32.39/fs/block_dev.c linux-2.6.32.39/fs/block_dev.c |
12572 |
+--- linux-2.6.32.39/fs/block_dev.c 2011-03-27 14:31:47.000000000 -0400 |
12573 |
++++ linux-2.6.32.39/fs/block_dev.c 2011-04-17 15:56:46.000000000 -0400 |
12574 |
@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, |
12575 |
else if (bdev->bd_contains == bdev) |
12576 |
res = 0; /* is a whole device which isn't held */ |
12577 |
@@ -32819,9 +31634,9 @@ diff -urNp linux-2.6.32.38/fs/block_dev.c linux-2.6.32.38/fs/block_dev.c |
12578 |
res = 0; /* is a partition of a device that is being partitioned */ |
12579 |
else if (bdev->bd_contains->bd_holder != NULL) |
12580 |
res = -EBUSY; /* is a partition of a held device */ |
12581 |
-diff -urNp linux-2.6.32.38/fs/btrfs/ctree.c linux-2.6.32.38/fs/btrfs/ctree.c |
12582 |
---- linux-2.6.32.38/fs/btrfs/ctree.c 2011-03-27 14:31:47.000000000 -0400 |
12583 |
-+++ linux-2.6.32.38/fs/btrfs/ctree.c 2011-04-17 15:56:46.000000000 -0400 |
12584 |
+diff -urNp linux-2.6.32.39/fs/btrfs/ctree.c linux-2.6.32.39/fs/btrfs/ctree.c |
12585 |
+--- linux-2.6.32.39/fs/btrfs/ctree.c 2011-03-27 14:31:47.000000000 -0400 |
12586 |
++++ linux-2.6.32.39/fs/btrfs/ctree.c 2011-04-17 15:56:46.000000000 -0400 |
12587 |
@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st |
12588 |
free_extent_buffer(buf); |
12589 |
add_root_to_dirty_list(root); |
12590 |
@@ -32846,9 +31661,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/ctree.c linux-2.6.32.38/fs/btrfs/ctree.c |
12591 |
btrfs_cpu_key_to_disk(&disk_key, cpu_key); |
12592 |
ret = fixup_low_keys(trans, root, path, &disk_key, 1); |
12593 |
} |
12594 |
-diff -urNp linux-2.6.32.38/fs/btrfs/disk-io.c linux-2.6.32.38/fs/btrfs/disk-io.c |
12595 |
---- linux-2.6.32.38/fs/btrfs/disk-io.c 2011-04-17 17:00:52.000000000 -0400 |
12596 |
-+++ linux-2.6.32.38/fs/btrfs/disk-io.c 2011-04-17 17:03:11.000000000 -0400 |
12597 |
+diff -urNp linux-2.6.32.39/fs/btrfs/disk-io.c linux-2.6.32.39/fs/btrfs/disk-io.c |
12598 |
+--- linux-2.6.32.39/fs/btrfs/disk-io.c 2011-04-17 17:00:52.000000000 -0400 |
12599 |
++++ linux-2.6.32.39/fs/btrfs/disk-io.c 2011-04-17 17:03:11.000000000 -0400 |
12600 |
@@ -39,7 +39,7 @@ |
12601 |
#include "tree-log.h" |
12602 |
#include "free-space-cache.h" |
12603 |
@@ -32867,9 +31682,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/disk-io.c linux-2.6.32.38/fs/btrfs/disk-io.c |
12604 |
.write_cache_pages_lock_hook = btree_lock_page_hook, |
12605 |
.readpage_end_io_hook = btree_readpage_end_io_hook, |
12606 |
.submit_bio_hook = btree_submit_bio_hook, |
12607 |
-diff -urNp linux-2.6.32.38/fs/btrfs/extent_io.h linux-2.6.32.38/fs/btrfs/extent_io.h |
12608 |
---- linux-2.6.32.38/fs/btrfs/extent_io.h 2011-03-27 14:31:47.000000000 -0400 |
12609 |
-+++ linux-2.6.32.38/fs/btrfs/extent_io.h 2011-04-17 15:56:46.000000000 -0400 |
12610 |
+diff -urNp linux-2.6.32.39/fs/btrfs/extent_io.h linux-2.6.32.39/fs/btrfs/extent_io.h |
12611 |
+--- linux-2.6.32.39/fs/btrfs/extent_io.h 2011-03-27 14:31:47.000000000 -0400 |
12612 |
++++ linux-2.6.32.39/fs/btrfs/extent_io.h 2011-04-17 15:56:46.000000000 -0400 |
12613 |
@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s |
12614 |
struct bio *bio, int mirror_num, |
12615 |
unsigned long bio_flags); |
12616 |
@@ -32930,9 +31745,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/extent_io.h linux-2.6.32.38/fs/btrfs/extent_ |
12617 |
}; |
12618 |
|
12619 |
struct extent_state { |
12620 |
-diff -urNp linux-2.6.32.38/fs/btrfs/free-space-cache.c linux-2.6.32.38/fs/btrfs/free-space-cache.c |
12621 |
---- linux-2.6.32.38/fs/btrfs/free-space-cache.c 2011-03-27 14:31:47.000000000 -0400 |
12622 |
-+++ linux-2.6.32.38/fs/btrfs/free-space-cache.c 2011-04-17 15:56:46.000000000 -0400 |
12623 |
+diff -urNp linux-2.6.32.39/fs/btrfs/free-space-cache.c linux-2.6.32.39/fs/btrfs/free-space-cache.c |
12624 |
+--- linux-2.6.32.39/fs/btrfs/free-space-cache.c 2011-03-27 14:31:47.000000000 -0400 |
12625 |
++++ linux-2.6.32.39/fs/btrfs/free-space-cache.c 2011-04-17 15:56:46.000000000 -0400 |
12626 |
@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf |
12627 |
|
12628 |
while(1) { |
12629 |
@@ -32951,9 +31766,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/free-space-cache.c linux-2.6.32.38/fs/btrfs/ |
12630 |
|
12631 |
if (entry->bitmap && entry->bytes > bytes + empty_size) { |
12632 |
ret = btrfs_bitmap_cluster(block_group, entry, cluster, |
12633 |
-diff -urNp linux-2.6.32.38/fs/btrfs/inode.c linux-2.6.32.38/fs/btrfs/inode.c |
12634 |
---- linux-2.6.32.38/fs/btrfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
12635 |
-+++ linux-2.6.32.38/fs/btrfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
12636 |
+diff -urNp linux-2.6.32.39/fs/btrfs/inode.c linux-2.6.32.39/fs/btrfs/inode.c |
12637 |
+--- linux-2.6.32.39/fs/btrfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
12638 |
++++ linux-2.6.32.39/fs/btrfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
12639 |
@@ -63,7 +63,7 @@ static const struct inode_operations btr |
12640 |
static const struct address_space_operations btrfs_aops; |
12641 |
static const struct address_space_operations btrfs_symlink_aops; |
12642 |
@@ -32996,9 +31811,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/inode.c linux-2.6.32.38/fs/btrfs/inode.c |
12643 |
.fill_delalloc = run_delalloc_range, |
12644 |
.submit_bio_hook = btrfs_submit_bio_hook, |
12645 |
.merge_bio_hook = btrfs_merge_bio_hook, |
12646 |
-diff -urNp linux-2.6.32.38/fs/btrfs/relocation.c linux-2.6.32.38/fs/btrfs/relocation.c |
12647 |
---- linux-2.6.32.38/fs/btrfs/relocation.c 2011-03-27 14:31:47.000000000 -0400 |
12648 |
-+++ linux-2.6.32.38/fs/btrfs/relocation.c 2011-04-17 15:56:46.000000000 -0400 |
12649 |
+diff -urNp linux-2.6.32.39/fs/btrfs/relocation.c linux-2.6.32.39/fs/btrfs/relocation.c |
12650 |
+--- linux-2.6.32.39/fs/btrfs/relocation.c 2011-03-27 14:31:47.000000000 -0400 |
12651 |
++++ linux-2.6.32.39/fs/btrfs/relocation.c 2011-04-17 15:56:46.000000000 -0400 |
12652 |
@@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt |
12653 |
} |
12654 |
spin_unlock(&rc->reloc_root_tree.lock); |
12655 |
@@ -33008,9 +31823,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/relocation.c linux-2.6.32.38/fs/btrfs/reloca |
12656 |
|
12657 |
if (!del) { |
12658 |
spin_lock(&rc->reloc_root_tree.lock); |
12659 |
-diff -urNp linux-2.6.32.38/fs/btrfs/sysfs.c linux-2.6.32.38/fs/btrfs/sysfs.c |
12660 |
---- linux-2.6.32.38/fs/btrfs/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
12661 |
-+++ linux-2.6.32.38/fs/btrfs/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
12662 |
+diff -urNp linux-2.6.32.39/fs/btrfs/sysfs.c linux-2.6.32.39/fs/btrfs/sysfs.c |
12663 |
+--- linux-2.6.32.39/fs/btrfs/sysfs.c 2011-03-27 14:31:47.000000000 -0400 |
12664 |
++++ linux-2.6.32.39/fs/btrfs/sysfs.c 2011-04-17 15:56:46.000000000 -0400 |
12665 |
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko |
12666 |
complete(&root->kobj_unregister); |
12667 |
} |
12668 |
@@ -33026,9 +31841,9 @@ diff -urNp linux-2.6.32.38/fs/btrfs/sysfs.c linux-2.6.32.38/fs/btrfs/sysfs.c |
12669 |
.show = btrfs_root_attr_show, |
12670 |
.store = btrfs_root_attr_store, |
12671 |
}; |
12672 |
-diff -urNp linux-2.6.32.38/fs/buffer.c linux-2.6.32.38/fs/buffer.c |
12673 |
---- linux-2.6.32.38/fs/buffer.c 2011-03-27 14:31:47.000000000 -0400 |
12674 |
-+++ linux-2.6.32.38/fs/buffer.c 2011-04-17 15:56:46.000000000 -0400 |
12675 |
+diff -urNp linux-2.6.32.39/fs/buffer.c linux-2.6.32.39/fs/buffer.c |
12676 |
+--- linux-2.6.32.39/fs/buffer.c 2011-03-27 14:31:47.000000000 -0400 |
12677 |
++++ linux-2.6.32.39/fs/buffer.c 2011-04-17 15:56:46.000000000 -0400 |
12678 |
@@ -25,6 +25,7 @@ |
12679 |
#include <linux/percpu.h> |
12680 |
#include <linux/slab.h> |
12681 |
@@ -33037,9 +31852,9 @@ diff -urNp linux-2.6.32.38/fs/buffer.c linux-2.6.32.38/fs/buffer.c |
12682 |
#include <linux/blkdev.h> |
12683 |
#include <linux/file.h> |
12684 |
#include <linux/quotaops.h> |
12685 |
-diff -urNp linux-2.6.32.38/fs/cachefiles/bind.c linux-2.6.32.38/fs/cachefiles/bind.c |
12686 |
---- linux-2.6.32.38/fs/cachefiles/bind.c 2011-03-27 14:31:47.000000000 -0400 |
12687 |
-+++ linux-2.6.32.38/fs/cachefiles/bind.c 2011-04-17 15:56:46.000000000 -0400 |
12688 |
+diff -urNp linux-2.6.32.39/fs/cachefiles/bind.c linux-2.6.32.39/fs/cachefiles/bind.c |
12689 |
+--- linux-2.6.32.39/fs/cachefiles/bind.c 2011-03-27 14:31:47.000000000 -0400 |
12690 |
++++ linux-2.6.32.39/fs/cachefiles/bind.c 2011-04-17 15:56:46.000000000 -0400 |
12691 |
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef |
12692 |
args); |
12693 |
|
12694 |
@@ -33056,9 +31871,9 @@ diff -urNp linux-2.6.32.38/fs/cachefiles/bind.c linux-2.6.32.38/fs/cachefiles/bi |
12695 |
cache->bcull_percent < cache->brun_percent && |
12696 |
cache->brun_percent < 100); |
12697 |
|
12698 |
-diff -urNp linux-2.6.32.38/fs/cachefiles/daemon.c linux-2.6.32.38/fs/cachefiles/daemon.c |
12699 |
---- linux-2.6.32.38/fs/cachefiles/daemon.c 2011-03-27 14:31:47.000000000 -0400 |
12700 |
-+++ linux-2.6.32.38/fs/cachefiles/daemon.c 2011-04-17 15:56:46.000000000 -0400 |
12701 |
+diff -urNp linux-2.6.32.39/fs/cachefiles/daemon.c linux-2.6.32.39/fs/cachefiles/daemon.c |
12702 |
+--- linux-2.6.32.39/fs/cachefiles/daemon.c 2011-03-27 14:31:47.000000000 -0400 |
12703 |
++++ linux-2.6.32.39/fs/cachefiles/daemon.c 2011-04-17 15:56:46.000000000 -0400 |
12704 |
@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s |
12705 |
if (test_bit(CACHEFILES_DEAD, &cache->flags)) |
12706 |
return -EIO; |
12707 |
@@ -33086,9 +31901,9 @@ diff -urNp linux-2.6.32.38/fs/cachefiles/daemon.c linux-2.6.32.38/fs/cachefiles/ |
12708 |
return cachefiles_daemon_range_error(cache, args); |
12709 |
|
12710 |
cache->bstop_percent = bstop; |
12711 |
-diff -urNp linux-2.6.32.38/fs/cachefiles/rdwr.c linux-2.6.32.38/fs/cachefiles/rdwr.c |
12712 |
---- linux-2.6.32.38/fs/cachefiles/rdwr.c 2011-03-27 14:31:47.000000000 -0400 |
12713 |
-+++ linux-2.6.32.38/fs/cachefiles/rdwr.c 2011-04-17 15:56:46.000000000 -0400 |
12714 |
+diff -urNp linux-2.6.32.39/fs/cachefiles/rdwr.c linux-2.6.32.39/fs/cachefiles/rdwr.c |
12715 |
+--- linux-2.6.32.39/fs/cachefiles/rdwr.c 2011-03-27 14:31:47.000000000 -0400 |
12716 |
++++ linux-2.6.32.39/fs/cachefiles/rdwr.c 2011-04-17 15:56:46.000000000 -0400 |
12717 |
@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache |
12718 |
old_fs = get_fs(); |
12719 |
set_fs(KERNEL_DS); |
12720 |
@@ -33098,21 +31913,9 @@ diff -urNp linux-2.6.32.38/fs/cachefiles/rdwr.c linux-2.6.32.38/fs/cachefiles/rd |
12721 |
set_fs(old_fs); |
12722 |
kunmap(page); |
12723 |
if (ret != len) |
12724 |
-diff -urNp linux-2.6.32.38/fs/cifs/cifs_uniupr.h linux-2.6.32.38/fs/cifs/cifs_uniupr.h |
12725 |
---- linux-2.6.32.38/fs/cifs/cifs_uniupr.h 2011-03-27 14:31:47.000000000 -0400 |
12726 |
-+++ linux-2.6.32.38/fs/cifs/cifs_uniupr.h 2011-04-17 15:56:46.000000000 -0400 |
12727 |
-@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa |
12728 |
- {0x0490, 0x04cc, UniCaseRangeU0490}, |
12729 |
- {0x1e00, 0x1ffc, UniCaseRangeU1e00}, |
12730 |
- {0xff40, 0xff5a, UniCaseRangeUff40}, |
12731 |
-- {0} |
12732 |
-+ {0, 0, NULL} |
12733 |
- }; |
12734 |
- #endif |
12735 |
- |
12736 |
-diff -urNp linux-2.6.32.38/fs/cifs/link.c linux-2.6.32.38/fs/cifs/link.c |
12737 |
---- linux-2.6.32.38/fs/cifs/link.c 2011-03-27 14:31:47.000000000 -0400 |
12738 |
-+++ linux-2.6.32.38/fs/cifs/link.c 2011-04-17 15:56:46.000000000 -0400 |
12739 |
+diff -urNp linux-2.6.32.39/fs/cifs/link.c linux-2.6.32.39/fs/cifs/link.c |
12740 |
+--- linux-2.6.32.39/fs/cifs/link.c 2011-03-27 14:31:47.000000000 -0400 |
12741 |
++++ linux-2.6.32.39/fs/cifs/link.c 2011-04-17 15:56:46.000000000 -0400 |
12742 |
@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct |
12743 |
|
12744 |
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) |
12745 |
@@ -33122,9 +31925,9 @@ diff -urNp linux-2.6.32.38/fs/cifs/link.c linux-2.6.32.38/fs/cifs/link.c |
12746 |
if (!IS_ERR(p)) |
12747 |
kfree(p); |
12748 |
} |
12749 |
-diff -urNp linux-2.6.32.38/fs/compat_binfmt_elf.c linux-2.6.32.38/fs/compat_binfmt_elf.c |
12750 |
---- linux-2.6.32.38/fs/compat_binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 |
12751 |
-+++ linux-2.6.32.38/fs/compat_binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400 |
12752 |
+diff -urNp linux-2.6.32.39/fs/compat_binfmt_elf.c linux-2.6.32.39/fs/compat_binfmt_elf.c |
12753 |
+--- linux-2.6.32.39/fs/compat_binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 |
12754 |
++++ linux-2.6.32.39/fs/compat_binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400 |
12755 |
@@ -29,10 +29,12 @@ |
12756 |
#undef elfhdr |
12757 |
#undef elf_phdr |
12758 |
@@ -33138,9 +31941,9 @@ diff -urNp linux-2.6.32.38/fs/compat_binfmt_elf.c linux-2.6.32.38/fs/compat_binf |
12759 |
#define elf_addr_t Elf32_Addr |
12760 |
|
12761 |
/* |
12762 |
-diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.32.38/fs/compat.c |
12763 |
---- linux-2.6.32.38/fs/compat.c 2011-04-17 17:00:52.000000000 -0400 |
12764 |
-+++ linux-2.6.32.38/fs/compat.c 2011-04-17 15:56:46.000000000 -0400 |
12765 |
+diff -urNp linux-2.6.32.39/fs/compat.c linux-2.6.32.39/fs/compat.c |
12766 |
+--- linux-2.6.32.39/fs/compat.c 2011-04-17 17:00:52.000000000 -0400 |
12767 |
++++ linux-2.6.32.39/fs/compat.c 2011-04-23 13:29:24.000000000 -0400 |
12768 |
@@ -830,6 +830,7 @@ struct compat_old_linux_dirent { |
12769 |
|
12770 |
struct compat_readdir_callback { |
12771 |
@@ -33231,15 +32034,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.32.38/fs/compat.c |
12772 |
goto out; |
12773 |
if (!file->f_op) |
12774 |
goto out; |
12775 |
-@@ -1422,6 +1440,7 @@ static int compat_copy_strings(int argc, |
12776 |
- |
12777 |
- page = get_arg_page(bprm, pos, 1); |
12778 |
- if (!page) { |
12779 |
-+ /* We've exceed the stack rlimit. */ |
12780 |
- ret = -E2BIG; |
12781 |
- goto out; |
12782 |
- } |
12783 |
-@@ -1463,6 +1482,11 @@ int compat_do_execve(char * filename, |
12784 |
+@@ -1463,6 +1481,11 @@ int compat_do_execve(char * filename, |
12785 |
compat_uptr_t __user *envp, |
12786 |
struct pt_regs * regs) |
12787 |
{ |
12788 |
@@ -33251,7 +32046,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.32.38/fs/compat.c |
12789 |
struct linux_binprm *bprm; |
12790 |
struct file *file; |
12791 |
struct files_struct *displaced; |
12792 |
-@@ -1499,6 +1523,19 @@ int compat_do_execve(char * filename, |
12793 |
+@@ -1499,6 +1522,19 @@ int compat_do_execve(char * filename, |
12794 |
bprm->filename = filename; |
12795 |
bprm->interp = filename; |
12796 |
|
12797 |
@@ -33271,7 +32066,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.32.38/fs/compat.c |
12798 |
retval = bprm_mm_init(bprm); |
12799 |
if (retval) |
12800 |
goto out_file; |
12801 |
-@@ -1528,9 +1565,40 @@ int compat_do_execve(char * filename, |
12802 |
+@@ -1528,9 +1564,40 @@ int compat_do_execve(char * filename, |
12803 |
if (retval < 0) |
12804 |
goto out; |
12805 |
|
12806 |
@@ -33313,7 +32108,7 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.32.38/fs/compat.c |
12807 |
|
12808 |
/* execve succeeded */ |
12809 |
current->fs->in_exec = 0; |
12810 |
-@@ -1541,6 +1609,14 @@ int compat_do_execve(char * filename, |
12811 |
+@@ -1541,6 +1608,14 @@ int compat_do_execve(char * filename, |
12812 |
put_files_struct(displaced); |
12813 |
return retval; |
12814 |
|
12815 |
@@ -33328,9 +32123,9 @@ diff -urNp linux-2.6.32.38/fs/compat.c linux-2.6.32.38/fs/compat.c |
12816 |
out: |
12817 |
if (bprm->mm) { |
12818 |
acct_arg_size(bprm, 0); |
12819 |
-diff -urNp linux-2.6.32.38/fs/compat_ioctl.c linux-2.6.32.38/fs/compat_ioctl.c |
12820 |
---- linux-2.6.32.38/fs/compat_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
12821 |
-+++ linux-2.6.32.38/fs/compat_ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
12822 |
+diff -urNp linux-2.6.32.39/fs/compat_ioctl.c linux-2.6.32.39/fs/compat_ioctl.c |
12823 |
+--- linux-2.6.32.39/fs/compat_ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
12824 |
++++ linux-2.6.32.39/fs/compat_ioctl.c 2011-04-23 12:56:11.000000000 -0400 |
12825 |
@@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi |
12826 |
up = (struct compat_video_spu_palette __user *) arg; |
12827 |
err = get_user(palp, &up->palette); |
12828 |
@@ -33340,29 +32135,19 @@ diff -urNp linux-2.6.32.38/fs/compat_ioctl.c linux-2.6.32.38/fs/compat_ioctl.c |
12829 |
|
12830 |
up_native = compat_alloc_user_space(sizeof(struct video_spu_palette)); |
12831 |
err = put_user(compat_ptr(palp), &up_native->palette); |
12832 |
-@@ -1827,15 +1829,15 @@ struct ioctl_trans { |
12833 |
- }; |
12834 |
+diff -urNp linux-2.6.32.39/fs/dcache.c linux-2.6.32.39/fs/dcache.c |
12835 |
+--- linux-2.6.32.39/fs/dcache.c 2011-03-27 14:31:47.000000000 -0400 |
12836 |
++++ linux-2.6.32.39/fs/dcache.c 2011-04-23 13:32:21.000000000 -0400 |
12837 |
+@@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock); |
12838 |
|
12839 |
- #define HANDLE_IOCTL(cmd,handler) \ |
12840 |
-- { (cmd), (ioctl_trans_handler_t)(handler) }, |
12841 |
-+ { (cmd), (ioctl_trans_handler_t)(handler), NULL }, |
12842 |
+ static struct kmem_cache *dentry_cache __read_mostly; |
12843 |
|
12844 |
- /* pointer to compatible structure or no argument */ |
12845 |
- #define COMPATIBLE_IOCTL(cmd) \ |
12846 |
-- { (cmd), do_ioctl32_pointer }, |
12847 |
-+ { (cmd), do_ioctl32_pointer, NULL }, |
12848 |
- |
12849 |
- /* argument is an unsigned long integer, not a pointer */ |
12850 |
- #define ULONG_IOCTL(cmd) \ |
12851 |
-- { (cmd), (ioctl_trans_handler_t)sys_ioctl }, |
12852 |
-+ { (cmd), (ioctl_trans_handler_t)sys_ioctl, NULL }, |
12853 |
- |
12854 |
- /* ioctl should not be warned about even if it's not implemented. |
12855 |
- Valid reasons to use this: |
12856 |
-diff -urNp linux-2.6.32.38/fs/dcache.c linux-2.6.32.38/fs/dcache.c |
12857 |
---- linux-2.6.32.38/fs/dcache.c 2011-03-27 14:31:47.000000000 -0400 |
12858 |
-+++ linux-2.6.32.38/fs/dcache.c 2011-04-17 15:56:46.000000000 -0400 |
12859 |
-@@ -2319,7 +2319,7 @@ void __init vfs_caches_init(unsigned lon |
12860 |
+-#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname)) |
12861 |
+- |
12862 |
+ /* |
12863 |
+ * This is the single most critical data structure when it comes |
12864 |
+ * to the dcache: the hashtable for lookups. Somebody should try |
12865 |
+@@ -2319,7 +2317,7 @@ void __init vfs_caches_init(unsigned lon |
12866 |
mempages -= reserve; |
12867 |
|
12868 |
names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, |
12869 |
@@ -33371,21 +32156,9 @@ diff -urNp linux-2.6.32.38/fs/dcache.c linux-2.6.32.38/fs/dcache.c |
12870 |
|
12871 |
dcache_init(); |
12872 |
inode_init(); |
12873 |
-diff -urNp linux-2.6.32.38/fs/debugfs/inode.c linux-2.6.32.38/fs/debugfs/inode.c |
12874 |
---- linux-2.6.32.38/fs/debugfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
12875 |
-+++ linux-2.6.32.38/fs/debugfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
12876 |
-@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc |
12877 |
- |
12878 |
- static int debug_fill_super(struct super_block *sb, void *data, int silent) |
12879 |
- { |
12880 |
-- static struct tree_descr debug_files[] = {{""}}; |
12881 |
-+ static struct tree_descr debug_files[] = {{"", NULL, 0}}; |
12882 |
- |
12883 |
- return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); |
12884 |
- } |
12885 |
-diff -urNp linux-2.6.32.38/fs/dlm/lockspace.c linux-2.6.32.38/fs/dlm/lockspace.c |
12886 |
---- linux-2.6.32.38/fs/dlm/lockspace.c 2011-03-27 14:31:47.000000000 -0400 |
12887 |
-+++ linux-2.6.32.38/fs/dlm/lockspace.c 2011-04-17 15:56:46.000000000 -0400 |
12888 |
+diff -urNp linux-2.6.32.39/fs/dlm/lockspace.c linux-2.6.32.39/fs/dlm/lockspace.c |
12889 |
+--- linux-2.6.32.39/fs/dlm/lockspace.c 2011-03-27 14:31:47.000000000 -0400 |
12890 |
++++ linux-2.6.32.39/fs/dlm/lockspace.c 2011-04-17 15:56:46.000000000 -0400 |
12891 |
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc |
12892 |
kfree(ls); |
12893 |
} |
12894 |
@@ -33395,9 +32168,9 @@ diff -urNp linux-2.6.32.38/fs/dlm/lockspace.c linux-2.6.32.38/fs/dlm/lockspace.c |
12895 |
.show = dlm_attr_show, |
12896 |
.store = dlm_attr_store, |
12897 |
}; |
12898 |
-diff -urNp linux-2.6.32.38/fs/ecryptfs/inode.c linux-2.6.32.38/fs/ecryptfs/inode.c |
12899 |
---- linux-2.6.32.38/fs/ecryptfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
12900 |
-+++ linux-2.6.32.38/fs/ecryptfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
12901 |
+diff -urNp linux-2.6.32.39/fs/ecryptfs/inode.c linux-2.6.32.39/fs/ecryptfs/inode.c |
12902 |
+--- linux-2.6.32.39/fs/ecryptfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
12903 |
++++ linux-2.6.32.39/fs/ecryptfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
12904 |
@@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc |
12905 |
old_fs = get_fs(); |
12906 |
set_fs(get_ds()); |
12907 |
@@ -33416,9 +32189,9 @@ diff -urNp linux-2.6.32.38/fs/ecryptfs/inode.c linux-2.6.32.38/fs/ecryptfs/inode |
12908 |
set_fs(old_fs); |
12909 |
if (rc < 0) |
12910 |
goto out_free; |
12911 |
-diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.32.38/fs/exec.c |
12912 |
---- linux-2.6.32.38/fs/exec.c 2011-04-17 17:00:52.000000000 -0400 |
12913 |
-+++ linux-2.6.32.38/fs/exec.c 2011-04-17 17:07:23.000000000 -0400 |
12914 |
+diff -urNp linux-2.6.32.39/fs/exec.c linux-2.6.32.39/fs/exec.c |
12915 |
+--- linux-2.6.32.39/fs/exec.c 2011-04-17 17:00:52.000000000 -0400 |
12916 |
++++ linux-2.6.32.39/fs/exec.c 2011-04-23 13:35:12.000000000 -0400 |
12917 |
@@ -56,12 +56,24 @@ |
12918 |
#include <linux/fsnotify.h> |
12919 |
#include <linux/fs_struct.h> |
12920 |
@@ -33694,7 +32467,7 @@ diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.32.38/fs/exec.c |
12921 |
|
12922 |
/* execve succeeded */ |
12923 |
current->fs->in_exec = 0; |
12924 |
-@@ -1429,10 +1511,18 @@ int do_execve(char * filename, |
12925 |
+@@ -1429,6 +1511,14 @@ int do_execve(char * filename, |
12926 |
put_files_struct(displaced); |
12927 |
return retval; |
12928 |
|
12929 |
@@ -33709,11 +32482,6 @@ diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.32.38/fs/exec.c |
12930 |
out: |
12931 |
if (bprm->mm) { |
12932 |
acct_arg_size(bprm, 0); |
12933 |
-- mmput(bprm->mm); |
12934 |
-+ mmput (bprm->mm); |
12935 |
- } |
12936 |
- |
12937 |
- out_file: |
12938 |
@@ -1594,6 +1684,209 @@ out: |
12939 |
return ispipe; |
12940 |
} |
12941 |
@@ -33966,9 +32734,9 @@ diff -urNp linux-2.6.32.38/fs/exec.c linux-2.6.32.38/fs/exec.c |
12942 |
/* |
12943 |
* lock_kernel() because format_corename() is controlled by sysctl, which |
12944 |
* uses lock_kernel() |
12945 |
-diff -urNp linux-2.6.32.38/fs/ext2/balloc.c linux-2.6.32.38/fs/ext2/balloc.c |
12946 |
---- linux-2.6.32.38/fs/ext2/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
12947 |
-+++ linux-2.6.32.38/fs/ext2/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
12948 |
+diff -urNp linux-2.6.32.39/fs/ext2/balloc.c linux-2.6.32.39/fs/ext2/balloc.c |
12949 |
+--- linux-2.6.32.39/fs/ext2/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
12950 |
++++ linux-2.6.32.39/fs/ext2/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
12951 |
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e |
12952 |
|
12953 |
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
12954 |
@@ -33978,23 +32746,9 @@ diff -urNp linux-2.6.32.38/fs/ext2/balloc.c linux-2.6.32.38/fs/ext2/balloc.c |
12955 |
sbi->s_resuid != current_fsuid() && |
12956 |
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
12957 |
return 0; |
12958 |
-diff -urNp linux-2.6.32.38/fs/ext2/xattr.c linux-2.6.32.38/fs/ext2/xattr.c |
12959 |
---- linux-2.6.32.38/fs/ext2/xattr.c 2011-03-27 14:31:47.000000000 -0400 |
12960 |
-+++ linux-2.6.32.38/fs/ext2/xattr.c 2011-04-17 15:56:46.000000000 -0400 |
12961 |
-@@ -85,8 +85,8 @@ |
12962 |
- printk("\n"); \ |
12963 |
- } while (0) |
12964 |
- #else |
12965 |
--# define ea_idebug(f...) |
12966 |
--# define ea_bdebug(f...) |
12967 |
-+# define ea_idebug(inode, f...) do {} while (0) |
12968 |
-+# define ea_bdebug(bh, f...) do {} while (0) |
12969 |
- #endif |
12970 |
- |
12971 |
- static int ext2_xattr_set2(struct inode *, struct buffer_head *, |
12972 |
-diff -urNp linux-2.6.32.38/fs/ext3/balloc.c linux-2.6.32.38/fs/ext3/balloc.c |
12973 |
---- linux-2.6.32.38/fs/ext3/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
12974 |
-+++ linux-2.6.32.38/fs/ext3/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
12975 |
+diff -urNp linux-2.6.32.39/fs/ext3/balloc.c linux-2.6.32.39/fs/ext3/balloc.c |
12976 |
+--- linux-2.6.32.39/fs/ext3/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
12977 |
++++ linux-2.6.32.39/fs/ext3/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
12978 |
@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e |
12979 |
|
12980 |
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
12981 |
@@ -34004,35 +32758,9 @@ diff -urNp linux-2.6.32.38/fs/ext3/balloc.c linux-2.6.32.38/fs/ext3/balloc.c |
12982 |
sbi->s_resuid != current_fsuid() && |
12983 |
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
12984 |
return 0; |
12985 |
-diff -urNp linux-2.6.32.38/fs/ext3/namei.c linux-2.6.32.38/fs/ext3/namei.c |
12986 |
---- linux-2.6.32.38/fs/ext3/namei.c 2011-03-27 14:31:47.000000000 -0400 |
12987 |
-+++ linux-2.6.32.38/fs/ext3/namei.c 2011-04-17 15:56:46.000000000 -0400 |
12988 |
-@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split |
12989 |
- char *data1 = (*bh)->b_data, *data2; |
12990 |
- unsigned split, move, size; |
12991 |
- struct ext3_dir_entry_2 *de = NULL, *de2; |
12992 |
-- int err = 0, i; |
12993 |
-+ int i, err = 0; |
12994 |
- |
12995 |
- bh2 = ext3_append (handle, dir, &newblock, &err); |
12996 |
- if (!(bh2)) { |
12997 |
-diff -urNp linux-2.6.32.38/fs/ext3/xattr.c linux-2.6.32.38/fs/ext3/xattr.c |
12998 |
---- linux-2.6.32.38/fs/ext3/xattr.c 2011-03-27 14:31:47.000000000 -0400 |
12999 |
-+++ linux-2.6.32.38/fs/ext3/xattr.c 2011-04-17 15:56:46.000000000 -0400 |
13000 |
-@@ -89,8 +89,8 @@ |
13001 |
- printk("\n"); \ |
13002 |
- } while (0) |
13003 |
- #else |
13004 |
--# define ea_idebug(f...) |
13005 |
--# define ea_bdebug(f...) |
13006 |
-+# define ea_idebug(f...) do {} while (0) |
13007 |
-+# define ea_bdebug(f...) do {} while (0) |
13008 |
- #endif |
13009 |
- |
13010 |
- static void ext3_xattr_cache_insert(struct buffer_head *); |
13011 |
-diff -urNp linux-2.6.32.38/fs/ext4/balloc.c linux-2.6.32.38/fs/ext4/balloc.c |
13012 |
---- linux-2.6.32.38/fs/ext4/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
13013 |
-+++ linux-2.6.32.38/fs/ext4/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
13014 |
+diff -urNp linux-2.6.32.39/fs/ext4/balloc.c linux-2.6.32.39/fs/ext4/balloc.c |
13015 |
+--- linux-2.6.32.39/fs/ext4/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
13016 |
++++ linux-2.6.32.39/fs/ext4/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
13017 |
@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_ |
13018 |
/* Hm, nope. Are (enough) root reserved blocks available? */ |
13019 |
if (sbi->s_resuid == current_fsuid() || |
13020 |
@@ -34042,9 +32770,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/balloc.c linux-2.6.32.38/fs/ext4/balloc.c |
13021 |
if (free_blocks >= (nblocks + dirty_blocks)) |
13022 |
return 1; |
13023 |
} |
13024 |
-diff -urNp linux-2.6.32.38/fs/ext4/ext4.h linux-2.6.32.38/fs/ext4/ext4.h |
13025 |
---- linux-2.6.32.38/fs/ext4/ext4.h 2011-03-27 14:31:47.000000000 -0400 |
13026 |
-+++ linux-2.6.32.38/fs/ext4/ext4.h 2011-04-17 15:56:46.000000000 -0400 |
13027 |
+diff -urNp linux-2.6.32.39/fs/ext4/ext4.h linux-2.6.32.39/fs/ext4/ext4.h |
13028 |
+--- linux-2.6.32.39/fs/ext4/ext4.h 2011-03-27 14:31:47.000000000 -0400 |
13029 |
++++ linux-2.6.32.39/fs/ext4/ext4.h 2011-04-17 15:56:46.000000000 -0400 |
13030 |
@@ -1078,19 +1078,19 @@ struct ext4_sb_info { |
13031 |
|
13032 |
/* stats for buddy allocator */ |
13033 |
@@ -34075,9 +32803,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/ext4.h linux-2.6.32.38/fs/ext4/ext4.h |
13034 |
atomic_t s_lock_busy; |
13035 |
|
13036 |
/* locality groups */ |
13037 |
-diff -urNp linux-2.6.32.38/fs/ext4/mballoc.c linux-2.6.32.38/fs/ext4/mballoc.c |
13038 |
---- linux-2.6.32.38/fs/ext4/mballoc.c 2011-03-27 14:31:47.000000000 -0400 |
13039 |
-+++ linux-2.6.32.38/fs/ext4/mballoc.c 2011-04-17 15:56:46.000000000 -0400 |
13040 |
+diff -urNp linux-2.6.32.39/fs/ext4/mballoc.c linux-2.6.32.39/fs/ext4/mballoc.c |
13041 |
+--- linux-2.6.32.39/fs/ext4/mballoc.c 2011-03-27 14:31:47.000000000 -0400 |
13042 |
++++ linux-2.6.32.39/fs/ext4/mballoc.c 2011-04-17 15:56:46.000000000 -0400 |
13043 |
@@ -1753,7 +1753,7 @@ void ext4_mb_simple_scan_group(struct ex |
13044 |
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len); |
13045 |
|
13046 |
@@ -34191,21 +32919,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/mballoc.c linux-2.6.32.38/fs/ext4/mballoc.c |
13047 |
|
13048 |
if (ac) { |
13049 |
ac->ac_sb = sb; |
13050 |
-diff -urNp linux-2.6.32.38/fs/ext4/namei.c linux-2.6.32.38/fs/ext4/namei.c |
13051 |
---- linux-2.6.32.38/fs/ext4/namei.c 2011-03-27 14:31:47.000000000 -0400 |
13052 |
-+++ linux-2.6.32.38/fs/ext4/namei.c 2011-04-17 15:56:46.000000000 -0400 |
13053 |
-@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split |
13054 |
- char *data1 = (*bh)->b_data, *data2; |
13055 |
- unsigned split, move, size; |
13056 |
- struct ext4_dir_entry_2 *de = NULL, *de2; |
13057 |
-- int err = 0, i; |
13058 |
-+ int i, err = 0; |
13059 |
- |
13060 |
- bh2 = ext4_append (handle, dir, &newblock, &err); |
13061 |
- if (!(bh2)) { |
13062 |
-diff -urNp linux-2.6.32.38/fs/ext4/super.c linux-2.6.32.38/fs/ext4/super.c |
13063 |
---- linux-2.6.32.38/fs/ext4/super.c 2011-03-27 14:31:47.000000000 -0400 |
13064 |
-+++ linux-2.6.32.38/fs/ext4/super.c 2011-04-17 15:56:46.000000000 -0400 |
13065 |
+diff -urNp linux-2.6.32.39/fs/ext4/super.c linux-2.6.32.39/fs/ext4/super.c |
13066 |
+--- linux-2.6.32.39/fs/ext4/super.c 2011-03-27 14:31:47.000000000 -0400 |
13067 |
++++ linux-2.6.32.39/fs/ext4/super.c 2011-04-17 15:56:46.000000000 -0400 |
13068 |
@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje |
13069 |
} |
13070 |
|
13071 |
@@ -34215,23 +32931,9 @@ diff -urNp linux-2.6.32.38/fs/ext4/super.c linux-2.6.32.38/fs/ext4/super.c |
13072 |
.show = ext4_attr_show, |
13073 |
.store = ext4_attr_store, |
13074 |
}; |
13075 |
-diff -urNp linux-2.6.32.38/fs/ext4/xattr.c linux-2.6.32.38/fs/ext4/xattr.c |
13076 |
---- linux-2.6.32.38/fs/ext4/xattr.c 2011-03-27 14:31:47.000000000 -0400 |
13077 |
-+++ linux-2.6.32.38/fs/ext4/xattr.c 2011-04-17 15:56:46.000000000 -0400 |
13078 |
-@@ -82,8 +82,8 @@ |
13079 |
- printk("\n"); \ |
13080 |
- } while (0) |
13081 |
- #else |
13082 |
--# define ea_idebug(f...) |
13083 |
--# define ea_bdebug(f...) |
13084 |
-+# define ea_idebug(inode, f...) do {} while (0) |
13085 |
-+# define ea_bdebug(bh, f...) do {} while (0) |
13086 |
- #endif |
13087 |
- |
13088 |
- static void ext4_xattr_cache_insert(struct buffer_head *); |
13089 |
-diff -urNp linux-2.6.32.38/fs/fcntl.c linux-2.6.32.38/fs/fcntl.c |
13090 |
---- linux-2.6.32.38/fs/fcntl.c 2011-03-27 14:31:47.000000000 -0400 |
13091 |
-+++ linux-2.6.32.38/fs/fcntl.c 2011-04-17 15:56:46.000000000 -0400 |
13092 |
+diff -urNp linux-2.6.32.39/fs/fcntl.c linux-2.6.32.39/fs/fcntl.c |
13093 |
+--- linux-2.6.32.39/fs/fcntl.c 2011-03-27 14:31:47.000000000 -0400 |
13094 |
++++ linux-2.6.32.39/fs/fcntl.c 2011-04-17 15:56:46.000000000 -0400 |
13095 |
@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct |
13096 |
if (err) |
13097 |
return err; |
13098 |
@@ -34252,9 +32954,9 @@ diff -urNp linux-2.6.32.38/fs/fcntl.c linux-2.6.32.38/fs/fcntl.c |
13099 |
if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
13100 |
break; |
13101 |
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); |
13102 |
-diff -urNp linux-2.6.32.38/fs/fifo.c linux-2.6.32.38/fs/fifo.c |
13103 |
---- linux-2.6.32.38/fs/fifo.c 2011-03-27 14:31:47.000000000 -0400 |
13104 |
-+++ linux-2.6.32.38/fs/fifo.c 2011-04-17 15:56:46.000000000 -0400 |
13105 |
+diff -urNp linux-2.6.32.39/fs/fifo.c linux-2.6.32.39/fs/fifo.c |
13106 |
+--- linux-2.6.32.39/fs/fifo.c 2011-03-27 14:31:47.000000000 -0400 |
13107 |
++++ linux-2.6.32.39/fs/fifo.c 2011-04-17 15:56:46.000000000 -0400 |
13108 |
@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode |
13109 |
*/ |
13110 |
filp->f_op = &read_pipefifo_fops; |
13111 |
@@ -34325,9 +33027,9 @@ diff -urNp linux-2.6.32.38/fs/fifo.c linux-2.6.32.38/fs/fifo.c |
13112 |
free_pipe_info(inode); |
13113 |
|
13114 |
err_nocleanup: |
13115 |
-diff -urNp linux-2.6.32.38/fs/file.c linux-2.6.32.38/fs/file.c |
13116 |
---- linux-2.6.32.38/fs/file.c 2011-03-27 14:31:47.000000000 -0400 |
13117 |
-+++ linux-2.6.32.38/fs/file.c 2011-04-17 15:56:46.000000000 -0400 |
13118 |
+diff -urNp linux-2.6.32.39/fs/file.c linux-2.6.32.39/fs/file.c |
13119 |
+--- linux-2.6.32.39/fs/file.c 2011-03-27 14:31:47.000000000 -0400 |
13120 |
++++ linux-2.6.32.39/fs/file.c 2011-04-17 15:56:46.000000000 -0400 |
13121 |
@@ -14,6 +14,7 @@ |
13122 |
#include <linux/slab.h> |
13123 |
#include <linux/vmalloc.h> |
13124 |
@@ -34345,9 +33047,9 @@ diff -urNp linux-2.6.32.38/fs/file.c linux-2.6.32.38/fs/file.c |
13125 |
if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
13126 |
return -EMFILE; |
13127 |
|
13128 |
-diff -urNp linux-2.6.32.38/fs/filesystems.c linux-2.6.32.38/fs/filesystems.c |
13129 |
---- linux-2.6.32.38/fs/filesystems.c 2011-03-27 14:31:47.000000000 -0400 |
13130 |
-+++ linux-2.6.32.38/fs/filesystems.c 2011-04-17 15:56:46.000000000 -0400 |
13131 |
+diff -urNp linux-2.6.32.39/fs/filesystems.c linux-2.6.32.39/fs/filesystems.c |
13132 |
+--- linux-2.6.32.39/fs/filesystems.c 2011-03-27 14:31:47.000000000 -0400 |
13133 |
++++ linux-2.6.32.39/fs/filesystems.c 2011-04-17 15:56:46.000000000 -0400 |
13134 |
@@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(con |
13135 |
int len = dot ? dot - name : strlen(name); |
13136 |
|
13137 |
@@ -34361,9 +33063,9 @@ diff -urNp linux-2.6.32.38/fs/filesystems.c linux-2.6.32.38/fs/filesystems.c |
13138 |
fs = __get_fs_type(name, len); |
13139 |
|
13140 |
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { |
13141 |
-diff -urNp linux-2.6.32.38/fs/fs_struct.c linux-2.6.32.38/fs/fs_struct.c |
13142 |
---- linux-2.6.32.38/fs/fs_struct.c 2011-03-27 14:31:47.000000000 -0400 |
13143 |
-+++ linux-2.6.32.38/fs/fs_struct.c 2011-04-17 15:56:46.000000000 -0400 |
13144 |
+diff -urNp linux-2.6.32.39/fs/fs_struct.c linux-2.6.32.39/fs/fs_struct.c |
13145 |
+--- linux-2.6.32.39/fs/fs_struct.c 2011-03-27 14:31:47.000000000 -0400 |
13146 |
++++ linux-2.6.32.39/fs/fs_struct.c 2011-04-17 15:56:46.000000000 -0400 |
13147 |
@@ -4,6 +4,7 @@ |
13148 |
#include <linux/path.h> |
13149 |
#include <linux/slab.h> |
13150 |
@@ -34443,21 +33145,9 @@ diff -urNp linux-2.6.32.38/fs/fs_struct.c linux-2.6.32.38/fs/fs_struct.c |
13151 |
write_unlock(&fs->lock); |
13152 |
|
13153 |
task_unlock(current); |
13154 |
-diff -urNp linux-2.6.32.38/fs/fuse/control.c linux-2.6.32.38/fs/fuse/control.c |
13155 |
---- linux-2.6.32.38/fs/fuse/control.c 2011-03-27 14:31:47.000000000 -0400 |
13156 |
-+++ linux-2.6.32.38/fs/fuse/control.c 2011-04-17 15:56:46.000000000 -0400 |
13157 |
-@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co |
13158 |
- |
13159 |
- static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) |
13160 |
- { |
13161 |
-- struct tree_descr empty_descr = {""}; |
13162 |
-+ struct tree_descr empty_descr = {"", NULL, 0}; |
13163 |
- struct fuse_conn *fc; |
13164 |
- int err; |
13165 |
- |
13166 |
-diff -urNp linux-2.6.32.38/fs/fuse/cuse.c linux-2.6.32.38/fs/fuse/cuse.c |
13167 |
---- linux-2.6.32.38/fs/fuse/cuse.c 2011-03-27 14:31:47.000000000 -0400 |
13168 |
-+++ linux-2.6.32.38/fs/fuse/cuse.c 2011-04-17 15:56:46.000000000 -0400 |
13169 |
+diff -urNp linux-2.6.32.39/fs/fuse/cuse.c linux-2.6.32.39/fs/fuse/cuse.c |
13170 |
+--- linux-2.6.32.39/fs/fuse/cuse.c 2011-03-27 14:31:47.000000000 -0400 |
13171 |
++++ linux-2.6.32.39/fs/fuse/cuse.c 2011-04-17 15:56:46.000000000 -0400 |
13172 |
@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i |
13173 |
return rc; |
13174 |
} |
13175 |
@@ -34492,9 +33182,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/cuse.c linux-2.6.32.38/fs/fuse/cuse.c |
13176 |
cuse_class = class_create(THIS_MODULE, "cuse"); |
13177 |
if (IS_ERR(cuse_class)) |
13178 |
return PTR_ERR(cuse_class); |
13179 |
-diff -urNp linux-2.6.32.38/fs/fuse/dev.c linux-2.6.32.38/fs/fuse/dev.c |
13180 |
---- linux-2.6.32.38/fs/fuse/dev.c 2011-03-27 14:31:47.000000000 -0400 |
13181 |
-+++ linux-2.6.32.38/fs/fuse/dev.c 2011-04-17 15:56:46.000000000 -0400 |
13182 |
+diff -urNp linux-2.6.32.39/fs/fuse/dev.c linux-2.6.32.39/fs/fuse/dev.c |
13183 |
+--- linux-2.6.32.39/fs/fuse/dev.c 2011-03-27 14:31:47.000000000 -0400 |
13184 |
++++ linux-2.6.32.39/fs/fuse/dev.c 2011-04-17 15:56:46.000000000 -0400 |
13185 |
@@ -745,7 +745,7 @@ __releases(&fc->lock) |
13186 |
* request_end(). Otherwise add it to the processing list, and set |
13187 |
* the 'sent' flag. |
13188 |
@@ -34600,9 +33290,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/dev.c linux-2.6.32.38/fs/fuse/dev.c |
13189 |
|
13190 |
const struct file_operations fuse_dev_operations = { |
13191 |
.owner = THIS_MODULE, |
13192 |
-diff -urNp linux-2.6.32.38/fs/fuse/dir.c linux-2.6.32.38/fs/fuse/dir.c |
13193 |
---- linux-2.6.32.38/fs/fuse/dir.c 2011-03-27 14:31:47.000000000 -0400 |
13194 |
-+++ linux-2.6.32.38/fs/fuse/dir.c 2011-04-17 15:56:46.000000000 -0400 |
13195 |
+diff -urNp linux-2.6.32.39/fs/fuse/dir.c linux-2.6.32.39/fs/fuse/dir.c |
13196 |
+--- linux-2.6.32.39/fs/fuse/dir.c 2011-03-27 14:31:47.000000000 -0400 |
13197 |
++++ linux-2.6.32.39/fs/fuse/dir.c 2011-04-17 15:56:46.000000000 -0400 |
13198 |
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de |
13199 |
return link; |
13200 |
} |
13201 |
@@ -34612,9 +33302,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/dir.c linux-2.6.32.38/fs/fuse/dir.c |
13202 |
{ |
13203 |
if (!IS_ERR(link)) |
13204 |
free_page((unsigned long) link); |
13205 |
-diff -urNp linux-2.6.32.38/fs/fuse/fuse_i.h linux-2.6.32.38/fs/fuse/fuse_i.h |
13206 |
---- linux-2.6.32.38/fs/fuse/fuse_i.h 2011-03-27 14:31:47.000000000 -0400 |
13207 |
-+++ linux-2.6.32.38/fs/fuse/fuse_i.h 2011-04-17 15:56:46.000000000 -0400 |
13208 |
+diff -urNp linux-2.6.32.39/fs/fuse/fuse_i.h linux-2.6.32.39/fs/fuse/fuse_i.h |
13209 |
+--- linux-2.6.32.39/fs/fuse/fuse_i.h 2011-03-27 14:31:47.000000000 -0400 |
13210 |
++++ linux-2.6.32.39/fs/fuse/fuse_i.h 2011-04-17 15:56:46.000000000 -0400 |
13211 |
@@ -525,6 +525,16 @@ extern const struct file_operations fuse |
13212 |
|
13213 |
extern const struct dentry_operations fuse_dentry_operations; |
13214 |
@@ -34632,9 +33322,9 @@ diff -urNp linux-2.6.32.38/fs/fuse/fuse_i.h linux-2.6.32.38/fs/fuse/fuse_i.h |
13215 |
/** |
13216 |
* Inode to nodeid comparison. |
13217 |
*/ |
13218 |
-diff -urNp linux-2.6.32.38/fs/gfs2/sys.c linux-2.6.32.38/fs/gfs2/sys.c |
13219 |
---- linux-2.6.32.38/fs/gfs2/sys.c 2011-03-27 14:31:47.000000000 -0400 |
13220 |
-+++ linux-2.6.32.38/fs/gfs2/sys.c 2011-04-17 15:56:46.000000000 -0400 |
13221 |
+diff -urNp linux-2.6.32.39/fs/gfs2/sys.c linux-2.6.32.39/fs/gfs2/sys.c |
13222 |
+--- linux-2.6.32.39/fs/gfs2/sys.c 2011-03-27 14:31:47.000000000 -0400 |
13223 |
++++ linux-2.6.32.39/fs/gfs2/sys.c 2011-04-17 15:56:46.000000000 -0400 |
13224 |
@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko |
13225 |
return a->store ? a->store(sdp, buf, len) : len; |
13226 |
} |
13227 |
@@ -34653,69 +33343,9 @@ diff -urNp linux-2.6.32.38/fs/gfs2/sys.c linux-2.6.32.38/fs/gfs2/sys.c |
13228 |
.uevent = gfs2_uevent, |
13229 |
}; |
13230 |
|
13231 |
-diff -urNp linux-2.6.32.38/fs/hfs/inode.c linux-2.6.32.38/fs/hfs/inode.c |
13232 |
---- linux-2.6.32.38/fs/hfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
13233 |
-+++ linux-2.6.32.38/fs/hfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
13234 |
-@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, |
13235 |
- |
13236 |
- if (S_ISDIR(main_inode->i_mode)) { |
13237 |
- if (fd.entrylength < sizeof(struct hfs_cat_dir)) |
13238 |
-- /* panic? */; |
13239 |
-+ {/* panic? */} |
13240 |
- hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, |
13241 |
- sizeof(struct hfs_cat_dir)); |
13242 |
- if (rec.type != HFS_CDR_DIR || |
13243 |
-@@ -444,7 +444,7 @@ int hfs_write_inode(struct inode *inode, |
13244 |
- sizeof(struct hfs_cat_file)); |
13245 |
- } else { |
13246 |
- if (fd.entrylength < sizeof(struct hfs_cat_file)) |
13247 |
-- /* panic? */; |
13248 |
-+ {/* panic? */} |
13249 |
- hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, |
13250 |
- sizeof(struct hfs_cat_file)); |
13251 |
- if (rec.type != HFS_CDR_FIL || |
13252 |
-diff -urNp linux-2.6.32.38/fs/hfsplus/inode.c linux-2.6.32.38/fs/hfsplus/inode.c |
13253 |
---- linux-2.6.32.38/fs/hfsplus/inode.c 2011-03-27 14:31:47.000000000 -0400 |
13254 |
-+++ linux-2.6.32.38/fs/hfsplus/inode.c 2011-04-17 15:56:46.000000000 -0400 |
13255 |
-@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode |
13256 |
- struct hfsplus_cat_folder *folder = &entry.folder; |
13257 |
- |
13258 |
- if (fd->entrylength < sizeof(struct hfsplus_cat_folder)) |
13259 |
-- /* panic? */; |
13260 |
-+ {/* panic? */} |
13261 |
- hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, |
13262 |
- sizeof(struct hfsplus_cat_folder)); |
13263 |
- hfsplus_get_perms(inode, &folder->permissions, 1); |
13264 |
-@@ -423,7 +423,7 @@ int hfsplus_cat_read_inode(struct inode |
13265 |
- struct hfsplus_cat_file *file = &entry.file; |
13266 |
- |
13267 |
- if (fd->entrylength < sizeof(struct hfsplus_cat_file)) |
13268 |
-- /* panic? */; |
13269 |
-+ {/* panic? */} |
13270 |
- hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, |
13271 |
- sizeof(struct hfsplus_cat_file)); |
13272 |
- |
13273 |
-@@ -479,7 +479,7 @@ int hfsplus_cat_write_inode(struct inode |
13274 |
- struct hfsplus_cat_folder *folder = &entry.folder; |
13275 |
- |
13276 |
- if (fd.entrylength < sizeof(struct hfsplus_cat_folder)) |
13277 |
-- /* panic? */; |
13278 |
-+ {/* panic? */} |
13279 |
- hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, |
13280 |
- sizeof(struct hfsplus_cat_folder)); |
13281 |
- /* simple node checks? */ |
13282 |
-@@ -501,7 +501,7 @@ int hfsplus_cat_write_inode(struct inode |
13283 |
- struct hfsplus_cat_file *file = &entry.file; |
13284 |
- |
13285 |
- if (fd.entrylength < sizeof(struct hfsplus_cat_file)) |
13286 |
-- /* panic? */; |
13287 |
-+ {/* panic? */} |
13288 |
- hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, |
13289 |
- sizeof(struct hfsplus_cat_file)); |
13290 |
- hfsplus_inode_write_fork(inode, &file->data_fork); |
13291 |
-diff -urNp linux-2.6.32.38/fs/hugetlbfs/inode.c linux-2.6.32.38/fs/hugetlbfs/inode.c |
13292 |
---- linux-2.6.32.38/fs/hugetlbfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
13293 |
-+++ linux-2.6.32.38/fs/hugetlbfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
13294 |
+diff -urNp linux-2.6.32.39/fs/hugetlbfs/inode.c linux-2.6.32.39/fs/hugetlbfs/inode.c |
13295 |
+--- linux-2.6.32.39/fs/hugetlbfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
13296 |
++++ linux-2.6.32.39/fs/hugetlbfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
13297 |
@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs |
13298 |
.kill_sb = kill_litter_super, |
13299 |
}; |
13300 |
@@ -34725,9 +33355,9 @@ diff -urNp linux-2.6.32.38/fs/hugetlbfs/inode.c linux-2.6.32.38/fs/hugetlbfs/ino |
13301 |
|
13302 |
static int can_do_hugetlb_shm(void) |
13303 |
{ |
13304 |
-diff -urNp linux-2.6.32.38/fs/ioctl.c linux-2.6.32.38/fs/ioctl.c |
13305 |
---- linux-2.6.32.38/fs/ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
13306 |
-+++ linux-2.6.32.38/fs/ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
13307 |
+diff -urNp linux-2.6.32.39/fs/ioctl.c linux-2.6.32.39/fs/ioctl.c |
13308 |
+--- linux-2.6.32.39/fs/ioctl.c 2011-03-27 14:31:47.000000000 -0400 |
13309 |
++++ linux-2.6.32.39/fs/ioctl.c 2011-04-17 15:56:46.000000000 -0400 |
13310 |
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema |
13311 |
u64 phys, u64 len, u32 flags) |
13312 |
{ |
13313 |
@@ -34755,113 +33385,9 @@ diff -urNp linux-2.6.32.38/fs/ioctl.c linux-2.6.32.38/fs/ioctl.c |
13314 |
error = -EFAULT; |
13315 |
|
13316 |
return error; |
13317 |
-diff -urNp linux-2.6.32.38/fs/jffs2/debug.h linux-2.6.32.38/fs/jffs2/debug.h |
13318 |
---- linux-2.6.32.38/fs/jffs2/debug.h 2011-03-27 14:31:47.000000000 -0400 |
13319 |
-+++ linux-2.6.32.38/fs/jffs2/debug.h 2011-04-17 15:56:46.000000000 -0400 |
13320 |
-@@ -52,13 +52,13 @@ |
13321 |
- #if CONFIG_JFFS2_FS_DEBUG > 0 |
13322 |
- #define D1(x) x |
13323 |
- #else |
13324 |
--#define D1(x) |
13325 |
-+#define D1(x) do {} while (0); |
13326 |
- #endif |
13327 |
- |
13328 |
- #if CONFIG_JFFS2_FS_DEBUG > 1 |
13329 |
- #define D2(x) x |
13330 |
- #else |
13331 |
--#define D2(x) |
13332 |
-+#define D2(x) do {} while (0); |
13333 |
- #endif |
13334 |
- |
13335 |
- /* The prefixes of JFFS2 messages */ |
13336 |
-@@ -114,73 +114,73 @@ |
13337 |
- #ifdef JFFS2_DBG_READINODE_MESSAGES |
13338 |
- #define dbg_readinode(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13339 |
- #else |
13340 |
--#define dbg_readinode(fmt, ...) |
13341 |
-+#define dbg_readinode(fmt, ...) do {} while (0) |
13342 |
- #endif |
13343 |
- #ifdef JFFS2_DBG_READINODE2_MESSAGES |
13344 |
- #define dbg_readinode2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13345 |
- #else |
13346 |
--#define dbg_readinode2(fmt, ...) |
13347 |
-+#define dbg_readinode2(fmt, ...) do {} while (0) |
13348 |
- #endif |
13349 |
- |
13350 |
- /* Fragtree build debugging messages */ |
13351 |
- #ifdef JFFS2_DBG_FRAGTREE_MESSAGES |
13352 |
- #define dbg_fragtree(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13353 |
- #else |
13354 |
--#define dbg_fragtree(fmt, ...) |
13355 |
-+#define dbg_fragtree(fmt, ...) do {} while (0) |
13356 |
- #endif |
13357 |
- #ifdef JFFS2_DBG_FRAGTREE2_MESSAGES |
13358 |
- #define dbg_fragtree2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13359 |
- #else |
13360 |
--#define dbg_fragtree2(fmt, ...) |
13361 |
-+#define dbg_fragtree2(fmt, ...) do {} while (0) |
13362 |
- #endif |
13363 |
- |
13364 |
- /* Directory entry list manilulation debugging messages */ |
13365 |
- #ifdef JFFS2_DBG_DENTLIST_MESSAGES |
13366 |
- #define dbg_dentlist(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13367 |
- #else |
13368 |
--#define dbg_dentlist(fmt, ...) |
13369 |
-+#define dbg_dentlist(fmt, ...) do {} while (0) |
13370 |
- #endif |
13371 |
- |
13372 |
- /* Print the messages about manipulating node_refs */ |
13373 |
- #ifdef JFFS2_DBG_NODEREF_MESSAGES |
13374 |
- #define dbg_noderef(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13375 |
- #else |
13376 |
--#define dbg_noderef(fmt, ...) |
13377 |
-+#define dbg_noderef(fmt, ...) do {} while (0) |
13378 |
- #endif |
13379 |
- |
13380 |
- /* Manipulations with the list of inodes (JFFS2 inocache) */ |
13381 |
- #ifdef JFFS2_DBG_INOCACHE_MESSAGES |
13382 |
- #define dbg_inocache(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13383 |
- #else |
13384 |
--#define dbg_inocache(fmt, ...) |
13385 |
-+#define dbg_inocache(fmt, ...) do {} while (0) |
13386 |
- #endif |
13387 |
- |
13388 |
- /* Summary debugging messages */ |
13389 |
- #ifdef JFFS2_DBG_SUMMARY_MESSAGES |
13390 |
- #define dbg_summary(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13391 |
- #else |
13392 |
--#define dbg_summary(fmt, ...) |
13393 |
-+#define dbg_summary(fmt, ...) do {} while (0) |
13394 |
- #endif |
13395 |
- |
13396 |
- /* File system build messages */ |
13397 |
- #ifdef JFFS2_DBG_FSBUILD_MESSAGES |
13398 |
- #define dbg_fsbuild(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13399 |
- #else |
13400 |
--#define dbg_fsbuild(fmt, ...) |
13401 |
-+#define dbg_fsbuild(fmt, ...) do {} while (0) |
13402 |
- #endif |
13403 |
- |
13404 |
- /* Watch the object allocations */ |
13405 |
- #ifdef JFFS2_DBG_MEMALLOC_MESSAGES |
13406 |
- #define dbg_memalloc(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13407 |
- #else |
13408 |
--#define dbg_memalloc(fmt, ...) |
13409 |
-+#define dbg_memalloc(fmt, ...) do {} while (0) |
13410 |
- #endif |
13411 |
- |
13412 |
- /* Watch the XATTR subsystem */ |
13413 |
- #ifdef JFFS2_DBG_XATTR_MESSAGES |
13414 |
- #define dbg_xattr(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
13415 |
- #else |
13416 |
--#define dbg_xattr(fmt, ...) |
13417 |
-+#define dbg_xattr(fmt, ...) do {} while (0) |
13418 |
- #endif |
13419 |
- |
13420 |
- /* "Sanity" checks */ |
13421 |
-diff -urNp linux-2.6.32.38/fs/jffs2/erase.c linux-2.6.32.38/fs/jffs2/erase.c |
13422 |
---- linux-2.6.32.38/fs/jffs2/erase.c 2011-03-27 14:31:47.000000000 -0400 |
13423 |
-+++ linux-2.6.32.38/fs/jffs2/erase.c 2011-04-17 15:56:46.000000000 -0400 |
13424 |
+diff -urNp linux-2.6.32.39/fs/jffs2/erase.c linux-2.6.32.39/fs/jffs2/erase.c |
13425 |
+--- linux-2.6.32.39/fs/jffs2/erase.c 2011-03-27 14:31:47.000000000 -0400 |
13426 |
++++ linux-2.6.32.39/fs/jffs2/erase.c 2011-04-17 15:56:46.000000000 -0400 |
13427 |
@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru |
13428 |
struct jffs2_unknown_node marker = { |
13429 |
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), |
13430 |
@@ -34872,40 +33398,9 @@ diff -urNp linux-2.6.32.38/fs/jffs2/erase.c linux-2.6.32.38/fs/jffs2/erase.c |
13431 |
}; |
13432 |
|
13433 |
jffs2_prealloc_raw_node_refs(c, jeb, 1); |
13434 |
-diff -urNp linux-2.6.32.38/fs/jffs2/summary.h linux-2.6.32.38/fs/jffs2/summary.h |
13435 |
---- linux-2.6.32.38/fs/jffs2/summary.h 2011-03-27 14:31:47.000000000 -0400 |
13436 |
-+++ linux-2.6.32.38/fs/jffs2/summary.h 2011-04-17 15:56:46.000000000 -0400 |
13437 |
-@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ |
13438 |
- |
13439 |
- #define jffs2_sum_active() (0) |
13440 |
- #define jffs2_sum_init(a) (0) |
13441 |
--#define jffs2_sum_exit(a) |
13442 |
--#define jffs2_sum_disable_collecting(a) |
13443 |
-+#define jffs2_sum_exit(a) do {} while (0) |
13444 |
-+#define jffs2_sum_disable_collecting(a) do {} while (0) |
13445 |
- #define jffs2_sum_is_disabled(a) (0) |
13446 |
--#define jffs2_sum_reset_collected(a) |
13447 |
-+#define jffs2_sum_reset_collected(a) do {} while (0) |
13448 |
- #define jffs2_sum_add_kvec(a,b,c,d) (0) |
13449 |
--#define jffs2_sum_move_collected(a,b) |
13450 |
-+#define jffs2_sum_move_collected(a,b) do {} while (0) |
13451 |
- #define jffs2_sum_write_sumnode(a) (0) |
13452 |
--#define jffs2_sum_add_padding_mem(a,b) |
13453 |
--#define jffs2_sum_add_inode_mem(a,b,c) |
13454 |
--#define jffs2_sum_add_dirent_mem(a,b,c) |
13455 |
--#define jffs2_sum_add_xattr_mem(a,b,c) |
13456 |
--#define jffs2_sum_add_xref_mem(a,b,c) |
13457 |
-+#define jffs2_sum_add_padding_mem(a,b) do {} while (0) |
13458 |
-+#define jffs2_sum_add_inode_mem(a,b,c) do {} while (0) |
13459 |
-+#define jffs2_sum_add_dirent_mem(a,b,c) do {} while (0) |
13460 |
-+#define jffs2_sum_add_xattr_mem(a,b,c) do {} while (0) |
13461 |
-+#define jffs2_sum_add_xref_mem(a,b,c) do {} while (0) |
13462 |
- #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) |
13463 |
- |
13464 |
- #endif /* CONFIG_JFFS2_SUMMARY */ |
13465 |
-diff -urNp linux-2.6.32.38/fs/jffs2/wbuf.c linux-2.6.32.38/fs/jffs2/wbuf.c |
13466 |
---- linux-2.6.32.38/fs/jffs2/wbuf.c 2011-03-27 14:31:47.000000000 -0400 |
13467 |
-+++ linux-2.6.32.38/fs/jffs2/wbuf.c 2011-04-17 15:56:46.000000000 -0400 |
13468 |
+diff -urNp linux-2.6.32.39/fs/jffs2/wbuf.c linux-2.6.32.39/fs/jffs2/wbuf.c |
13469 |
+--- linux-2.6.32.39/fs/jffs2/wbuf.c 2011-03-27 14:31:47.000000000 -0400 |
13470 |
++++ linux-2.6.32.39/fs/jffs2/wbuf.c 2011-04-17 15:56:46.000000000 -0400 |
13471 |
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o |
13472 |
{ |
13473 |
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), |
13474 |
@@ -34916,9 +33411,9 @@ diff -urNp linux-2.6.32.38/fs/jffs2/wbuf.c linux-2.6.32.38/fs/jffs2/wbuf.c |
13475 |
}; |
13476 |
|
13477 |
/* |
13478 |
-diff -urNp linux-2.6.32.38/fs/Kconfig.binfmt linux-2.6.32.38/fs/Kconfig.binfmt |
13479 |
---- linux-2.6.32.38/fs/Kconfig.binfmt 2011-03-27 14:31:47.000000000 -0400 |
13480 |
-+++ linux-2.6.32.38/fs/Kconfig.binfmt 2011-04-17 15:56:46.000000000 -0400 |
13481 |
+diff -urNp linux-2.6.32.39/fs/Kconfig.binfmt linux-2.6.32.39/fs/Kconfig.binfmt |
13482 |
+--- linux-2.6.32.39/fs/Kconfig.binfmt 2011-03-27 14:31:47.000000000 -0400 |
13483 |
++++ linux-2.6.32.39/fs/Kconfig.binfmt 2011-04-17 15:56:46.000000000 -0400 |
13484 |
@@ -86,7 +86,7 @@ config HAVE_AOUT |
13485 |
|
13486 |
config BINFMT_AOUT |
13487 |
@@ -34928,14 +33423,14 @@ diff -urNp linux-2.6.32.38/fs/Kconfig.binfmt linux-2.6.32.38/fs/Kconfig.binfmt |
13488 |
---help--- |
13489 |
A.out (Assembler.OUTput) is a set of formats for libraries and |
13490 |
executables used in the earliest versions of UNIX. Linux used |
13491 |
-diff -urNp linux-2.6.32.38/fs/libfs.c linux-2.6.32.38/fs/libfs.c |
13492 |
---- linux-2.6.32.38/fs/libfs.c 2011-03-27 14:31:47.000000000 -0400 |
13493 |
-+++ linux-2.6.32.38/fs/libfs.c 2011-04-17 15:56:46.000000000 -0400 |
13494 |
+diff -urNp linux-2.6.32.39/fs/libfs.c linux-2.6.32.39/fs/libfs.c |
13495 |
+--- linux-2.6.32.39/fs/libfs.c 2011-03-27 14:31:47.000000000 -0400 |
13496 |
++++ linux-2.6.32.39/fs/libfs.c 2011-04-23 13:36:01.000000000 -0400 |
13497 |
@@ -132,6 +132,8 @@ int dcache_readdir(struct file * filp, v |
13498 |
struct dentry *dentry = filp->f_path.dentry; |
13499 |
struct dentry *cursor = filp->private_data; |
13500 |
struct list_head *p, *q = &cursor->d_u.d_child; |
13501 |
-+ char d_name[DNAME_INLINE_LEN_MIN]; |
13502 |
++ char d_name[DNAME_INLINE_LEN]; |
13503 |
+ const char *name; |
13504 |
ino_t ino; |
13505 |
int i = filp->f_pos; |
13506 |
@@ -34945,18 +33440,18 @@ diff -urNp linux-2.6.32.38/fs/libfs.c linux-2.6.32.38/fs/libfs.c |
13507 |
|
13508 |
spin_unlock(&dcache_lock); |
13509 |
- if (filldir(dirent, next->d_name.name, |
13510 |
-+ if (next->d_name.len < DNAME_INLINE_LEN_MIN) { |
13511 |
++ if (next->d_name.len < DNAME_INLINE_LEN) { |
13512 |
+ memcpy(d_name, next->d_name.name, next->d_name.len); |
13513 |
+ name = d_name; |
13514 |
+ } else |
13515 |
+ name = next->d_name.name; |
13516 |
-+ if (filldir(dirent, name, |
13517 |
++ if (filldir(dirent, name, |
13518 |
next->d_name.len, filp->f_pos, |
13519 |
next->d_inode->i_ino, |
13520 |
dt_type(next->d_inode)) < 0) |
13521 |
-diff -urNp linux-2.6.32.38/fs/lockd/svc.c linux-2.6.32.38/fs/lockd/svc.c |
13522 |
---- linux-2.6.32.38/fs/lockd/svc.c 2011-03-27 14:31:47.000000000 -0400 |
13523 |
-+++ linux-2.6.32.38/fs/lockd/svc.c 2011-04-17 15:56:46.000000000 -0400 |
13524 |
+diff -urNp linux-2.6.32.39/fs/lockd/svc.c linux-2.6.32.39/fs/lockd/svc.c |
13525 |
+--- linux-2.6.32.39/fs/lockd/svc.c 2011-03-27 14:31:47.000000000 -0400 |
13526 |
++++ linux-2.6.32.39/fs/lockd/svc.c 2011-04-17 15:56:46.000000000 -0400 |
13527 |
@@ -43,7 +43,7 @@ |
13528 |
|
13529 |
static struct svc_program nlmsvc_program; |
13530 |
@@ -34966,9 +33461,9 @@ diff -urNp linux-2.6.32.38/fs/lockd/svc.c linux-2.6.32.38/fs/lockd/svc.c |
13531 |
EXPORT_SYMBOL_GPL(nlmsvc_ops); |
13532 |
|
13533 |
static DEFINE_MUTEX(nlmsvc_mutex); |
13534 |
-diff -urNp linux-2.6.32.38/fs/locks.c linux-2.6.32.38/fs/locks.c |
13535 |
---- linux-2.6.32.38/fs/locks.c 2011-03-27 14:31:47.000000000 -0400 |
13536 |
-+++ linux-2.6.32.38/fs/locks.c 2011-04-17 15:56:46.000000000 -0400 |
13537 |
+diff -urNp linux-2.6.32.39/fs/locks.c linux-2.6.32.39/fs/locks.c |
13538 |
+--- linux-2.6.32.39/fs/locks.c 2011-03-27 14:31:47.000000000 -0400 |
13539 |
++++ linux-2.6.32.39/fs/locks.c 2011-04-17 15:56:46.000000000 -0400 |
13540 |
@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil |
13541 |
return; |
13542 |
|
13543 |
@@ -34990,9 +33485,9 @@ diff -urNp linux-2.6.32.38/fs/locks.c linux-2.6.32.38/fs/locks.c |
13544 |
} |
13545 |
|
13546 |
lock_kernel(); |
13547 |
-diff -urNp linux-2.6.32.38/fs/namei.c linux-2.6.32.38/fs/namei.c |
13548 |
---- linux-2.6.32.38/fs/namei.c 2011-03-27 14:31:47.000000000 -0400 |
13549 |
-+++ linux-2.6.32.38/fs/namei.c 2011-04-17 15:56:46.000000000 -0400 |
13550 |
+diff -urNp linux-2.6.32.39/fs/namei.c linux-2.6.32.39/fs/namei.c |
13551 |
+--- linux-2.6.32.39/fs/namei.c 2011-03-27 14:31:47.000000000 -0400 |
13552 |
++++ linux-2.6.32.39/fs/namei.c 2011-04-17 15:56:46.000000000 -0400 |
13553 |
@@ -224,14 +224,6 @@ int generic_permission(struct inode *ino |
13554 |
return ret; |
13555 |
|
13556 |
@@ -35419,9 +33914,9 @@ diff -urNp linux-2.6.32.38/fs/namei.c linux-2.6.32.38/fs/namei.c |
13557 |
len = -EFAULT; |
13558 |
out: |
13559 |
return len; |
13560 |
-diff -urNp linux-2.6.32.38/fs/namespace.c linux-2.6.32.38/fs/namespace.c |
13561 |
---- linux-2.6.32.38/fs/namespace.c 2011-03-27 14:31:47.000000000 -0400 |
13562 |
-+++ linux-2.6.32.38/fs/namespace.c 2011-04-17 15:56:46.000000000 -0400 |
13563 |
+diff -urNp linux-2.6.32.39/fs/namespace.c linux-2.6.32.39/fs/namespace.c |
13564 |
+--- linux-2.6.32.39/fs/namespace.c 2011-03-27 14:31:47.000000000 -0400 |
13565 |
++++ linux-2.6.32.39/fs/namespace.c 2011-04-17 15:56:46.000000000 -0400 |
13566 |
@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn |
13567 |
if (!(sb->s_flags & MS_RDONLY)) |
13568 |
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); |
13569 |
@@ -35482,9 +33977,9 @@ diff -urNp linux-2.6.32.38/fs/namespace.c linux-2.6.32.38/fs/namespace.c |
13570 |
read_lock(¤t->fs->lock); |
13571 |
root = current->fs->root; |
13572 |
path_get(¤t->fs->root); |
13573 |
-diff -urNp linux-2.6.32.38/fs/nfs/inode.c linux-2.6.32.38/fs/nfs/inode.c |
13574 |
---- linux-2.6.32.38/fs/nfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
13575 |
-+++ linux-2.6.32.38/fs/nfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
13576 |
+diff -urNp linux-2.6.32.39/fs/nfs/inode.c linux-2.6.32.39/fs/nfs/inode.c |
13577 |
+--- linux-2.6.32.39/fs/nfs/inode.c 2011-03-27 14:31:47.000000000 -0400 |
13578 |
++++ linux-2.6.32.39/fs/nfs/inode.c 2011-04-17 15:56:46.000000000 -0400 |
13579 |
@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st |
13580 |
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); |
13581 |
} |
13582 |
@@ -35505,282 +34000,9 @@ diff -urNp linux-2.6.32.38/fs/nfs/inode.c linux-2.6.32.38/fs/nfs/inode.c |
13583 |
} |
13584 |
|
13585 |
void nfs_fattr_init(struct nfs_fattr *fattr) |
13586 |
-diff -urNp linux-2.6.32.38/fs/nfs/nfs4proc.c linux-2.6.32.38/fs/nfs/nfs4proc.c |
13587 |
---- linux-2.6.32.38/fs/nfs/nfs4proc.c 2011-03-27 14:31:47.000000000 -0400 |
13588 |
-+++ linux-2.6.32.38/fs/nfs/nfs4proc.c 2011-04-17 15:56:46.000000000 -0400 |
13589 |
-@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct |
13590 |
- static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) |
13591 |
- { |
13592 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
13593 |
-- struct nfs4_exception exception = { }; |
13594 |
-+ struct nfs4_exception exception = {0, 0}; |
13595 |
- int err; |
13596 |
- do { |
13597 |
- err = _nfs4_do_open_reclaim(ctx, state); |
13598 |
-@@ -1173,7 +1173,7 @@ static int _nfs4_open_delegation_recall( |
13599 |
- |
13600 |
- int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid) |
13601 |
- { |
13602 |
-- struct nfs4_exception exception = { }; |
13603 |
-+ struct nfs4_exception exception = {0, 0}; |
13604 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
13605 |
- int err; |
13606 |
- do { |
13607 |
-@@ -1493,7 +1493,7 @@ static int _nfs4_open_expired(struct nfs |
13608 |
- static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state) |
13609 |
- { |
13610 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
13611 |
-- struct nfs4_exception exception = { }; |
13612 |
-+ struct nfs4_exception exception = {0, 0}; |
13613 |
- int err; |
13614 |
- |
13615 |
- do { |
13616 |
-@@ -1593,7 +1593,7 @@ out_err: |
13617 |
- |
13618 |
- static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred) |
13619 |
- { |
13620 |
-- struct nfs4_exception exception = { }; |
13621 |
-+ struct nfs4_exception exception = {0, 0}; |
13622 |
- struct nfs4_state *res; |
13623 |
- int status; |
13624 |
- |
13625 |
-@@ -1684,7 +1684,7 @@ static int nfs4_do_setattr(struct inode |
13626 |
- struct nfs4_state *state) |
13627 |
- { |
13628 |
- struct nfs_server *server = NFS_SERVER(inode); |
13629 |
-- struct nfs4_exception exception = { }; |
13630 |
-+ struct nfs4_exception exception = {0, 0}; |
13631 |
- int err; |
13632 |
- do { |
13633 |
- err = nfs4_handle_exception(server, |
13634 |
-@@ -2050,7 +2050,7 @@ static int _nfs4_server_capabilities(str |
13635 |
- |
13636 |
- int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) |
13637 |
- { |
13638 |
-- struct nfs4_exception exception = { }; |
13639 |
-+ struct nfs4_exception exception = {0, 0}; |
13640 |
- int err; |
13641 |
- do { |
13642 |
- err = nfs4_handle_exception(server, |
13643 |
-@@ -2084,7 +2084,7 @@ static int _nfs4_lookup_root(struct nfs_ |
13644 |
- static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, |
13645 |
- struct nfs_fsinfo *info) |
13646 |
- { |
13647 |
-- struct nfs4_exception exception = { }; |
13648 |
-+ struct nfs4_exception exception = {0, 0}; |
13649 |
- int err; |
13650 |
- do { |
13651 |
- err = nfs4_handle_exception(server, |
13652 |
-@@ -2173,7 +2173,7 @@ static int _nfs4_proc_getattr(struct nfs |
13653 |
- |
13654 |
- static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) |
13655 |
- { |
13656 |
-- struct nfs4_exception exception = { }; |
13657 |
-+ struct nfs4_exception exception = {0, 0}; |
13658 |
- int err; |
13659 |
- do { |
13660 |
- err = nfs4_handle_exception(server, |
13661 |
-@@ -2261,7 +2261,7 @@ static int nfs4_proc_lookupfh(struct nfs |
13662 |
- struct qstr *name, struct nfs_fh *fhandle, |
13663 |
- struct nfs_fattr *fattr) |
13664 |
- { |
13665 |
-- struct nfs4_exception exception = { }; |
13666 |
-+ struct nfs4_exception exception = {0, 0}; |
13667 |
- int err; |
13668 |
- do { |
13669 |
- err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); |
13670 |
-@@ -2290,7 +2290,7 @@ static int _nfs4_proc_lookup(struct inod |
13671 |
- |
13672 |
- static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) |
13673 |
- { |
13674 |
-- struct nfs4_exception exception = { }; |
13675 |
-+ struct nfs4_exception exception = {0, 0}; |
13676 |
- int err; |
13677 |
- do { |
13678 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
13679 |
-@@ -2354,7 +2354,7 @@ static int _nfs4_proc_access(struct inod |
13680 |
- |
13681 |
- static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) |
13682 |
- { |
13683 |
-- struct nfs4_exception exception = { }; |
13684 |
-+ struct nfs4_exception exception = {0, 0}; |
13685 |
- int err; |
13686 |
- do { |
13687 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
13688 |
-@@ -2410,7 +2410,7 @@ static int _nfs4_proc_readlink(struct in |
13689 |
- static int nfs4_proc_readlink(struct inode *inode, struct page *page, |
13690 |
- unsigned int pgbase, unsigned int pglen) |
13691 |
- { |
13692 |
-- struct nfs4_exception exception = { }; |
13693 |
-+ struct nfs4_exception exception = {0, 0}; |
13694 |
- int err; |
13695 |
- do { |
13696 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
13697 |
-@@ -2508,7 +2508,7 @@ static int _nfs4_proc_remove(struct inod |
13698 |
- |
13699 |
- static int nfs4_proc_remove(struct inode *dir, struct qstr *name) |
13700 |
- { |
13701 |
-- struct nfs4_exception exception = { }; |
13702 |
-+ struct nfs4_exception exception = {0, 0}; |
13703 |
- int err; |
13704 |
- do { |
13705 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
13706 |
-@@ -2582,7 +2582,7 @@ static int _nfs4_proc_rename(struct inod |
13707 |
- static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, |
13708 |
- struct inode *new_dir, struct qstr *new_name) |
13709 |
- { |
13710 |
-- struct nfs4_exception exception = { }; |
13711 |
-+ struct nfs4_exception exception = {0, 0}; |
13712 |
- int err; |
13713 |
- do { |
13714 |
- err = nfs4_handle_exception(NFS_SERVER(old_dir), |
13715 |
-@@ -2629,7 +2629,7 @@ static int _nfs4_proc_link(struct inode |
13716 |
- |
13717 |
- static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) |
13718 |
- { |
13719 |
-- struct nfs4_exception exception = { }; |
13720 |
-+ struct nfs4_exception exception = {0, 0}; |
13721 |
- int err; |
13722 |
- do { |
13723 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
13724 |
-@@ -2721,7 +2721,7 @@ out: |
13725 |
- static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, |
13726 |
- struct page *page, unsigned int len, struct iattr *sattr) |
13727 |
- { |
13728 |
-- struct nfs4_exception exception = { }; |
13729 |
-+ struct nfs4_exception exception = {0, 0}; |
13730 |
- int err; |
13731 |
- do { |
13732 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
13733 |
-@@ -2752,7 +2752,7 @@ out: |
13734 |
- static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, |
13735 |
- struct iattr *sattr) |
13736 |
- { |
13737 |
-- struct nfs4_exception exception = { }; |
13738 |
-+ struct nfs4_exception exception = {0, 0}; |
13739 |
- int err; |
13740 |
- do { |
13741 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
13742 |
-@@ -2801,7 +2801,7 @@ static int _nfs4_proc_readdir(struct den |
13743 |
- static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, |
13744 |
- u64 cookie, struct page *page, unsigned int count, int plus) |
13745 |
- { |
13746 |
-- struct nfs4_exception exception = { }; |
13747 |
-+ struct nfs4_exception exception = {0, 0}; |
13748 |
- int err; |
13749 |
- do { |
13750 |
- err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), |
13751 |
-@@ -2849,7 +2849,7 @@ out: |
13752 |
- static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, |
13753 |
- struct iattr *sattr, dev_t rdev) |
13754 |
- { |
13755 |
-- struct nfs4_exception exception = { }; |
13756 |
-+ struct nfs4_exception exception = {0, 0}; |
13757 |
- int err; |
13758 |
- do { |
13759 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
13760 |
-@@ -2881,7 +2881,7 @@ static int _nfs4_proc_statfs(struct nfs_ |
13761 |
- |
13762 |
- static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) |
13763 |
- { |
13764 |
-- struct nfs4_exception exception = { }; |
13765 |
-+ struct nfs4_exception exception = {0, 0}; |
13766 |
- int err; |
13767 |
- do { |
13768 |
- err = nfs4_handle_exception(server, |
13769 |
-@@ -2912,7 +2912,7 @@ static int _nfs4_do_fsinfo(struct nfs_se |
13770 |
- |
13771 |
- static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) |
13772 |
- { |
13773 |
-- struct nfs4_exception exception = { }; |
13774 |
-+ struct nfs4_exception exception = {0, 0}; |
13775 |
- int err; |
13776 |
- |
13777 |
- do { |
13778 |
-@@ -2958,7 +2958,7 @@ static int _nfs4_proc_pathconf(struct nf |
13779 |
- static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, |
13780 |
- struct nfs_pathconf *pathconf) |
13781 |
- { |
13782 |
-- struct nfs4_exception exception = { }; |
13783 |
-+ struct nfs4_exception exception = {0, 0}; |
13784 |
- int err; |
13785 |
- |
13786 |
- do { |
13787 |
-@@ -3257,7 +3257,7 @@ out_free: |
13788 |
- |
13789 |
- static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) |
13790 |
- { |
13791 |
-- struct nfs4_exception exception = { }; |
13792 |
-+ struct nfs4_exception exception = {0, 0}; |
13793 |
- ssize_t ret; |
13794 |
- do { |
13795 |
- ret = __nfs4_get_acl_uncached(inode, buf, buflen); |
13796 |
-@@ -3313,7 +3313,7 @@ static int __nfs4_proc_set_acl(struct in |
13797 |
- |
13798 |
- static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) |
13799 |
- { |
13800 |
-- struct nfs4_exception exception = { }; |
13801 |
-+ struct nfs4_exception exception = {0, 0}; |
13802 |
- int err; |
13803 |
- do { |
13804 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
13805 |
-@@ -3578,7 +3578,7 @@ out: |
13806 |
- int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) |
13807 |
- { |
13808 |
- struct nfs_server *server = NFS_SERVER(inode); |
13809 |
-- struct nfs4_exception exception = { }; |
13810 |
-+ struct nfs4_exception exception = {0, 0}; |
13811 |
- int err; |
13812 |
- do { |
13813 |
- err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); |
13814 |
-@@ -3651,7 +3651,7 @@ out: |
13815 |
- |
13816 |
- static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) |
13817 |
- { |
13818 |
-- struct nfs4_exception exception = { }; |
13819 |
-+ struct nfs4_exception exception = {0, 0}; |
13820 |
- int err; |
13821 |
- |
13822 |
- do { |
13823 |
-@@ -4044,7 +4044,7 @@ static int _nfs4_do_setlk(struct nfs4_st |
13824 |
- static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) |
13825 |
- { |
13826 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
13827 |
-- struct nfs4_exception exception = { }; |
13828 |
-+ struct nfs4_exception exception = {0, 0}; |
13829 |
- int err; |
13830 |
- |
13831 |
- do { |
13832 |
-@@ -4062,7 +4062,7 @@ static int nfs4_lock_reclaim(struct nfs4 |
13833 |
- static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) |
13834 |
- { |
13835 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
13836 |
-- struct nfs4_exception exception = { }; |
13837 |
-+ struct nfs4_exception exception = {0, 0}; |
13838 |
- int err; |
13839 |
- |
13840 |
- err = nfs4_set_lock_state(state, request); |
13841 |
-@@ -4120,7 +4120,7 @@ out: |
13842 |
- |
13843 |
- static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) |
13844 |
- { |
13845 |
-- struct nfs4_exception exception = { }; |
13846 |
-+ struct nfs4_exception exception = {0, 0}; |
13847 |
- int err; |
13848 |
- |
13849 |
- do { |
13850 |
-@@ -4180,7 +4180,7 @@ nfs4_proc_lock(struct file *filp, int cm |
13851 |
- int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) |
13852 |
- { |
13853 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
13854 |
-- struct nfs4_exception exception = { }; |
13855 |
-+ struct nfs4_exception exception = {0, 0}; |
13856 |
- int err; |
13857 |
- |
13858 |
- err = nfs4_set_lock_state(state, fl); |
13859 |
-diff -urNp linux-2.6.32.38/fs/nfsd/lockd.c linux-2.6.32.38/fs/nfsd/lockd.c |
13860 |
---- linux-2.6.32.38/fs/nfsd/lockd.c 2011-04-17 17:00:52.000000000 -0400 |
13861 |
-+++ linux-2.6.32.38/fs/nfsd/lockd.c 2011-04-17 17:03:15.000000000 -0400 |
13862 |
+diff -urNp linux-2.6.32.39/fs/nfsd/lockd.c linux-2.6.32.39/fs/nfsd/lockd.c |
13863 |
+--- linux-2.6.32.39/fs/nfsd/lockd.c 2011-04-17 17:00:52.000000000 -0400 |
13864 |
++++ linux-2.6.32.39/fs/nfsd/lockd.c 2011-04-17 17:03:15.000000000 -0400 |
13865 |
@@ -66,7 +66,7 @@ nlm_fclose(struct file *filp) |
13866 |
fput(filp); |
13867 |
} |
13868 |
@@ -35790,9 +34012,9 @@ diff -urNp linux-2.6.32.38/fs/nfsd/lockd.c linux-2.6.32.38/fs/nfsd/lockd.c |
13869 |
.fopen = nlm_fopen, /* open file for locking */ |
13870 |
.fclose = nlm_fclose, /* close file */ |
13871 |
}; |
13872 |
-diff -urNp linux-2.6.32.38/fs/nfsd/vfs.c linux-2.6.32.38/fs/nfsd/vfs.c |
13873 |
---- linux-2.6.32.38/fs/nfsd/vfs.c 2011-03-27 14:31:47.000000000 -0400 |
13874 |
-+++ linux-2.6.32.38/fs/nfsd/vfs.c 2011-04-17 15:56:46.000000000 -0400 |
13875 |
+diff -urNp linux-2.6.32.39/fs/nfsd/vfs.c linux-2.6.32.39/fs/nfsd/vfs.c |
13876 |
+--- linux-2.6.32.39/fs/nfsd/vfs.c 2011-03-27 14:31:47.000000000 -0400 |
13877 |
++++ linux-2.6.32.39/fs/nfsd/vfs.c 2011-04-17 15:56:46.000000000 -0400 |
13878 |
@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st |
13879 |
} else { |
13880 |
oldfs = get_fs(); |
13881 |
@@ -35820,21 +34042,9 @@ diff -urNp linux-2.6.32.38/fs/nfsd/vfs.c linux-2.6.32.38/fs/nfsd/vfs.c |
13882 |
set_fs(oldfs); |
13883 |
|
13884 |
if (host_err < 0) |
13885 |
-diff -urNp linux-2.6.32.38/fs/nls/nls_base.c linux-2.6.32.38/fs/nls/nls_base.c |
13886 |
---- linux-2.6.32.38/fs/nls/nls_base.c 2011-03-27 14:31:47.000000000 -0400 |
13887 |
-+++ linux-2.6.32.38/fs/nls/nls_base.c 2011-04-17 15:56:46.000000000 -0400 |
13888 |
-@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl |
13889 |
- {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, |
13890 |
- {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, |
13891 |
- {0xFE, 0xFC, 5*6, 0x7FFFFFFF, 0x4000000, /* 6 byte sequence */}, |
13892 |
-- {0, /* end of table */} |
13893 |
-+ {0, 0, 0, 0, 0, /* end of table */} |
13894 |
- }; |
13895 |
- |
13896 |
- #define UNICODE_MAX 0x0010ffff |
13897 |
-diff -urNp linux-2.6.32.38/fs/notify/dnotify/dnotify.c linux-2.6.32.38/fs/notify/dnotify/dnotify.c |
13898 |
---- linux-2.6.32.38/fs/notify/dnotify/dnotify.c 2011-03-27 14:31:47.000000000 -0400 |
13899 |
-+++ linux-2.6.32.38/fs/notify/dnotify/dnotify.c 2011-04-17 15:56:46.000000000 -0400 |
13900 |
+diff -urNp linux-2.6.32.39/fs/notify/dnotify/dnotify.c linux-2.6.32.39/fs/notify/dnotify/dnotify.c |
13901 |
+--- linux-2.6.32.39/fs/notify/dnotify/dnotify.c 2011-03-27 14:31:47.000000000 -0400 |
13902 |
++++ linux-2.6.32.39/fs/notify/dnotify/dnotify.c 2011-04-17 15:56:46.000000000 -0400 |
13903 |
@@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsn |
13904 |
kmem_cache_free(dnotify_mark_entry_cache, dnentry); |
13905 |
} |
13906 |
@@ -35844,9 +34054,9 @@ diff -urNp linux-2.6.32.38/fs/notify/dnotify/dnotify.c linux-2.6.32.38/fs/notify |
13907 |
.handle_event = dnotify_handle_event, |
13908 |
.should_send_event = dnotify_should_send_event, |
13909 |
.free_group_priv = NULL, |
13910 |
-diff -urNp linux-2.6.32.38/fs/ntfs/dir.c linux-2.6.32.38/fs/ntfs/dir.c |
13911 |
---- linux-2.6.32.38/fs/ntfs/dir.c 2011-03-27 14:31:47.000000000 -0400 |
13912 |
-+++ linux-2.6.32.38/fs/ntfs/dir.c 2011-04-17 15:56:46.000000000 -0400 |
13913 |
+diff -urNp linux-2.6.32.39/fs/ntfs/dir.c linux-2.6.32.39/fs/ntfs/dir.c |
13914 |
+--- linux-2.6.32.39/fs/ntfs/dir.c 2011-03-27 14:31:47.000000000 -0400 |
13915 |
++++ linux-2.6.32.39/fs/ntfs/dir.c 2011-04-17 15:56:46.000000000 -0400 |
13916 |
@@ -1328,7 +1328,7 @@ find_next_index_buffer: |
13917 |
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & |
13918 |
~(s64)(ndir->itype.index.block_size - 1))); |
13919 |
@@ -35856,9 +34066,9 @@ diff -urNp linux-2.6.32.38/fs/ntfs/dir.c linux-2.6.32.38/fs/ntfs/dir.c |
13920 |
ntfs_error(sb, "Out of bounds check failed. Corrupt directory " |
13921 |
"inode 0x%lx or driver bug.", vdir->i_ino); |
13922 |
goto err_out; |
13923 |
-diff -urNp linux-2.6.32.38/fs/ntfs/file.c linux-2.6.32.38/fs/ntfs/file.c |
13924 |
---- linux-2.6.32.38/fs/ntfs/file.c 2011-03-27 14:31:47.000000000 -0400 |
13925 |
-+++ linux-2.6.32.38/fs/ntfs/file.c 2011-04-17 15:56:46.000000000 -0400 |
13926 |
+diff -urNp linux-2.6.32.39/fs/ntfs/file.c linux-2.6.32.39/fs/ntfs/file.c |
13927 |
+--- linux-2.6.32.39/fs/ntfs/file.c 2011-03-27 14:31:47.000000000 -0400 |
13928 |
++++ linux-2.6.32.39/fs/ntfs/file.c 2011-04-17 15:56:46.000000000 -0400 |
13929 |
@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ |
13930 |
#endif /* NTFS_RW */ |
13931 |
}; |
13932 |
@@ -35868,9 +34078,9 @@ diff -urNp linux-2.6.32.38/fs/ntfs/file.c linux-2.6.32.38/fs/ntfs/file.c |
13933 |
|
13934 |
-const struct inode_operations ntfs_empty_inode_ops = {}; |
13935 |
+const struct inode_operations ntfs_empty_inode_ops __read_only; |
13936 |
-diff -urNp linux-2.6.32.38/fs/ocfs2/cluster/masklog.c linux-2.6.32.38/fs/ocfs2/cluster/masklog.c |
13937 |
---- linux-2.6.32.38/fs/ocfs2/cluster/masklog.c 2011-03-27 14:31:47.000000000 -0400 |
13938 |
-+++ linux-2.6.32.38/fs/ocfs2/cluster/masklog.c 2011-04-17 15:56:46.000000000 -0400 |
13939 |
+diff -urNp linux-2.6.32.39/fs/ocfs2/cluster/masklog.c linux-2.6.32.39/fs/ocfs2/cluster/masklog.c |
13940 |
+--- linux-2.6.32.39/fs/ocfs2/cluster/masklog.c 2011-03-27 14:31:47.000000000 -0400 |
13941 |
++++ linux-2.6.32.39/fs/ocfs2/cluster/masklog.c 2011-04-17 15:56:46.000000000 -0400 |
13942 |
@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject |
13943 |
return mlog_mask_store(mlog_attr->mask, buf, count); |
13944 |
} |
13945 |
@@ -35880,9 +34090,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/cluster/masklog.c linux-2.6.32.38/fs/ocfs2/c |
13946 |
.show = mlog_show, |
13947 |
.store = mlog_store, |
13948 |
}; |
13949 |
-diff -urNp linux-2.6.32.38/fs/ocfs2/localalloc.c linux-2.6.32.38/fs/ocfs2/localalloc.c |
13950 |
---- linux-2.6.32.38/fs/ocfs2/localalloc.c 2011-03-27 14:31:47.000000000 -0400 |
13951 |
-+++ linux-2.6.32.38/fs/ocfs2/localalloc.c 2011-04-17 15:56:46.000000000 -0400 |
13952 |
+diff -urNp linux-2.6.32.39/fs/ocfs2/localalloc.c linux-2.6.32.39/fs/ocfs2/localalloc.c |
13953 |
+--- linux-2.6.32.39/fs/ocfs2/localalloc.c 2011-03-27 14:31:47.000000000 -0400 |
13954 |
++++ linux-2.6.32.39/fs/ocfs2/localalloc.c 2011-04-17 15:56:46.000000000 -0400 |
13955 |
@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo |
13956 |
goto bail; |
13957 |
} |
13958 |
@@ -35892,9 +34102,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/localalloc.c linux-2.6.32.38/fs/ocfs2/locala |
13959 |
|
13960 |
status = 0; |
13961 |
bail: |
13962 |
-diff -urNp linux-2.6.32.38/fs/ocfs2/ocfs2.h linux-2.6.32.38/fs/ocfs2/ocfs2.h |
13963 |
---- linux-2.6.32.38/fs/ocfs2/ocfs2.h 2011-03-27 14:31:47.000000000 -0400 |
13964 |
-+++ linux-2.6.32.38/fs/ocfs2/ocfs2.h 2011-04-17 15:56:46.000000000 -0400 |
13965 |
+diff -urNp linux-2.6.32.39/fs/ocfs2/ocfs2.h linux-2.6.32.39/fs/ocfs2/ocfs2.h |
13966 |
+--- linux-2.6.32.39/fs/ocfs2/ocfs2.h 2011-03-27 14:31:47.000000000 -0400 |
13967 |
++++ linux-2.6.32.39/fs/ocfs2/ocfs2.h 2011-04-17 15:56:46.000000000 -0400 |
13968 |
@@ -217,11 +217,11 @@ enum ocfs2_vol_state |
13969 |
|
13970 |
struct ocfs2_alloc_stats |
13971 |
@@ -35912,9 +34122,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/ocfs2.h linux-2.6.32.38/fs/ocfs2/ocfs2.h |
13972 |
}; |
13973 |
|
13974 |
enum ocfs2_local_alloc_state |
13975 |
-diff -urNp linux-2.6.32.38/fs/ocfs2/suballoc.c linux-2.6.32.38/fs/ocfs2/suballoc.c |
13976 |
---- linux-2.6.32.38/fs/ocfs2/suballoc.c 2011-03-27 14:31:47.000000000 -0400 |
13977 |
-+++ linux-2.6.32.38/fs/ocfs2/suballoc.c 2011-04-17 15:56:46.000000000 -0400 |
13978 |
+diff -urNp linux-2.6.32.39/fs/ocfs2/suballoc.c linux-2.6.32.39/fs/ocfs2/suballoc.c |
13979 |
+--- linux-2.6.32.39/fs/ocfs2/suballoc.c 2011-03-27 14:31:47.000000000 -0400 |
13980 |
++++ linux-2.6.32.39/fs/ocfs2/suballoc.c 2011-04-17 15:56:46.000000000 -0400 |
13981 |
@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s |
13982 |
mlog_errno(status); |
13983 |
goto bail; |
13984 |
@@ -35960,9 +34170,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/suballoc.c linux-2.6.32.38/fs/ocfs2/suballoc |
13985 |
} |
13986 |
} |
13987 |
if (status < 0) { |
13988 |
-diff -urNp linux-2.6.32.38/fs/ocfs2/super.c linux-2.6.32.38/fs/ocfs2/super.c |
13989 |
---- linux-2.6.32.38/fs/ocfs2/super.c 2011-03-27 14:31:47.000000000 -0400 |
13990 |
-+++ linux-2.6.32.38/fs/ocfs2/super.c 2011-04-17 15:56:46.000000000 -0400 |
13991 |
+diff -urNp linux-2.6.32.39/fs/ocfs2/super.c linux-2.6.32.39/fs/ocfs2/super.c |
13992 |
+--- linux-2.6.32.39/fs/ocfs2/super.c 2011-03-27 14:31:47.000000000 -0400 |
13993 |
++++ linux-2.6.32.39/fs/ocfs2/super.c 2011-04-17 15:56:46.000000000 -0400 |
13994 |
@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s |
13995 |
"%10s => GlobalAllocs: %d LocalAllocs: %d " |
13996 |
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", |
13997 |
@@ -35997,9 +34207,9 @@ diff -urNp linux-2.6.32.38/fs/ocfs2/super.c linux-2.6.32.38/fs/ocfs2/super.c |
13998 |
|
13999 |
/* Copy the blockcheck stats from the superblock probe */ |
14000 |
osb->osb_ecc_stats = *stats; |
14001 |
-diff -urNp linux-2.6.32.38/fs/open.c linux-2.6.32.38/fs/open.c |
14002 |
---- linux-2.6.32.38/fs/open.c 2011-03-27 14:31:47.000000000 -0400 |
14003 |
-+++ linux-2.6.32.38/fs/open.c 2011-04-17 15:56:46.000000000 -0400 |
14004 |
+diff -urNp linux-2.6.32.39/fs/open.c linux-2.6.32.39/fs/open.c |
14005 |
+--- linux-2.6.32.39/fs/open.c 2011-03-27 14:31:47.000000000 -0400 |
14006 |
++++ linux-2.6.32.39/fs/open.c 2011-04-17 15:56:46.000000000 -0400 |
14007 |
@@ -275,6 +275,10 @@ static long do_sys_truncate(const char _ |
14008 |
error = locks_verify_truncate(inode, NULL, length); |
14009 |
if (!error) |
14010 |
@@ -36184,9 +34394,9 @@ diff -urNp linux-2.6.32.38/fs/open.c linux-2.6.32.38/fs/open.c |
14011 |
if (IS_ERR(f)) { |
14012 |
put_unused_fd(fd); |
14013 |
fd = PTR_ERR(f); |
14014 |
-diff -urNp linux-2.6.32.38/fs/partitions/ldm.c linux-2.6.32.38/fs/partitions/ldm.c |
14015 |
---- linux-2.6.32.38/fs/partitions/ldm.c 2011-03-27 14:31:47.000000000 -0400 |
14016 |
-+++ linux-2.6.32.38/fs/partitions/ldm.c 2011-04-18 19:31:12.000000000 -0400 |
14017 |
+diff -urNp linux-2.6.32.39/fs/partitions/ldm.c linux-2.6.32.39/fs/partitions/ldm.c |
14018 |
+--- linux-2.6.32.39/fs/partitions/ldm.c 2011-03-27 14:31:47.000000000 -0400 |
14019 |
++++ linux-2.6.32.39/fs/partitions/ldm.c 2011-04-18 19:31:12.000000000 -0400 |
14020 |
@@ -1299,6 +1299,11 @@ static bool ldm_frag_add (const u8 *data |
14021 |
|
14022 |
BUG_ON (!data || !frags); |
14023 |
@@ -36233,9 +34443,9 @@ diff -urNp linux-2.6.32.38/fs/partitions/ldm.c linux-2.6.32.38/fs/partitions/ldm |
14024 |
memcpy (f->data+rec*(size-VBLK_SIZE_HEAD)+VBLK_SIZE_HEAD, data, size); |
14025 |
|
14026 |
return true; |
14027 |
-diff -urNp linux-2.6.32.38/fs/partitions/mac.c linux-2.6.32.38/fs/partitions/mac.c |
14028 |
---- linux-2.6.32.38/fs/partitions/mac.c 2011-03-27 14:31:47.000000000 -0400 |
14029 |
-+++ linux-2.6.32.38/fs/partitions/mac.c 2011-04-17 15:56:46.000000000 -0400 |
14030 |
+diff -urNp linux-2.6.32.39/fs/partitions/mac.c linux-2.6.32.39/fs/partitions/mac.c |
14031 |
+--- linux-2.6.32.39/fs/partitions/mac.c 2011-03-27 14:31:47.000000000 -0400 |
14032 |
++++ linux-2.6.32.39/fs/partitions/mac.c 2011-04-17 15:56:46.000000000 -0400 |
14033 |
@@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio |
14034 |
return 0; /* not a MacOS disk */ |
14035 |
} |
14036 |
@@ -36249,18 +34459,9 @@ diff -urNp linux-2.6.32.38/fs/partitions/mac.c linux-2.6.32.38/fs/partitions/mac |
14037 |
for (slot = 1; slot <= blocks_in_map; ++slot) { |
14038 |
int pos = slot * secsize; |
14039 |
put_dev_sector(sect); |
14040 |
-diff -urNp linux-2.6.32.38/fs/pipe.c linux-2.6.32.38/fs/pipe.c |
14041 |
---- linux-2.6.32.38/fs/pipe.c 2011-03-27 14:31:47.000000000 -0400 |
14042 |
-+++ linux-2.6.32.38/fs/pipe.c 2011-04-17 15:56:46.000000000 -0400 |
14043 |
-@@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const stru |
14044 |
- error = ops->confirm(pipe, buf); |
14045 |
- if (error) { |
14046 |
- if (!ret) |
14047 |
-- ret = error; |
14048 |
-+ error = ret; |
14049 |
- break; |
14050 |
- } |
14051 |
- |
14052 |
+diff -urNp linux-2.6.32.39/fs/pipe.c linux-2.6.32.39/fs/pipe.c |
14053 |
+--- linux-2.6.32.39/fs/pipe.c 2011-03-27 14:31:47.000000000 -0400 |
14054 |
++++ linux-2.6.32.39/fs/pipe.c 2011-04-23 13:37:17.000000000 -0400 |
14055 |
@@ -401,9 +401,9 @@ redo: |
14056 |
} |
14057 |
if (bufs) /* More to do? */ |
14058 |
@@ -36384,9 +34585,9 @@ diff -urNp linux-2.6.32.38/fs/pipe.c linux-2.6.32.38/fs/pipe.c |
14059 |
inode->i_fop = &rdwr_pipefifo_fops; |
14060 |
|
14061 |
/* |
14062 |
-diff -urNp linux-2.6.32.38/fs/proc/array.c linux-2.6.32.38/fs/proc/array.c |
14063 |
---- linux-2.6.32.38/fs/proc/array.c 2011-03-27 14:31:47.000000000 -0400 |
14064 |
-+++ linux-2.6.32.38/fs/proc/array.c 2011-04-17 15:56:46.000000000 -0400 |
14065 |
+diff -urNp linux-2.6.32.39/fs/proc/array.c linux-2.6.32.39/fs/proc/array.c |
14066 |
+--- linux-2.6.32.39/fs/proc/array.c 2011-03-27 14:31:47.000000000 -0400 |
14067 |
++++ linux-2.6.32.39/fs/proc/array.c 2011-04-20 18:18:31.000000000 -0400 |
14068 |
@@ -60,6 +60,7 @@ |
14069 |
#include <linux/tty.h> |
14070 |
#include <linux/string.h> |
14071 |
@@ -36478,7 +34679,7 @@ diff -urNp linux-2.6.32.38/fs/proc/array.c linux-2.6.32.38/fs/proc/array.c |
14072 |
esp, |
14073 |
eip, |
14074 |
/* The signal information here is obsolete. |
14075 |
-@@ -528,3 +578,10 @@ int proc_pid_statm(struct seq_file *m, s |
14076 |
+@@ -528,3 +578,18 @@ int proc_pid_statm(struct seq_file *m, s |
14077 |
|
14078 |
return 0; |
14079 |
} |
14080 |
@@ -36486,12 +34687,20 @@ diff -urNp linux-2.6.32.38/fs/proc/array.c linux-2.6.32.38/fs/proc/array.c |
14081 |
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR |
14082 |
+int proc_pid_ipaddr(struct task_struct *task, char *buffer) |
14083 |
+{ |
14084 |
-+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); |
14085 |
++ u32 curr_ip = 0; |
14086 |
++ unsigned long flags; |
14087 |
++ |
14088 |
++ if (lock_task_sighand(task, &flags)) { |
14089 |
++ curr_ip = task->signal->curr_ip; |
14090 |
++ unlock_task_sighand(task, &flags); |
14091 |
++ } |
14092 |
++ |
14093 |
++ return sprintf(buffer, "%pI4\n", &curr_ip); |
14094 |
+} |
14095 |
+#endif |
14096 |
-diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2.6.32.38/fs/proc/base.c |
14097 |
---- linux-2.6.32.38/fs/proc/base.c 2011-03-27 14:31:47.000000000 -0400 |
14098 |
-+++ linux-2.6.32.38/fs/proc/base.c 2011-04-18 19:27:44.000000000 -0400 |
14099 |
+diff -urNp linux-2.6.32.39/fs/proc/base.c linux-2.6.32.39/fs/proc/base.c |
14100 |
+--- linux-2.6.32.39/fs/proc/base.c 2011-04-22 19:16:29.000000000 -0400 |
14101 |
++++ linux-2.6.32.39/fs/proc/base.c 2011-04-22 19:16:44.000000000 -0400 |
14102 |
@@ -102,6 +102,22 @@ struct pid_entry { |
14103 |
union proc_op op; |
14104 |
}; |
14105 |
@@ -36854,14 +35063,10 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2.6.32.38/fs/proc/base.c |
14106 |
put_task_struct(task); |
14107 |
out: |
14108 |
return result; |
14109 |
-@@ -2806,11 +2929,21 @@ static int proc_pid_fill_cache(struct fi |
14110 |
- /* for the /proc/ directory itself, after non-process stuff has been done */ |
14111 |
- int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) |
14112 |
- { |
14113 |
-- unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; |
14114 |
-- struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); |
14115 |
-+ unsigned int nr; |
14116 |
-+ struct task_struct *reaper; |
14117 |
+@@ -2808,6 +2931,11 @@ int proc_pid_readdir(struct file * filp, |
14118 |
+ { |
14119 |
+ unsigned int nr; |
14120 |
+ struct task_struct *reaper; |
14121 |
+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) |
14122 |
+ const struct cred *tmpcred = current_cred(); |
14123 |
+ const struct cred *itercred; |
14124 |
@@ -36870,15 +35075,7 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2.6.32.38/fs/proc/base.c |
14125 |
struct tgid_iter iter; |
14126 |
struct pid_namespace *ns; |
14127 |
|
14128 |
-+ if (filp->f_pos >= PID_MAX_LIMIT + TGID_OFFSET) |
14129 |
-+ goto out_no_task; |
14130 |
-+ nr = filp->f_pos - FIRST_PROCESS_ENTRY; |
14131 |
-+ |
14132 |
-+ reaper = get_proc_task(filp->f_path.dentry->d_inode); |
14133 |
- if (!reaper) |
14134 |
- goto out_no_task; |
14135 |
- |
14136 |
-@@ -2826,8 +2959,27 @@ int proc_pid_readdir(struct file * filp, |
14137 |
+@@ -2831,8 +2959,27 @@ int proc_pid_readdir(struct file * filp, |
14138 |
for (iter = next_tgid(ns, iter); |
14139 |
iter.task; |
14140 |
iter.tgid += 1, iter = next_tgid(ns, iter)) { |
14141 |
@@ -36907,7 +35104,7 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2.6.32.38/fs/proc/base.c |
14142 |
put_task_struct(iter.task); |
14143 |
goto out; |
14144 |
} |
14145 |
-@@ -2853,7 +3005,7 @@ static const struct pid_entry tid_base_s |
14146 |
+@@ -2858,7 +3005,7 @@ static const struct pid_entry tid_base_s |
14147 |
#ifdef CONFIG_SCHED_DEBUG |
14148 |
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), |
14149 |
#endif |
14150 |
@@ -36916,7 +35113,7 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2.6.32.38/fs/proc/base.c |
14151 |
INF("syscall", S_IRUSR, proc_pid_syscall), |
14152 |
#endif |
14153 |
INF("cmdline", S_IRUGO, proc_pid_cmdline), |
14154 |
-@@ -2877,10 +3029,10 @@ static const struct pid_entry tid_base_s |
14155 |
+@@ -2882,10 +3029,10 @@ static const struct pid_entry tid_base_s |
14156 |
#ifdef CONFIG_SECURITY |
14157 |
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), |
14158 |
#endif |
14159 |
@@ -36929,9 +35126,9 @@ diff -urNp linux-2.6.32.38/fs/proc/base.c linux-2.6.32.38/fs/proc/base.c |
14160 |
ONE("stack", S_IRUSR, proc_pid_stack), |
14161 |
#endif |
14162 |
#ifdef CONFIG_SCHEDSTATS |
14163 |
-diff -urNp linux-2.6.32.38/fs/proc/cmdline.c linux-2.6.32.38/fs/proc/cmdline.c |
14164 |
---- linux-2.6.32.38/fs/proc/cmdline.c 2011-03-27 14:31:47.000000000 -0400 |
14165 |
-+++ linux-2.6.32.38/fs/proc/cmdline.c 2011-04-17 15:56:46.000000000 -0400 |
14166 |
+diff -urNp linux-2.6.32.39/fs/proc/cmdline.c linux-2.6.32.39/fs/proc/cmdline.c |
14167 |
+--- linux-2.6.32.39/fs/proc/cmdline.c 2011-03-27 14:31:47.000000000 -0400 |
14168 |
++++ linux-2.6.32.39/fs/proc/cmdline.c 2011-04-17 15:56:46.000000000 -0400 |
14169 |
@@ -23,7 +23,11 @@ static const struct file_operations cmdl |
14170 |
|
14171 |
static int __init proc_cmdline_init(void) |
14172 |
@@ -36944,9 +35141,9 @@ diff -urNp linux-2.6.32.38/fs/proc/cmdline.c linux-2.6.32.38/fs/proc/cmdline.c |
14173 |
return 0; |
14174 |
} |
14175 |
module_init(proc_cmdline_init); |
14176 |
-diff -urNp linux-2.6.32.38/fs/proc/devices.c linux-2.6.32.38/fs/proc/devices.c |
14177 |
---- linux-2.6.32.38/fs/proc/devices.c 2011-03-27 14:31:47.000000000 -0400 |
14178 |
-+++ linux-2.6.32.38/fs/proc/devices.c 2011-04-17 15:56:46.000000000 -0400 |
14179 |
+diff -urNp linux-2.6.32.39/fs/proc/devices.c linux-2.6.32.39/fs/proc/devices.c |
14180 |
+--- linux-2.6.32.39/fs/proc/devices.c 2011-03-27 14:31:47.000000000 -0400 |
14181 |
++++ linux-2.6.32.39/fs/proc/devices.c 2011-04-17 15:56:46.000000000 -0400 |
14182 |
@@ -64,7 +64,11 @@ static const struct file_operations proc |
14183 |
|
14184 |
static int __init proc_devices_init(void) |
14185 |
@@ -36959,9 +35156,9 @@ diff -urNp linux-2.6.32.38/fs/proc/devices.c linux-2.6.32.38/fs/proc/devices.c |
14186 |
return 0; |
14187 |
} |
14188 |
module_init(proc_devices_init); |
14189 |
-diff -urNp linux-2.6.32.38/fs/proc/inode.c linux-2.6.32.38/fs/proc/inode.c |
14190 |
---- linux-2.6.32.38/fs/proc/inode.c 2011-03-27 14:31:47.000000000 -0400 |
14191 |
-+++ linux-2.6.32.38/fs/proc/inode.c 2011-04-17 15:56:46.000000000 -0400 |
14192 |
+diff -urNp linux-2.6.32.39/fs/proc/inode.c linux-2.6.32.39/fs/proc/inode.c |
14193 |
+--- linux-2.6.32.39/fs/proc/inode.c 2011-03-27 14:31:47.000000000 -0400 |
14194 |
++++ linux-2.6.32.39/fs/proc/inode.c 2011-04-17 15:56:46.000000000 -0400 |
14195 |
@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe |
14196 |
if (de->mode) { |
14197 |
inode->i_mode = de->mode; |
14198 |
@@ -36974,9 +35171,9 @@ diff -urNp linux-2.6.32.38/fs/proc/inode.c linux-2.6.32.38/fs/proc/inode.c |
14199 |
} |
14200 |
if (de->size) |
14201 |
inode->i_size = de->size; |
14202 |
-diff -urNp linux-2.6.32.38/fs/proc/internal.h linux-2.6.32.38/fs/proc/internal.h |
14203 |
---- linux-2.6.32.38/fs/proc/internal.h 2011-03-27 14:31:47.000000000 -0400 |
14204 |
-+++ linux-2.6.32.38/fs/proc/internal.h 2011-04-17 15:56:46.000000000 -0400 |
14205 |
+diff -urNp linux-2.6.32.39/fs/proc/internal.h linux-2.6.32.39/fs/proc/internal.h |
14206 |
+--- linux-2.6.32.39/fs/proc/internal.h 2011-03-27 14:31:47.000000000 -0400 |
14207 |
++++ linux-2.6.32.39/fs/proc/internal.h 2011-04-17 15:56:46.000000000 -0400 |
14208 |
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi |
14209 |
struct pid *pid, struct task_struct *task); |
14210 |
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, |
14211 |
@@ -36987,9 +35184,9 @@ diff -urNp linux-2.6.32.38/fs/proc/internal.h linux-2.6.32.38/fs/proc/internal.h |
14212 |
extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); |
14213 |
|
14214 |
extern const struct file_operations proc_maps_operations; |
14215 |
-diff -urNp linux-2.6.32.38/fs/proc/Kconfig linux-2.6.32.38/fs/proc/Kconfig |
14216 |
---- linux-2.6.32.38/fs/proc/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
14217 |
-+++ linux-2.6.32.38/fs/proc/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
14218 |
+diff -urNp linux-2.6.32.39/fs/proc/Kconfig linux-2.6.32.39/fs/proc/Kconfig |
14219 |
+--- linux-2.6.32.39/fs/proc/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
14220 |
++++ linux-2.6.32.39/fs/proc/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
14221 |
@@ -30,12 +30,12 @@ config PROC_FS |
14222 |
|
14223 |
config PROC_KCORE |
14224 |
@@ -37017,9 +35214,9 @@ diff -urNp linux-2.6.32.38/fs/proc/Kconfig linux-2.6.32.38/fs/proc/Kconfig |
14225 |
bool "Enable /proc page monitoring" if EMBEDDED |
14226 |
help |
14227 |
Various /proc files exist to monitor process memory utilization: |
14228 |
-diff -urNp linux-2.6.32.38/fs/proc/kcore.c linux-2.6.32.38/fs/proc/kcore.c |
14229 |
---- linux-2.6.32.38/fs/proc/kcore.c 2011-03-27 14:31:47.000000000 -0400 |
14230 |
-+++ linux-2.6.32.38/fs/proc/kcore.c 2011-04-17 15:56:46.000000000 -0400 |
14231 |
+diff -urNp linux-2.6.32.39/fs/proc/kcore.c linux-2.6.32.39/fs/proc/kcore.c |
14232 |
+--- linux-2.6.32.39/fs/proc/kcore.c 2011-03-27 14:31:47.000000000 -0400 |
14233 |
++++ linux-2.6.32.39/fs/proc/kcore.c 2011-04-17 15:56:46.000000000 -0400 |
14234 |
@@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use |
14235 |
* the addresses in the elf_phdr on our list. |
14236 |
*/ |
14237 |
@@ -37078,9 +35275,9 @@ diff -urNp linux-2.6.32.38/fs/proc/kcore.c linux-2.6.32.38/fs/proc/kcore.c |
14238 |
if (!capable(CAP_SYS_RAWIO)) |
14239 |
return -EPERM; |
14240 |
if (kcore_need_update) |
14241 |
-diff -urNp linux-2.6.32.38/fs/proc/meminfo.c linux-2.6.32.38/fs/proc/meminfo.c |
14242 |
---- linux-2.6.32.38/fs/proc/meminfo.c 2011-03-27 14:31:47.000000000 -0400 |
14243 |
-+++ linux-2.6.32.38/fs/proc/meminfo.c 2011-04-17 15:56:46.000000000 -0400 |
14244 |
+diff -urNp linux-2.6.32.39/fs/proc/meminfo.c linux-2.6.32.39/fs/proc/meminfo.c |
14245 |
+--- linux-2.6.32.39/fs/proc/meminfo.c 2011-03-27 14:31:47.000000000 -0400 |
14246 |
++++ linux-2.6.32.39/fs/proc/meminfo.c 2011-04-17 15:56:46.000000000 -0400 |
14247 |
@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ |
14248 |
vmi.used >> 10, |
14249 |
vmi.largest_chunk >> 10 |
14250 |
@@ -37090,9 +35287,9 @@ diff -urNp linux-2.6.32.38/fs/proc/meminfo.c linux-2.6.32.38/fs/proc/meminfo.c |
14251 |
#endif |
14252 |
); |
14253 |
|
14254 |
-diff -urNp linux-2.6.32.38/fs/proc/nommu.c linux-2.6.32.38/fs/proc/nommu.c |
14255 |
---- linux-2.6.32.38/fs/proc/nommu.c 2011-03-27 14:31:47.000000000 -0400 |
14256 |
-+++ linux-2.6.32.38/fs/proc/nommu.c 2011-04-17 15:56:46.000000000 -0400 |
14257 |
+diff -urNp linux-2.6.32.39/fs/proc/nommu.c linux-2.6.32.39/fs/proc/nommu.c |
14258 |
+--- linux-2.6.32.39/fs/proc/nommu.c 2011-03-27 14:31:47.000000000 -0400 |
14259 |
++++ linux-2.6.32.39/fs/proc/nommu.c 2011-04-17 15:56:46.000000000 -0400 |
14260 |
@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ |
14261 |
if (len < 1) |
14262 |
len = 1; |
14263 |
@@ -37102,9 +35299,9 @@ diff -urNp linux-2.6.32.38/fs/proc/nommu.c linux-2.6.32.38/fs/proc/nommu.c |
14264 |
} |
14265 |
|
14266 |
seq_putc(m, '\n'); |
14267 |
-diff -urNp linux-2.6.32.38/fs/proc/proc_net.c linux-2.6.32.38/fs/proc/proc_net.c |
14268 |
---- linux-2.6.32.38/fs/proc/proc_net.c 2011-03-27 14:31:47.000000000 -0400 |
14269 |
-+++ linux-2.6.32.38/fs/proc/proc_net.c 2011-04-17 15:56:46.000000000 -0400 |
14270 |
+diff -urNp linux-2.6.32.39/fs/proc/proc_net.c linux-2.6.32.39/fs/proc/proc_net.c |
14271 |
+--- linux-2.6.32.39/fs/proc/proc_net.c 2011-03-27 14:31:47.000000000 -0400 |
14272 |
++++ linux-2.6.32.39/fs/proc/proc_net.c 2011-04-17 15:56:46.000000000 -0400 |
14273 |
@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str |
14274 |
struct task_struct *task; |
14275 |
struct nsproxy *ns; |
14276 |
@@ -37123,9 +35320,9 @@ diff -urNp linux-2.6.32.38/fs/proc/proc_net.c linux-2.6.32.38/fs/proc/proc_net.c |
14277 |
|
14278 |
rcu_read_lock(); |
14279 |
task = pid_task(proc_pid(dir), PIDTYPE_PID); |
14280 |
-diff -urNp linux-2.6.32.38/fs/proc/proc_sysctl.c linux-2.6.32.38/fs/proc/proc_sysctl.c |
14281 |
---- linux-2.6.32.38/fs/proc/proc_sysctl.c 2011-03-27 14:31:47.000000000 -0400 |
14282 |
-+++ linux-2.6.32.38/fs/proc/proc_sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
14283 |
+diff -urNp linux-2.6.32.39/fs/proc/proc_sysctl.c linux-2.6.32.39/fs/proc/proc_sysctl.c |
14284 |
+--- linux-2.6.32.39/fs/proc/proc_sysctl.c 2011-03-27 14:31:47.000000000 -0400 |
14285 |
++++ linux-2.6.32.39/fs/proc/proc_sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
14286 |
@@ -7,6 +7,8 @@ |
14287 |
#include <linux/security.h> |
14288 |
#include "internal.h" |
14289 |
@@ -37165,9 +35362,9 @@ diff -urNp linux-2.6.32.38/fs/proc/proc_sysctl.c linux-2.6.32.38/fs/proc/proc_sy |
14290 |
generic_fillattr(inode, stat); |
14291 |
if (table) |
14292 |
stat->mode = (stat->mode & S_IFMT) | table->mode; |
14293 |
-diff -urNp linux-2.6.32.38/fs/proc/root.c linux-2.6.32.38/fs/proc/root.c |
14294 |
---- linux-2.6.32.38/fs/proc/root.c 2011-03-27 14:31:47.000000000 -0400 |
14295 |
-+++ linux-2.6.32.38/fs/proc/root.c 2011-04-17 15:56:46.000000000 -0400 |
14296 |
+diff -urNp linux-2.6.32.39/fs/proc/root.c linux-2.6.32.39/fs/proc/root.c |
14297 |
+--- linux-2.6.32.39/fs/proc/root.c 2011-03-27 14:31:47.000000000 -0400 |
14298 |
++++ linux-2.6.32.39/fs/proc/root.c 2011-04-17 15:56:46.000000000 -0400 |
14299 |
@@ -134,7 +134,15 @@ void __init proc_root_init(void) |
14300 |
#ifdef CONFIG_PROC_DEVICETREE |
14301 |
proc_device_tree_init(); |
14302 |
@@ -37184,9 +35381,9 @@ diff -urNp linux-2.6.32.38/fs/proc/root.c linux-2.6.32.38/fs/proc/root.c |
14303 |
proc_sys_init(); |
14304 |
} |
14305 |
|
14306 |
-diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c linux-2.6.32.38/fs/proc/task_mmu.c |
14307 |
---- linux-2.6.32.38/fs/proc/task_mmu.c 2011-03-27 14:31:47.000000000 -0400 |
14308 |
-+++ linux-2.6.32.38/fs/proc/task_mmu.c 2011-04-18 19:36:12.000000000 -0400 |
14309 |
+diff -urNp linux-2.6.32.39/fs/proc/task_mmu.c linux-2.6.32.39/fs/proc/task_mmu.c |
14310 |
+--- linux-2.6.32.39/fs/proc/task_mmu.c 2011-03-27 14:31:47.000000000 -0400 |
14311 |
++++ linux-2.6.32.39/fs/proc/task_mmu.c 2011-04-23 13:38:09.000000000 -0400 |
14312 |
@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct |
14313 |
"VmStk:\t%8lu kB\n" |
14314 |
"VmExe:\t%8lu kB\n" |
14315 |
@@ -37279,7 +35476,7 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c linux-2.6.32.38/fs/proc/task_mmu.c |
14316 |
MAJOR(dev), MINOR(dev), ino, &len); |
14317 |
|
14318 |
/* |
14319 |
-@@ -239,16 +259,16 @@ static void show_map_vma(struct seq_file |
14320 |
+@@ -239,7 +259,7 @@ static void show_map_vma(struct seq_file |
14321 |
*/ |
14322 |
if (file) { |
14323 |
pad_len_spaces(m, len); |
14324 |
@@ -37288,10 +35485,9 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c linux-2.6.32.38/fs/proc/task_mmu.c |
14325 |
} else { |
14326 |
const char *name = arch_vma_name(vma); |
14327 |
if (!name) { |
14328 |
- if (mm) { |
14329 |
-- if (vma->vm_start <= mm->brk && |
14330 |
-- vma->vm_end >= mm->start_brk) { |
14331 |
-+ if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { |
14332 |
+@@ -247,8 +267,9 @@ static void show_map_vma(struct seq_file |
14333 |
+ if (vma->vm_start <= mm->brk && |
14334 |
+ vma->vm_end >= mm->start_brk) { |
14335 |
name = "[heap]"; |
14336 |
- } else if (vma->vm_start <= mm->start_stack && |
14337 |
- vma->vm_end >= mm->start_stack) { |
14338 |
@@ -37301,7 +35497,7 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c linux-2.6.32.38/fs/proc/task_mmu.c |
14339 |
name = "[stack]"; |
14340 |
} |
14341 |
} else { |
14342 |
-@@ -391,9 +411,16 @@ static int show_smap(struct seq_file *m, |
14343 |
+@@ -391,9 +412,16 @@ static int show_smap(struct seq_file *m, |
14344 |
}; |
14345 |
|
14346 |
memset(&mss, 0, sizeof mss); |
14347 |
@@ -37321,7 +35517,7 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c linux-2.6.32.38/fs/proc/task_mmu.c |
14348 |
|
14349 |
show_map_vma(m, vma); |
14350 |
|
14351 |
-@@ -409,7 +436,11 @@ static int show_smap(struct seq_file *m, |
14352 |
+@@ -409,7 +437,11 @@ static int show_smap(struct seq_file *m, |
14353 |
"Swap: %8lu kB\n" |
14354 |
"KernelPageSize: %8lu kB\n" |
14355 |
"MMUPageSize: %8lu kB\n", |
14356 |
@@ -37333,9 +35529,9 @@ diff -urNp linux-2.6.32.38/fs/proc/task_mmu.c linux-2.6.32.38/fs/proc/task_mmu.c |
14357 |
mss.resident >> 10, |
14358 |
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)), |
14359 |
mss.shared_clean >> 10, |
14360 |
-diff -urNp linux-2.6.32.38/fs/proc/task_nommu.c linux-2.6.32.38/fs/proc/task_nommu.c |
14361 |
---- linux-2.6.32.38/fs/proc/task_nommu.c 2011-03-27 14:31:47.000000000 -0400 |
14362 |
-+++ linux-2.6.32.38/fs/proc/task_nommu.c 2011-04-17 15:56:46.000000000 -0400 |
14363 |
+diff -urNp linux-2.6.32.39/fs/proc/task_nommu.c linux-2.6.32.39/fs/proc/task_nommu.c |
14364 |
+--- linux-2.6.32.39/fs/proc/task_nommu.c 2011-03-27 14:31:47.000000000 -0400 |
14365 |
++++ linux-2.6.32.39/fs/proc/task_nommu.c 2011-04-17 15:56:46.000000000 -0400 |
14366 |
@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct |
14367 |
else |
14368 |
bytes += kobjsize(mm); |
14369 |
@@ -37354,9 +35550,9 @@ diff -urNp linux-2.6.32.38/fs/proc/task_nommu.c linux-2.6.32.38/fs/proc/task_nom |
14370 |
} |
14371 |
|
14372 |
seq_putc(m, '\n'); |
14373 |
-diff -urNp linux-2.6.32.38/fs/readdir.c linux-2.6.32.38/fs/readdir.c |
14374 |
---- linux-2.6.32.38/fs/readdir.c 2011-03-27 14:31:47.000000000 -0400 |
14375 |
-+++ linux-2.6.32.38/fs/readdir.c 2011-04-17 15:56:46.000000000 -0400 |
14376 |
+diff -urNp linux-2.6.32.39/fs/readdir.c linux-2.6.32.39/fs/readdir.c |
14377 |
+--- linux-2.6.32.39/fs/readdir.c 2011-03-27 14:31:47.000000000 -0400 |
14378 |
++++ linux-2.6.32.39/fs/readdir.c 2011-04-17 15:56:46.000000000 -0400 |
14379 |
@@ -16,6 +16,7 @@ |
14380 |
#include <linux/security.h> |
14381 |
#include <linux/syscalls.h> |
14382 |
@@ -37446,9 +35642,9 @@ diff -urNp linux-2.6.32.38/fs/readdir.c linux-2.6.32.38/fs/readdir.c |
14383 |
buf.count = count; |
14384 |
buf.error = 0; |
14385 |
|
14386 |
-diff -urNp linux-2.6.32.38/fs/reiserfs/do_balan.c linux-2.6.32.38/fs/reiserfs/do_balan.c |
14387 |
---- linux-2.6.32.38/fs/reiserfs/do_balan.c 2011-03-27 14:31:47.000000000 -0400 |
14388 |
-+++ linux-2.6.32.38/fs/reiserfs/do_balan.c 2011-04-17 15:56:46.000000000 -0400 |
14389 |
+diff -urNp linux-2.6.32.39/fs/reiserfs/do_balan.c linux-2.6.32.39/fs/reiserfs/do_balan.c |
14390 |
+--- linux-2.6.32.39/fs/reiserfs/do_balan.c 2011-03-27 14:31:47.000000000 -0400 |
14391 |
++++ linux-2.6.32.39/fs/reiserfs/do_balan.c 2011-04-17 15:56:46.000000000 -0400 |
14392 |
@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, |
14393 |
return; |
14394 |
} |
14395 |
@@ -37458,9 +35654,9 @@ diff -urNp linux-2.6.32.38/fs/reiserfs/do_balan.c linux-2.6.32.38/fs/reiserfs/do |
14396 |
do_balance_starts(tb); |
14397 |
|
14398 |
/* balance leaf returns 0 except if combining L R and S into |
14399 |
-diff -urNp linux-2.6.32.38/fs/reiserfs/item_ops.c linux-2.6.32.38/fs/reiserfs/item_ops.c |
14400 |
---- linux-2.6.32.38/fs/reiserfs/item_ops.c 2011-03-27 14:31:47.000000000 -0400 |
14401 |
-+++ linux-2.6.32.38/fs/reiserfs/item_ops.c 2011-04-17 15:56:46.000000000 -0400 |
14402 |
+diff -urNp linux-2.6.32.39/fs/reiserfs/item_ops.c linux-2.6.32.39/fs/reiserfs/item_ops.c |
14403 |
+--- linux-2.6.32.39/fs/reiserfs/item_ops.c 2011-03-27 14:31:47.000000000 -0400 |
14404 |
++++ linux-2.6.32.39/fs/reiserfs/item_ops.c 2011-04-17 15:56:46.000000000 -0400 |
14405 |
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i |
14406 |
vi->vi_index, vi->vi_type, vi->vi_ih); |
14407 |
} |
14408 |
@@ -37515,9 +35711,9 @@ diff -urNp linux-2.6.32.38/fs/reiserfs/item_ops.c linux-2.6.32.38/fs/reiserfs/it |
14409 |
&stat_data_ops, |
14410 |
&indirect_ops, |
14411 |
&direct_ops, |
14412 |
-diff -urNp linux-2.6.32.38/fs/reiserfs/procfs.c linux-2.6.32.38/fs/reiserfs/procfs.c |
14413 |
---- linux-2.6.32.38/fs/reiserfs/procfs.c 2011-03-27 14:31:47.000000000 -0400 |
14414 |
-+++ linux-2.6.32.38/fs/reiserfs/procfs.c 2011-04-17 15:56:46.000000000 -0400 |
14415 |
+diff -urNp linux-2.6.32.39/fs/reiserfs/procfs.c linux-2.6.32.39/fs/reiserfs/procfs.c |
14416 |
+--- linux-2.6.32.39/fs/reiserfs/procfs.c 2011-03-27 14:31:47.000000000 -0400 |
14417 |
++++ linux-2.6.32.39/fs/reiserfs/procfs.c 2011-04-17 15:56:46.000000000 -0400 |
14418 |
@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m |
14419 |
"SMALL_TAILS " : "NO_TAILS ", |
14420 |
replay_only(sb) ? "REPLAY_ONLY " : "", |
14421 |
@@ -37527,9 +35723,9 @@ diff -urNp linux-2.6.32.38/fs/reiserfs/procfs.c linux-2.6.32.38/fs/reiserfs/proc |
14422 |
SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), |
14423 |
SF(s_do_balance), SF(s_unneeded_left_neighbor), |
14424 |
SF(s_good_search_by_key_reada), SF(s_bmaps), |
14425 |
-diff -urNp linux-2.6.32.38/fs/select.c linux-2.6.32.38/fs/select.c |
14426 |
---- linux-2.6.32.38/fs/select.c 2011-03-27 14:31:47.000000000 -0400 |
14427 |
-+++ linux-2.6.32.38/fs/select.c 2011-04-17 15:56:46.000000000 -0400 |
14428 |
+diff -urNp linux-2.6.32.39/fs/select.c linux-2.6.32.39/fs/select.c |
14429 |
+--- linux-2.6.32.39/fs/select.c 2011-03-27 14:31:47.000000000 -0400 |
14430 |
++++ linux-2.6.32.39/fs/select.c 2011-04-17 15:56:46.000000000 -0400 |
14431 |
@@ -20,6 +20,7 @@ |
14432 |
#include <linux/module.h> |
14433 |
#include <linux/slab.h> |
14434 |
@@ -37546,9 +35742,9 @@ diff -urNp linux-2.6.32.38/fs/select.c linux-2.6.32.38/fs/select.c |
14435 |
if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) |
14436 |
return -EINVAL; |
14437 |
|
14438 |
-diff -urNp linux-2.6.32.38/fs/seq_file.c linux-2.6.32.38/fs/seq_file.c |
14439 |
---- linux-2.6.32.38/fs/seq_file.c 2011-03-27 14:31:47.000000000 -0400 |
14440 |
-+++ linux-2.6.32.38/fs/seq_file.c 2011-04-17 15:56:46.000000000 -0400 |
14441 |
+diff -urNp linux-2.6.32.39/fs/seq_file.c linux-2.6.32.39/fs/seq_file.c |
14442 |
+--- linux-2.6.32.39/fs/seq_file.c 2011-03-27 14:31:47.000000000 -0400 |
14443 |
++++ linux-2.6.32.39/fs/seq_file.c 2011-04-17 15:56:46.000000000 -0400 |
14444 |
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, |
14445 |
return 0; |
14446 |
} |
14447 |
@@ -37589,9 +35785,9 @@ diff -urNp linux-2.6.32.38/fs/seq_file.c linux-2.6.32.38/fs/seq_file.c |
14448 |
if (!m->buf) |
14449 |
goto Enomem; |
14450 |
m->count = 0; |
14451 |
-diff -urNp linux-2.6.32.38/fs/smbfs/symlink.c linux-2.6.32.38/fs/smbfs/symlink.c |
14452 |
---- linux-2.6.32.38/fs/smbfs/symlink.c 2011-03-27 14:31:47.000000000 -0400 |
14453 |
-+++ linux-2.6.32.38/fs/smbfs/symlink.c 2011-04-17 15:56:46.000000000 -0400 |
14454 |
+diff -urNp linux-2.6.32.39/fs/smbfs/symlink.c linux-2.6.32.39/fs/smbfs/symlink.c |
14455 |
+--- linux-2.6.32.39/fs/smbfs/symlink.c 2011-03-27 14:31:47.000000000 -0400 |
14456 |
++++ linux-2.6.32.39/fs/smbfs/symlink.c 2011-04-17 15:56:46.000000000 -0400 |
14457 |
@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent |
14458 |
|
14459 |
static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) |
14460 |
@@ -37601,9 +35797,9 @@ diff -urNp linux-2.6.32.38/fs/smbfs/symlink.c linux-2.6.32.38/fs/smbfs/symlink.c |
14461 |
if (!IS_ERR(s)) |
14462 |
__putname(s); |
14463 |
} |
14464 |
-diff -urNp linux-2.6.32.38/fs/splice.c linux-2.6.32.38/fs/splice.c |
14465 |
---- linux-2.6.32.38/fs/splice.c 2011-03-27 14:31:47.000000000 -0400 |
14466 |
-+++ linux-2.6.32.38/fs/splice.c 2011-04-17 15:56:46.000000000 -0400 |
14467 |
+diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c |
14468 |
+--- linux-2.6.32.39/fs/splice.c 2011-03-27 14:31:47.000000000 -0400 |
14469 |
++++ linux-2.6.32.39/fs/splice.c 2011-04-17 15:56:46.000000000 -0400 |
14470 |
@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode |
14471 |
pipe_lock(pipe); |
14472 |
|
14473 |
@@ -37742,9 +35938,9 @@ diff -urNp linux-2.6.32.38/fs/splice.c linux-2.6.32.38/fs/splice.c |
14474 |
ret = -EAGAIN; |
14475 |
|
14476 |
pipe_unlock(ipipe); |
14477 |
-diff -urNp linux-2.6.32.38/fs/sysfs/file.c linux-2.6.32.38/fs/sysfs/file.c |
14478 |
---- linux-2.6.32.38/fs/sysfs/file.c 2011-03-27 14:31:47.000000000 -0400 |
14479 |
-+++ linux-2.6.32.38/fs/sysfs/file.c 2011-04-17 15:56:46.000000000 -0400 |
14480 |
+diff -urNp linux-2.6.32.39/fs/sysfs/file.c linux-2.6.32.39/fs/sysfs/file.c |
14481 |
+--- linux-2.6.32.39/fs/sysfs/file.c 2011-03-27 14:31:47.000000000 -0400 |
14482 |
++++ linux-2.6.32.39/fs/sysfs/file.c 2011-04-17 15:56:46.000000000 -0400 |
14483 |
@@ -53,7 +53,7 @@ struct sysfs_buffer { |
14484 |
size_t count; |
14485 |
loff_t pos; |
14486 |
@@ -37781,9 +35977,9 @@ diff -urNp linux-2.6.32.38/fs/sysfs/file.c linux-2.6.32.38/fs/sysfs/file.c |
14487 |
int error = -EACCES; |
14488 |
char *p; |
14489 |
|
14490 |
-diff -urNp linux-2.6.32.38/fs/sysfs/mount.c linux-2.6.32.38/fs/sysfs/mount.c |
14491 |
---- linux-2.6.32.38/fs/sysfs/mount.c 2011-03-27 14:31:47.000000000 -0400 |
14492 |
-+++ linux-2.6.32.38/fs/sysfs/mount.c 2011-04-17 15:56:46.000000000 -0400 |
14493 |
+diff -urNp linux-2.6.32.39/fs/sysfs/mount.c linux-2.6.32.39/fs/sysfs/mount.c |
14494 |
+--- linux-2.6.32.39/fs/sysfs/mount.c 2011-03-27 14:31:47.000000000 -0400 |
14495 |
++++ linux-2.6.32.39/fs/sysfs/mount.c 2011-04-17 15:56:46.000000000 -0400 |
14496 |
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = { |
14497 |
.s_name = "", |
14498 |
.s_count = ATOMIC_INIT(1), |
14499 |
@@ -37796,9 +35992,9 @@ diff -urNp linux-2.6.32.38/fs/sysfs/mount.c linux-2.6.32.38/fs/sysfs/mount.c |
14500 |
.s_ino = 1, |
14501 |
}; |
14502 |
|
14503 |
-diff -urNp linux-2.6.32.38/fs/sysfs/symlink.c linux-2.6.32.38/fs/sysfs/symlink.c |
14504 |
---- linux-2.6.32.38/fs/sysfs/symlink.c 2011-03-27 14:31:47.000000000 -0400 |
14505 |
-+++ linux-2.6.32.38/fs/sysfs/symlink.c 2011-04-17 15:56:46.000000000 -0400 |
14506 |
+diff -urNp linux-2.6.32.39/fs/sysfs/symlink.c linux-2.6.32.39/fs/sysfs/symlink.c |
14507 |
+--- linux-2.6.32.39/fs/sysfs/symlink.c 2011-03-27 14:31:47.000000000 -0400 |
14508 |
++++ linux-2.6.32.39/fs/sysfs/symlink.c 2011-04-17 15:56:46.000000000 -0400 |
14509 |
@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de |
14510 |
|
14511 |
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) |
14512 |
@@ -37808,35 +36004,9 @@ diff -urNp linux-2.6.32.38/fs/sysfs/symlink.c linux-2.6.32.38/fs/sysfs/symlink.c |
14513 |
if (!IS_ERR(page)) |
14514 |
free_page((unsigned long)page); |
14515 |
} |
14516 |
-diff -urNp linux-2.6.32.38/fs/ubifs/debug.c linux-2.6.32.38/fs/ubifs/debug.c |
14517 |
---- linux-2.6.32.38/fs/ubifs/debug.c 2011-04-17 17:00:52.000000000 -0400 |
14518 |
-+++ linux-2.6.32.38/fs/ubifs/debug.c 2011-04-17 17:03:15.000000000 -0400 |
14519 |
-@@ -2691,19 +2691,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf |
14520 |
- } |
14521 |
- |
14522 |
- fname = "dump_lprops"; |
14523 |
-- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
14524 |
-+ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
14525 |
- if (IS_ERR(dent)) |
14526 |
- goto out_remove; |
14527 |
- d->dfs_dump_lprops = dent; |
14528 |
- |
14529 |
- fname = "dump_budg"; |
14530 |
-- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
14531 |
-+ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
14532 |
- if (IS_ERR(dent)) |
14533 |
- goto out_remove; |
14534 |
- d->dfs_dump_budg = dent; |
14535 |
- |
14536 |
- fname = "dump_tnc"; |
14537 |
-- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
14538 |
-+ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
14539 |
- if (IS_ERR(dent)) |
14540 |
- goto out_remove; |
14541 |
- d->dfs_dump_tnc = dent; |
14542 |
-diff -urNp linux-2.6.32.38/fs/udf/balloc.c linux-2.6.32.38/fs/udf/balloc.c |
14543 |
---- linux-2.6.32.38/fs/udf/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
14544 |
-+++ linux-2.6.32.38/fs/udf/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
14545 |
+diff -urNp linux-2.6.32.39/fs/udf/balloc.c linux-2.6.32.39/fs/udf/balloc.c |
14546 |
+--- linux-2.6.32.39/fs/udf/balloc.c 2011-03-27 14:31:47.000000000 -0400 |
14547 |
++++ linux-2.6.32.39/fs/udf/balloc.c 2011-04-17 15:56:46.000000000 -0400 |
14548 |
@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc |
14549 |
|
14550 |
mutex_lock(&sbi->s_alloc_mutex); |
14551 |
@@ -37859,20 +36029,9 @@ diff -urNp linux-2.6.32.38/fs/udf/balloc.c linux-2.6.32.38/fs/udf/balloc.c |
14552 |
udf_debug("%d < %d || %d + %d > %d\n", |
14553 |
bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, |
14554 |
partmap->s_partition_len); |
14555 |
-diff -urNp linux-2.6.32.38/fs/udf/misc.c linux-2.6.32.38/fs/udf/misc.c |
14556 |
---- linux-2.6.32.38/fs/udf/misc.c 2011-03-27 14:31:47.000000000 -0400 |
14557 |
-+++ linux-2.6.32.38/fs/udf/misc.c 2011-04-17 15:56:46.000000000 -0400 |
14558 |
-@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat |
14559 |
- iinfo->i_lenEAttr += size; |
14560 |
- return (struct genericFormat *)&ea[offset]; |
14561 |
- } |
14562 |
-- if (loc & 0x02) |
14563 |
-- ; |
14564 |
-+ if (loc & 0x02) { |
14565 |
-+ } |
14566 |
- |
14567 |
- return NULL; |
14568 |
- } |
14569 |
+diff -urNp linux-2.6.32.39/fs/udf/misc.c linux-2.6.32.39/fs/udf/misc.c |
14570 |
+--- linux-2.6.32.39/fs/udf/misc.c 2011-03-27 14:31:47.000000000 -0400 |
14571 |
++++ linux-2.6.32.39/fs/udf/misc.c 2011-04-23 12:56:11.000000000 -0400 |
14572 |
@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id |
14573 |
|
14574 |
u8 udf_tag_checksum(const struct tag *t) |
14575 |
@@ -37882,21 +36041,9 @@ diff -urNp linux-2.6.32.38/fs/udf/misc.c linux-2.6.32.38/fs/udf/misc.c |
14576 |
u8 checksum = 0; |
14577 |
int i; |
14578 |
for (i = 0; i < sizeof(struct tag); ++i) |
14579 |
-diff -urNp linux-2.6.32.38/fs/udf/udfdecl.h linux-2.6.32.38/fs/udf/udfdecl.h |
14580 |
---- linux-2.6.32.38/fs/udf/udfdecl.h 2011-03-27 14:31:47.000000000 -0400 |
14581 |
-+++ linux-2.6.32.38/fs/udf/udfdecl.h 2011-04-17 15:56:46.000000000 -0400 |
14582 |
-@@ -26,7 +26,7 @@ do { \ |
14583 |
- printk(f, ##a); \ |
14584 |
- } while (0) |
14585 |
- #else |
14586 |
--#define udf_debug(f, a...) /**/ |
14587 |
-+#define udf_debug(f, a...) do {} while (0) |
14588 |
- #endif |
14589 |
- |
14590 |
- #define udf_info(f, a...) \ |
14591 |
-diff -urNp linux-2.6.32.38/fs/utimes.c linux-2.6.32.38/fs/utimes.c |
14592 |
---- linux-2.6.32.38/fs/utimes.c 2011-03-27 14:31:47.000000000 -0400 |
14593 |
-+++ linux-2.6.32.38/fs/utimes.c 2011-04-17 15:56:46.000000000 -0400 |
14594 |
+diff -urNp linux-2.6.32.39/fs/utimes.c linux-2.6.32.39/fs/utimes.c |
14595 |
+--- linux-2.6.32.39/fs/utimes.c 2011-03-27 14:31:47.000000000 -0400 |
14596 |
++++ linux-2.6.32.39/fs/utimes.c 2011-04-17 15:56:46.000000000 -0400 |
14597 |
@@ -1,6 +1,7 @@ |
14598 |
#include <linux/compiler.h> |
14599 |
#include <linux/file.h> |
14600 |
@@ -37918,9 +36065,9 @@ diff -urNp linux-2.6.32.38/fs/utimes.c linux-2.6.32.38/fs/utimes.c |
14601 |
mutex_lock(&inode->i_mutex); |
14602 |
error = notify_change(path->dentry, &newattrs); |
14603 |
mutex_unlock(&inode->i_mutex); |
14604 |
-diff -urNp linux-2.6.32.38/fs/xattr_acl.c linux-2.6.32.38/fs/xattr_acl.c |
14605 |
---- linux-2.6.32.38/fs/xattr_acl.c 2011-03-27 14:31:47.000000000 -0400 |
14606 |
-+++ linux-2.6.32.38/fs/xattr_acl.c 2011-04-17 15:56:46.000000000 -0400 |
14607 |
+diff -urNp linux-2.6.32.39/fs/xattr_acl.c linux-2.6.32.39/fs/xattr_acl.c |
14608 |
+--- linux-2.6.32.39/fs/xattr_acl.c 2011-03-27 14:31:47.000000000 -0400 |
14609 |
++++ linux-2.6.32.39/fs/xattr_acl.c 2011-04-17 15:56:46.000000000 -0400 |
14610 |
@@ -17,8 +17,8 @@ |
14611 |
struct posix_acl * |
14612 |
posix_acl_from_xattr(const void *value, size_t size) |
14613 |
@@ -37932,9 +36079,9 @@ diff -urNp linux-2.6.32.38/fs/xattr_acl.c linux-2.6.32.38/fs/xattr_acl.c |
14614 |
int count; |
14615 |
struct posix_acl *acl; |
14616 |
struct posix_acl_entry *acl_e; |
14617 |
-diff -urNp linux-2.6.32.38/fs/xattr.c linux-2.6.32.38/fs/xattr.c |
14618 |
---- linux-2.6.32.38/fs/xattr.c 2011-03-27 14:31:47.000000000 -0400 |
14619 |
-+++ linux-2.6.32.38/fs/xattr.c 2011-04-17 15:56:46.000000000 -0400 |
14620 |
+diff -urNp linux-2.6.32.39/fs/xattr.c linux-2.6.32.39/fs/xattr.c |
14621 |
+--- linux-2.6.32.39/fs/xattr.c 2011-03-27 14:31:47.000000000 -0400 |
14622 |
++++ linux-2.6.32.39/fs/xattr.c 2011-04-17 15:56:46.000000000 -0400 |
14623 |
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); |
14624 |
* Extended attribute SET operations |
14625 |
*/ |
14626 |
@@ -37997,9 +36144,9 @@ diff -urNp linux-2.6.32.38/fs/xattr.c linux-2.6.32.38/fs/xattr.c |
14627 |
mnt_drop_write(f->f_path.mnt); |
14628 |
} |
14629 |
fput(f); |
14630 |
-diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c |
14631 |
---- linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-27 14:31:47.000000000 -0400 |
14632 |
-+++ linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:56:46.000000000 -0400 |
14633 |
+diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c |
14634 |
+--- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-27 14:31:47.000000000 -0400 |
14635 |
++++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:56:46.000000000 -0400 |
14636 |
@@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1( |
14637 |
xfs_fsop_geom_t fsgeo; |
14638 |
int error; |
14639 |
@@ -38008,9 +36155,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.38/fs/xfs |
14640 |
error = xfs_fs_geometry(mp, &fsgeo, 3); |
14641 |
if (error) |
14642 |
return -error; |
14643 |
-diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c |
14644 |
---- linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 17:00:52.000000000 -0400 |
14645 |
-+++ linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:07:09.000000000 -0400 |
14646 |
+diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c |
14647 |
+--- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 17:00:52.000000000 -0400 |
14648 |
++++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:07:09.000000000 -0400 |
14649 |
@@ -134,7 +134,7 @@ xfs_find_handle( |
14650 |
} |
14651 |
|
14652 |
@@ -38038,9 +36185,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.38/fs/xfs/l |
14653 |
int error; |
14654 |
|
14655 |
error = xfs_fs_geometry(mp, &fsgeo, 3); |
14656 |
-diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c |
14657 |
---- linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c 2011-03-27 14:31:47.000000000 -0400 |
14658 |
-+++ linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:56:46.000000000 -0400 |
14659 |
+diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c |
14660 |
+--- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c 2011-03-27 14:31:47.000000000 -0400 |
14661 |
++++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:56:46.000000000 -0400 |
14662 |
@@ -468,7 +468,7 @@ xfs_vn_put_link( |
14663 |
struct nameidata *nd, |
14664 |
void *p) |
14665 |
@@ -38050,9 +36197,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.38/fs/xfs/li |
14666 |
|
14667 |
if (!IS_ERR(s)) |
14668 |
kfree(s); |
14669 |
-diff -urNp linux-2.6.32.38/fs/xfs/xfs_bmap.c linux-2.6.32.38/fs/xfs/xfs_bmap.c |
14670 |
---- linux-2.6.32.38/fs/xfs/xfs_bmap.c 2011-03-27 14:31:47.000000000 -0400 |
14671 |
-+++ linux-2.6.32.38/fs/xfs/xfs_bmap.c 2011-04-17 15:56:46.000000000 -0400 |
14672 |
+diff -urNp linux-2.6.32.39/fs/xfs/xfs_bmap.c linux-2.6.32.39/fs/xfs/xfs_bmap.c |
14673 |
+--- linux-2.6.32.39/fs/xfs/xfs_bmap.c 2011-03-27 14:31:47.000000000 -0400 |
14674 |
++++ linux-2.6.32.39/fs/xfs/xfs_bmap.c 2011-04-17 15:56:46.000000000 -0400 |
14675 |
@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( |
14676 |
int nmap, |
14677 |
int ret_nmap); |
14678 |
@@ -38062,9 +36209,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/xfs_bmap.c linux-2.6.32.38/fs/xfs/xfs_bmap.c |
14679 |
#endif /* DEBUG */ |
14680 |
|
14681 |
#if defined(XFS_RW_TRACE) |
14682 |
-diff -urNp linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c |
14683 |
---- linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c 2011-03-27 14:31:47.000000000 -0400 |
14684 |
-+++ linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:07:30.000000000 -0400 |
14685 |
+diff -urNp linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c |
14686 |
+--- linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c 2011-03-27 14:31:47.000000000 -0400 |
14687 |
++++ linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:07:30.000000000 -0400 |
14688 |
@@ -779,7 +779,15 @@ xfs_dir2_sf_getdents( |
14689 |
} |
14690 |
|
14691 |
@@ -38082,9 +36229,9 @@ diff -urNp linux-2.6.32.38/fs/xfs/xfs_dir2_sf.c linux-2.6.32.38/fs/xfs/xfs_dir2_ |
14692 |
off & 0x7fffffff, ino, DT_UNKNOWN)) { |
14693 |
*offset = off & 0x7fffffff; |
14694 |
return 0; |
14695 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_alloc.c linux-2.6.32.38/grsecurity/gracl_alloc.c |
14696 |
---- linux-2.6.32.38/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 |
14697 |
-+++ linux-2.6.32.38/grsecurity/gracl_alloc.c 2011-04-17 15:56:46.000000000 -0400 |
14698 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_alloc.c linux-2.6.32.39/grsecurity/gracl_alloc.c |
14699 |
+--- linux-2.6.32.39/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 |
14700 |
++++ linux-2.6.32.39/grsecurity/gracl_alloc.c 2011-04-17 15:56:46.000000000 -0400 |
14701 |
@@ -0,0 +1,105 @@ |
14702 |
+#include <linux/kernel.h> |
14703 |
+#include <linux/mm.h> |
14704 |
@@ -38191,9 +36338,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_alloc.c linux-2.6.32.38/grsecurity/g |
14705 |
+ else |
14706 |
+ return 1; |
14707 |
+} |
14708 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl.c linux-2.6.32.38/grsecurity/gracl.c |
14709 |
---- linux-2.6.32.38/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 |
14710 |
-+++ linux-2.6.32.38/grsecurity/gracl.c 2011-04-17 15:56:46.000000000 -0400 |
14711 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl.c linux-2.6.32.39/grsecurity/gracl.c |
14712 |
+--- linux-2.6.32.39/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 |
14713 |
++++ linux-2.6.32.39/grsecurity/gracl.c 2011-04-17 15:56:46.000000000 -0400 |
14714 |
@@ -0,0 +1,4050 @@ |
14715 |
+#include <linux/kernel.h> |
14716 |
+#include <linux/module.h> |
14717 |
@@ -42245,9 +40392,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl.c linux-2.6.32.38/grsecurity/gracl.c |
14718 |
+EXPORT_SYMBOL(gr_check_group_change); |
14719 |
+#endif |
14720 |
+ |
14721 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_cap.c linux-2.6.32.38/grsecurity/gracl_cap.c |
14722 |
---- linux-2.6.32.38/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 |
14723 |
-+++ linux-2.6.32.38/grsecurity/gracl_cap.c 2011-04-17 15:56:46.000000000 -0400 |
14724 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_cap.c linux-2.6.32.39/grsecurity/gracl_cap.c |
14725 |
+--- linux-2.6.32.39/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 |
14726 |
++++ linux-2.6.32.39/grsecurity/gracl_cap.c 2011-04-17 15:56:46.000000000 -0400 |
14727 |
@@ -0,0 +1,138 @@ |
14728 |
+#include <linux/kernel.h> |
14729 |
+#include <linux/module.h> |
14730 |
@@ -42387,9 +40534,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_cap.c linux-2.6.32.38/grsecurity/gra |
14731 |
+ return 0; |
14732 |
+} |
14733 |
+ |
14734 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_fs.c linux-2.6.32.38/grsecurity/gracl_fs.c |
14735 |
---- linux-2.6.32.38/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 |
14736 |
-+++ linux-2.6.32.38/grsecurity/gracl_fs.c 2011-04-17 15:56:46.000000000 -0400 |
14737 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_fs.c linux-2.6.32.39/grsecurity/gracl_fs.c |
14738 |
+--- linux-2.6.32.39/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 |
14739 |
++++ linux-2.6.32.39/grsecurity/gracl_fs.c 2011-04-17 15:56:46.000000000 -0400 |
14740 |
@@ -0,0 +1,431 @@ |
14741 |
+#include <linux/kernel.h> |
14742 |
+#include <linux/sched.h> |
14743 |
@@ -42822,9 +40969,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_fs.c linux-2.6.32.38/grsecurity/grac |
14744 |
+ |
14745 |
+ return 0; |
14746 |
+} |
14747 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_ip.c linux-2.6.32.38/grsecurity/gracl_ip.c |
14748 |
---- linux-2.6.32.38/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 |
14749 |
-+++ linux-2.6.32.38/grsecurity/gracl_ip.c 2011-04-17 15:56:46.000000000 -0400 |
14750 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_ip.c linux-2.6.32.39/grsecurity/gracl_ip.c |
14751 |
+--- linux-2.6.32.39/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 |
14752 |
++++ linux-2.6.32.39/grsecurity/gracl_ip.c 2011-04-17 15:56:46.000000000 -0400 |
14753 |
@@ -0,0 +1,382 @@ |
14754 |
+#include <linux/kernel.h> |
14755 |
+#include <asm/uaccess.h> |
14756 |
@@ -43208,9 +41355,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_ip.c linux-2.6.32.38/grsecurity/grac |
14757 |
+ |
14758 |
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); |
14759 |
+} |
14760 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_learn.c linux-2.6.32.38/grsecurity/gracl_learn.c |
14761 |
---- linux-2.6.32.38/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 |
14762 |
-+++ linux-2.6.32.38/grsecurity/gracl_learn.c 2011-04-17 15:56:46.000000000 -0400 |
14763 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_learn.c linux-2.6.32.39/grsecurity/gracl_learn.c |
14764 |
+--- linux-2.6.32.39/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 |
14765 |
++++ linux-2.6.32.39/grsecurity/gracl_learn.c 2011-04-17 15:56:46.000000000 -0400 |
14766 |
@@ -0,0 +1,211 @@ |
14767 |
+#include <linux/kernel.h> |
14768 |
+#include <linux/mm.h> |
14769 |
@@ -43423,9 +41570,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_learn.c linux-2.6.32.38/grsecurity/g |
14770 |
+ .release = close_learn, |
14771 |
+ .poll = poll_learn, |
14772 |
+}; |
14773 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_res.c linux-2.6.32.38/grsecurity/gracl_res.c |
14774 |
---- linux-2.6.32.38/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 |
14775 |
-+++ linux-2.6.32.38/grsecurity/gracl_res.c 2011-04-17 15:56:46.000000000 -0400 |
14776 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_res.c linux-2.6.32.39/grsecurity/gracl_res.c |
14777 |
+--- linux-2.6.32.39/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 |
14778 |
++++ linux-2.6.32.39/grsecurity/gracl_res.c 2011-04-17 15:56:46.000000000 -0400 |
14779 |
@@ -0,0 +1,67 @@ |
14780 |
+#include <linux/kernel.h> |
14781 |
+#include <linux/sched.h> |
14782 |
@@ -43494,9 +41641,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_res.c linux-2.6.32.38/grsecurity/gra |
14783 |
+ rcu_read_unlock(); |
14784 |
+ return; |
14785 |
+} |
14786 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_segv.c linux-2.6.32.38/grsecurity/gracl_segv.c |
14787 |
---- linux-2.6.32.38/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 |
14788 |
-+++ linux-2.6.32.38/grsecurity/gracl_segv.c 2011-04-17 15:56:46.000000000 -0400 |
14789 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_segv.c linux-2.6.32.39/grsecurity/gracl_segv.c |
14790 |
+--- linux-2.6.32.39/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 |
14791 |
++++ linux-2.6.32.39/grsecurity/gracl_segv.c 2011-04-17 15:56:46.000000000 -0400 |
14792 |
@@ -0,0 +1,284 @@ |
14793 |
+#include <linux/kernel.h> |
14794 |
+#include <linux/mm.h> |
14795 |
@@ -43782,9 +41929,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_segv.c linux-2.6.32.38/grsecurity/gr |
14796 |
+ |
14797 |
+ return; |
14798 |
+} |
14799 |
-diff -urNp linux-2.6.32.38/grsecurity/gracl_shm.c linux-2.6.32.38/grsecurity/gracl_shm.c |
14800 |
---- linux-2.6.32.38/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 |
14801 |
-+++ linux-2.6.32.38/grsecurity/gracl_shm.c 2011-04-17 15:56:46.000000000 -0400 |
14802 |
+diff -urNp linux-2.6.32.39/grsecurity/gracl_shm.c linux-2.6.32.39/grsecurity/gracl_shm.c |
14803 |
+--- linux-2.6.32.39/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 |
14804 |
++++ linux-2.6.32.39/grsecurity/gracl_shm.c 2011-04-17 15:56:46.000000000 -0400 |
14805 |
@@ -0,0 +1,40 @@ |
14806 |
+#include <linux/kernel.h> |
14807 |
+#include <linux/mm.h> |
14808 |
@@ -43826,9 +41973,9 @@ diff -urNp linux-2.6.32.38/grsecurity/gracl_shm.c linux-2.6.32.38/grsecurity/gra |
14809 |
+ |
14810 |
+ return 1; |
14811 |
+} |
14812 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_chdir.c linux-2.6.32.38/grsecurity/grsec_chdir.c |
14813 |
---- linux-2.6.32.38/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 |
14814 |
-+++ linux-2.6.32.38/grsecurity/grsec_chdir.c 2011-04-17 15:56:46.000000000 -0400 |
14815 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_chdir.c linux-2.6.32.39/grsecurity/grsec_chdir.c |
14816 |
+--- linux-2.6.32.39/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 |
14817 |
++++ linux-2.6.32.39/grsecurity/grsec_chdir.c 2011-04-17 15:56:46.000000000 -0400 |
14818 |
@@ -0,0 +1,19 @@ |
14819 |
+#include <linux/kernel.h> |
14820 |
+#include <linux/sched.h> |
14821 |
@@ -43849,9 +41996,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_chdir.c linux-2.6.32.38/grsecurity/g |
14822 |
+#endif |
14823 |
+ return; |
14824 |
+} |
14825 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_chroot.c linux-2.6.32.38/grsecurity/grsec_chroot.c |
14826 |
---- linux-2.6.32.38/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 |
14827 |
-+++ linux-2.6.32.38/grsecurity/grsec_chroot.c 2011-04-17 15:56:46.000000000 -0400 |
14828 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_chroot.c linux-2.6.32.39/grsecurity/grsec_chroot.c |
14829 |
+--- linux-2.6.32.39/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 |
14830 |
++++ linux-2.6.32.39/grsecurity/grsec_chroot.c 2011-04-17 15:56:46.000000000 -0400 |
14831 |
@@ -0,0 +1,395 @@ |
14832 |
+#include <linux/kernel.h> |
14833 |
+#include <linux/module.h> |
14834 |
@@ -44248,9 +42395,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_chroot.c linux-2.6.32.38/grsecurity/ |
14835 |
+#ifdef CONFIG_SECURITY |
14836 |
+EXPORT_SYMBOL(gr_handle_chroot_caps); |
14837 |
+#endif |
14838 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_disabled.c linux-2.6.32.38/grsecurity/grsec_disabled.c |
14839 |
---- linux-2.6.32.38/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 |
14840 |
-+++ linux-2.6.32.38/grsecurity/grsec_disabled.c 2011-04-17 15:56:46.000000000 -0400 |
14841 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_disabled.c linux-2.6.32.39/grsecurity/grsec_disabled.c |
14842 |
+--- linux-2.6.32.39/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 |
14843 |
++++ linux-2.6.32.39/grsecurity/grsec_disabled.c 2011-04-17 15:56:46.000000000 -0400 |
14844 |
@@ -0,0 +1,447 @@ |
14845 |
+#include <linux/kernel.h> |
14846 |
+#include <linux/module.h> |
14847 |
@@ -44699,9 +42846,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_disabled.c linux-2.6.32.38/grsecurit |
14848 |
+EXPORT_SYMBOL(gr_check_user_change); |
14849 |
+EXPORT_SYMBOL(gr_check_group_change); |
14850 |
+#endif |
14851 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_exec.c linux-2.6.32.38/grsecurity/grsec_exec.c |
14852 |
---- linux-2.6.32.38/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 |
14853 |
-+++ linux-2.6.32.38/grsecurity/grsec_exec.c 2011-04-17 15:56:46.000000000 -0400 |
14854 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_exec.c linux-2.6.32.39/grsecurity/grsec_exec.c |
14855 |
+--- linux-2.6.32.39/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 |
14856 |
++++ linux-2.6.32.39/grsecurity/grsec_exec.c 2011-04-17 15:56:46.000000000 -0400 |
14857 |
@@ -0,0 +1,148 @@ |
14858 |
+#include <linux/kernel.h> |
14859 |
+#include <linux/sched.h> |
14860 |
@@ -44851,9 +42998,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_exec.c linux-2.6.32.38/grsecurity/gr |
14861 |
+ return; |
14862 |
+} |
14863 |
+#endif |
14864 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_fifo.c linux-2.6.32.38/grsecurity/grsec_fifo.c |
14865 |
---- linux-2.6.32.38/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 |
14866 |
-+++ linux-2.6.32.38/grsecurity/grsec_fifo.c 2011-04-17 15:56:46.000000000 -0400 |
14867 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_fifo.c linux-2.6.32.39/grsecurity/grsec_fifo.c |
14868 |
+--- linux-2.6.32.39/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 |
14869 |
++++ linux-2.6.32.39/grsecurity/grsec_fifo.c 2011-04-17 15:56:46.000000000 -0400 |
14870 |
@@ -0,0 +1,24 @@ |
14871 |
+#include <linux/kernel.h> |
14872 |
+#include <linux/sched.h> |
14873 |
@@ -44879,9 +43026,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_fifo.c linux-2.6.32.38/grsecurity/gr |
14874 |
+#endif |
14875 |
+ return 0; |
14876 |
+} |
14877 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_fork.c linux-2.6.32.38/grsecurity/grsec_fork.c |
14878 |
---- linux-2.6.32.38/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 |
14879 |
-+++ linux-2.6.32.38/grsecurity/grsec_fork.c 2011-04-17 15:56:46.000000000 -0400 |
14880 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_fork.c linux-2.6.32.39/grsecurity/grsec_fork.c |
14881 |
+--- linux-2.6.32.39/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 |
14882 |
++++ linux-2.6.32.39/grsecurity/grsec_fork.c 2011-04-17 15:56:46.000000000 -0400 |
14883 |
@@ -0,0 +1,23 @@ |
14884 |
+#include <linux/kernel.h> |
14885 |
+#include <linux/sched.h> |
14886 |
@@ -44906,9 +43053,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_fork.c linux-2.6.32.38/grsecurity/gr |
14887 |
+#endif |
14888 |
+ return; |
14889 |
+} |
14890 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_init.c linux-2.6.32.38/grsecurity/grsec_init.c |
14891 |
---- linux-2.6.32.38/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 |
14892 |
-+++ linux-2.6.32.38/grsecurity/grsec_init.c 2011-04-17 15:56:46.000000000 -0400 |
14893 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_init.c linux-2.6.32.39/grsecurity/grsec_init.c |
14894 |
+--- linux-2.6.32.39/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 |
14895 |
++++ linux-2.6.32.39/grsecurity/grsec_init.c 2011-04-17 15:56:46.000000000 -0400 |
14896 |
@@ -0,0 +1,270 @@ |
14897 |
+#include <linux/kernel.h> |
14898 |
+#include <linux/sched.h> |
14899 |
@@ -45180,9 +43327,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_init.c linux-2.6.32.38/grsecurity/gr |
14900 |
+ |
14901 |
+ return; |
14902 |
+} |
14903 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_link.c linux-2.6.32.38/grsecurity/grsec_link.c |
14904 |
---- linux-2.6.32.38/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 |
14905 |
-+++ linux-2.6.32.38/grsecurity/grsec_link.c 2011-04-17 15:56:46.000000000 -0400 |
14906 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_link.c linux-2.6.32.39/grsecurity/grsec_link.c |
14907 |
+--- linux-2.6.32.39/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 |
14908 |
++++ linux-2.6.32.39/grsecurity/grsec_link.c 2011-04-17 15:56:46.000000000 -0400 |
14909 |
@@ -0,0 +1,43 @@ |
14910 |
+#include <linux/kernel.h> |
14911 |
+#include <linux/sched.h> |
14912 |
@@ -45227,9 +43374,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_link.c linux-2.6.32.38/grsecurity/gr |
14913 |
+#endif |
14914 |
+ return 0; |
14915 |
+} |
14916 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_log.c linux-2.6.32.38/grsecurity/grsec_log.c |
14917 |
---- linux-2.6.32.38/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 |
14918 |
-+++ linux-2.6.32.38/grsecurity/grsec_log.c 2011-04-17 15:56:46.000000000 -0400 |
14919 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_log.c linux-2.6.32.39/grsecurity/grsec_log.c |
14920 |
+--- linux-2.6.32.39/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 |
14921 |
++++ linux-2.6.32.39/grsecurity/grsec_log.c 2011-04-17 15:56:46.000000000 -0400 |
14922 |
@@ -0,0 +1,310 @@ |
14923 |
+#include <linux/kernel.h> |
14924 |
+#include <linux/sched.h> |
14925 |
@@ -45541,9 +43688,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_log.c linux-2.6.32.38/grsecurity/grs |
14926 |
+ gr_log_end(audit); |
14927 |
+ END_LOCKS(audit); |
14928 |
+} |
14929 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_mem.c linux-2.6.32.38/grsecurity/grsec_mem.c |
14930 |
---- linux-2.6.32.38/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 |
14931 |
-+++ linux-2.6.32.38/grsecurity/grsec_mem.c 2011-04-17 15:56:46.000000000 -0400 |
14932 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_mem.c linux-2.6.32.39/grsecurity/grsec_mem.c |
14933 |
+--- linux-2.6.32.39/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 |
14934 |
++++ linux-2.6.32.39/grsecurity/grsec_mem.c 2011-04-17 15:56:46.000000000 -0400 |
14935 |
@@ -0,0 +1,33 @@ |
14936 |
+#include <linux/kernel.h> |
14937 |
+#include <linux/sched.h> |
14938 |
@@ -45578,9 +43725,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_mem.c linux-2.6.32.38/grsecurity/grs |
14939 |
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); |
14940 |
+ return; |
14941 |
+} |
14942 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_mount.c linux-2.6.32.38/grsecurity/grsec_mount.c |
14943 |
---- linux-2.6.32.38/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 |
14944 |
-+++ linux-2.6.32.38/grsecurity/grsec_mount.c 2011-04-17 15:56:46.000000000 -0400 |
14945 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_mount.c linux-2.6.32.39/grsecurity/grsec_mount.c |
14946 |
+--- linux-2.6.32.39/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 |
14947 |
++++ linux-2.6.32.39/grsecurity/grsec_mount.c 2011-04-17 15:56:46.000000000 -0400 |
14948 |
@@ -0,0 +1,62 @@ |
14949 |
+#include <linux/kernel.h> |
14950 |
+#include <linux/sched.h> |
14951 |
@@ -45644,9 +43791,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_mount.c linux-2.6.32.38/grsecurity/g |
14952 |
+#endif |
14953 |
+ return 0; |
14954 |
+} |
14955 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_pax.c linux-2.6.32.38/grsecurity/grsec_pax.c |
14956 |
---- linux-2.6.32.38/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 |
14957 |
-+++ linux-2.6.32.38/grsecurity/grsec_pax.c 2011-04-17 15:56:46.000000000 -0400 |
14958 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_pax.c linux-2.6.32.39/grsecurity/grsec_pax.c |
14959 |
+--- linux-2.6.32.39/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 |
14960 |
++++ linux-2.6.32.39/grsecurity/grsec_pax.c 2011-04-17 15:56:46.000000000 -0400 |
14961 |
@@ -0,0 +1,36 @@ |
14962 |
+#include <linux/kernel.h> |
14963 |
+#include <linux/sched.h> |
14964 |
@@ -45684,9 +43831,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_pax.c linux-2.6.32.38/grsecurity/grs |
14965 |
+#endif |
14966 |
+ return; |
14967 |
+} |
14968 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_ptrace.c linux-2.6.32.38/grsecurity/grsec_ptrace.c |
14969 |
---- linux-2.6.32.38/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 |
14970 |
-+++ linux-2.6.32.38/grsecurity/grsec_ptrace.c 2011-04-17 15:56:46.000000000 -0400 |
14971 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_ptrace.c linux-2.6.32.39/grsecurity/grsec_ptrace.c |
14972 |
+--- linux-2.6.32.39/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 |
14973 |
++++ linux-2.6.32.39/grsecurity/grsec_ptrace.c 2011-04-17 15:56:46.000000000 -0400 |
14974 |
@@ -0,0 +1,14 @@ |
14975 |
+#include <linux/kernel.h> |
14976 |
+#include <linux/sched.h> |
14977 |
@@ -45702,9 +43849,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_ptrace.c linux-2.6.32.38/grsecurity/ |
14978 |
+#endif |
14979 |
+ return; |
14980 |
+} |
14981 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_sig.c linux-2.6.32.38/grsecurity/grsec_sig.c |
14982 |
---- linux-2.6.32.38/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 |
14983 |
-+++ linux-2.6.32.38/grsecurity/grsec_sig.c 2011-04-17 15:56:46.000000000 -0400 |
14984 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_sig.c linux-2.6.32.39/grsecurity/grsec_sig.c |
14985 |
+--- linux-2.6.32.39/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 |
14986 |
++++ linux-2.6.32.39/grsecurity/grsec_sig.c 2011-04-17 15:56:46.000000000 -0400 |
14987 |
@@ -0,0 +1,196 @@ |
14988 |
+#include <linux/kernel.h> |
14989 |
+#include <linux/sched.h> |
14990 |
@@ -45902,9 +44049,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_sig.c linux-2.6.32.38/grsecurity/grs |
14991 |
+ return 0; |
14992 |
+} |
14993 |
+ |
14994 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_sock.c linux-2.6.32.38/grsecurity/grsec_sock.c |
14995 |
---- linux-2.6.32.38/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 |
14996 |
-+++ linux-2.6.32.38/grsecurity/grsec_sock.c 2011-04-17 15:56:46.000000000 -0400 |
14997 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_sock.c linux-2.6.32.39/grsecurity/grsec_sock.c |
14998 |
+--- linux-2.6.32.39/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 |
14999 |
++++ linux-2.6.32.39/grsecurity/grsec_sock.c 2011-04-17 15:56:46.000000000 -0400 |
15000 |
@@ -0,0 +1,275 @@ |
15001 |
+#include <linux/kernel.h> |
15002 |
+#include <linux/module.h> |
15003 |
@@ -46181,9 +44328,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_sock.c linux-2.6.32.38/grsecurity/gr |
15004 |
+ return current_cap(); |
15005 |
+#endif |
15006 |
+} |
15007 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_sysctl.c linux-2.6.32.38/grsecurity/grsec_sysctl.c |
15008 |
---- linux-2.6.32.38/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 |
15009 |
-+++ linux-2.6.32.38/grsecurity/grsec_sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
15010 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_sysctl.c linux-2.6.32.39/grsecurity/grsec_sysctl.c |
15011 |
+--- linux-2.6.32.39/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 |
15012 |
++++ linux-2.6.32.39/grsecurity/grsec_sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
15013 |
@@ -0,0 +1,479 @@ |
15014 |
+#include <linux/kernel.h> |
15015 |
+#include <linux/sched.h> |
15016 |
@@ -46664,9 +44811,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_sysctl.c linux-2.6.32.38/grsecurity/ |
15017 |
+ { .ctl_name = 0 } |
15018 |
+}; |
15019 |
+#endif |
15020 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_time.c linux-2.6.32.38/grsecurity/grsec_time.c |
15021 |
---- linux-2.6.32.38/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 |
15022 |
-+++ linux-2.6.32.38/grsecurity/grsec_time.c 2011-04-17 15:56:46.000000000 -0400 |
15023 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_time.c linux-2.6.32.39/grsecurity/grsec_time.c |
15024 |
+--- linux-2.6.32.39/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 |
15025 |
++++ linux-2.6.32.39/grsecurity/grsec_time.c 2011-04-17 15:56:46.000000000 -0400 |
15026 |
@@ -0,0 +1,16 @@ |
15027 |
+#include <linux/kernel.h> |
15028 |
+#include <linux/sched.h> |
15029 |
@@ -46684,9 +44831,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_time.c linux-2.6.32.38/grsecurity/gr |
15030 |
+} |
15031 |
+ |
15032 |
+EXPORT_SYMBOL(gr_log_timechange); |
15033 |
-diff -urNp linux-2.6.32.38/grsecurity/grsec_tpe.c linux-2.6.32.38/grsecurity/grsec_tpe.c |
15034 |
---- linux-2.6.32.38/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 |
15035 |
-+++ linux-2.6.32.38/grsecurity/grsec_tpe.c 2011-04-17 15:56:46.000000000 -0400 |
15036 |
+diff -urNp linux-2.6.32.39/grsecurity/grsec_tpe.c linux-2.6.32.39/grsecurity/grsec_tpe.c |
15037 |
+--- linux-2.6.32.39/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 |
15038 |
++++ linux-2.6.32.39/grsecurity/grsec_tpe.c 2011-04-17 15:56:46.000000000 -0400 |
15039 |
@@ -0,0 +1,39 @@ |
15040 |
+#include <linux/kernel.h> |
15041 |
+#include <linux/sched.h> |
15042 |
@@ -46727,9 +44874,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsec_tpe.c linux-2.6.32.38/grsecurity/grs |
15043 |
+#endif |
15044 |
+ return 1; |
15045 |
+} |
15046 |
-diff -urNp linux-2.6.32.38/grsecurity/grsum.c linux-2.6.32.38/grsecurity/grsum.c |
15047 |
---- linux-2.6.32.38/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 |
15048 |
-+++ linux-2.6.32.38/grsecurity/grsum.c 2011-04-17 15:56:46.000000000 -0400 |
15049 |
+diff -urNp linux-2.6.32.39/grsecurity/grsum.c linux-2.6.32.39/grsecurity/grsum.c |
15050 |
+--- linux-2.6.32.39/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 |
15051 |
++++ linux-2.6.32.39/grsecurity/grsum.c 2011-04-17 15:56:46.000000000 -0400 |
15052 |
@@ -0,0 +1,61 @@ |
15053 |
+#include <linux/err.h> |
15054 |
+#include <linux/kernel.h> |
15055 |
@@ -46792,9 +44939,9 @@ diff -urNp linux-2.6.32.38/grsecurity/grsum.c linux-2.6.32.38/grsecurity/grsum.c |
15056 |
+ |
15057 |
+ return retval; |
15058 |
+} |
15059 |
-diff -urNp linux-2.6.32.38/grsecurity/Kconfig linux-2.6.32.38/grsecurity/Kconfig |
15060 |
---- linux-2.6.32.38/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
15061 |
-+++ linux-2.6.32.38/grsecurity/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
15062 |
+diff -urNp linux-2.6.32.39/grsecurity/Kconfig linux-2.6.32.39/grsecurity/Kconfig |
15063 |
+--- linux-2.6.32.39/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
15064 |
++++ linux-2.6.32.39/grsecurity/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
15065 |
@@ -0,0 +1,1045 @@ |
15066 |
+# |
15067 |
+# grecurity configuration |
15068 |
@@ -47841,9 +45988,9 @@ diff -urNp linux-2.6.32.38/grsecurity/Kconfig linux-2.6.32.38/grsecurity/Kconfig |
15069 |
+endmenu |
15070 |
+ |
15071 |
+endmenu |
15072 |
-diff -urNp linux-2.6.32.38/grsecurity/Makefile linux-2.6.32.38/grsecurity/Makefile |
15073 |
---- linux-2.6.32.38/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 |
15074 |
-+++ linux-2.6.32.38/grsecurity/Makefile 2011-04-17 15:56:46.000000000 -0400 |
15075 |
+diff -urNp linux-2.6.32.39/grsecurity/Makefile linux-2.6.32.39/grsecurity/Makefile |
15076 |
+--- linux-2.6.32.39/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 |
15077 |
++++ linux-2.6.32.39/grsecurity/Makefile 2011-04-17 15:56:46.000000000 -0400 |
15078 |
@@ -0,0 +1,29 @@ |
15079 |
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton |
15080 |
+# during 2001-2009 it has been completely redesigned by Brad Spengler |
15081 |
@@ -47874,23 +46021,9 @@ diff -urNp linux-2.6.32.38/grsecurity/Makefile linux-2.6.32.38/grsecurity/Makefi |
15082 |
+ @-chmod -f 700 . |
15083 |
+ @echo ' grsec: protected kernel image paths' |
15084 |
+endif |
15085 |
-diff -urNp linux-2.6.32.38/include/acpi/acoutput.h linux-2.6.32.38/include/acpi/acoutput.h |
15086 |
---- linux-2.6.32.38/include/acpi/acoutput.h 2011-03-27 14:31:47.000000000 -0400 |
15087 |
-+++ linux-2.6.32.38/include/acpi/acoutput.h 2011-04-17 15:56:46.000000000 -0400 |
15088 |
-@@ -264,8 +264,8 @@ |
15089 |
- * leaving no executable debug code! |
15090 |
- */ |
15091 |
- #define ACPI_FUNCTION_NAME(a) |
15092 |
--#define ACPI_DEBUG_PRINT(pl) |
15093 |
--#define ACPI_DEBUG_PRINT_RAW(pl) |
15094 |
-+#define ACPI_DEBUG_PRINT(pl) do {} while (0) |
15095 |
-+#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0) |
15096 |
- |
15097 |
- #endif /* ACPI_DEBUG_OUTPUT */ |
15098 |
- |
15099 |
-diff -urNp linux-2.6.32.38/include/acpi/acpi_drivers.h linux-2.6.32.38/include/acpi/acpi_drivers.h |
15100 |
---- linux-2.6.32.38/include/acpi/acpi_drivers.h 2011-03-27 14:31:47.000000000 -0400 |
15101 |
-+++ linux-2.6.32.38/include/acpi/acpi_drivers.h 2011-04-17 15:56:46.000000000 -0400 |
15102 |
+diff -urNp linux-2.6.32.39/include/acpi/acpi_drivers.h linux-2.6.32.39/include/acpi/acpi_drivers.h |
15103 |
+--- linux-2.6.32.39/include/acpi/acpi_drivers.h 2011-03-27 14:31:47.000000000 -0400 |
15104 |
++++ linux-2.6.32.39/include/acpi/acpi_drivers.h 2011-04-17 15:56:46.000000000 -0400 |
15105 |
@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp |
15106 |
Dock Station |
15107 |
-------------------------------------------------------------------------- */ |
15108 |
@@ -47920,9 +46053,9 @@ diff -urNp linux-2.6.32.38/include/acpi/acpi_drivers.h linux-2.6.32.38/include/a |
15109 |
void *context) |
15110 |
{ |
15111 |
return -ENODEV; |
15112 |
-diff -urNp linux-2.6.32.38/include/asm-generic/atomic-long.h linux-2.6.32.38/include/asm-generic/atomic-long.h |
15113 |
---- linux-2.6.32.38/include/asm-generic/atomic-long.h 2011-03-27 14:31:47.000000000 -0400 |
15114 |
-+++ linux-2.6.32.38/include/asm-generic/atomic-long.h 2011-04-17 15:56:46.000000000 -0400 |
15115 |
+diff -urNp linux-2.6.32.39/include/asm-generic/atomic-long.h linux-2.6.32.39/include/asm-generic/atomic-long.h |
15116 |
+--- linux-2.6.32.39/include/asm-generic/atomic-long.h 2011-03-27 14:31:47.000000000 -0400 |
15117 |
++++ linux-2.6.32.39/include/asm-generic/atomic-long.h 2011-04-17 15:56:46.000000000 -0400 |
15118 |
@@ -22,6 +22,12 @@ |
15119 |
|
15120 |
typedef atomic64_t atomic_long_t; |
15121 |
@@ -48179,9 +46312,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/atomic-long.h linux-2.6.32.38/inc |
15122 |
+#endif |
15123 |
+ |
15124 |
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */ |
15125 |
-diff -urNp linux-2.6.32.38/include/asm-generic/dma-mapping-common.h linux-2.6.32.38/include/asm-generic/dma-mapping-common.h |
15126 |
---- linux-2.6.32.38/include/asm-generic/dma-mapping-common.h 2011-03-27 14:31:47.000000000 -0400 |
15127 |
-+++ linux-2.6.32.38/include/asm-generic/dma-mapping-common.h 2011-04-17 15:56:46.000000000 -0400 |
15128 |
+diff -urNp linux-2.6.32.39/include/asm-generic/dma-mapping-common.h linux-2.6.32.39/include/asm-generic/dma-mapping-common.h |
15129 |
+--- linux-2.6.32.39/include/asm-generic/dma-mapping-common.h 2011-03-27 14:31:47.000000000 -0400 |
15130 |
++++ linux-2.6.32.39/include/asm-generic/dma-mapping-common.h 2011-04-17 15:56:46.000000000 -0400 |
15131 |
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ |
15132 |
enum dma_data_direction dir, |
15133 |
struct dma_attrs *attrs) |
15134 |
@@ -48290,9 +46423,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/dma-mapping-common.h linux-2.6.32 |
15135 |
|
15136 |
BUG_ON(!valid_dma_direction(dir)); |
15137 |
if (ops->sync_sg_for_device) |
15138 |
-diff -urNp linux-2.6.32.38/include/asm-generic/futex.h linux-2.6.32.38/include/asm-generic/futex.h |
15139 |
---- linux-2.6.32.38/include/asm-generic/futex.h 2011-03-27 14:31:47.000000000 -0400 |
15140 |
-+++ linux-2.6.32.38/include/asm-generic/futex.h 2011-04-17 15:56:46.000000000 -0400 |
15141 |
+diff -urNp linux-2.6.32.39/include/asm-generic/futex.h linux-2.6.32.39/include/asm-generic/futex.h |
15142 |
+--- linux-2.6.32.39/include/asm-generic/futex.h 2011-03-27 14:31:47.000000000 -0400 |
15143 |
++++ linux-2.6.32.39/include/asm-generic/futex.h 2011-04-17 15:56:46.000000000 -0400 |
15144 |
@@ -6,7 +6,7 @@ |
15145 |
#include <asm/errno.h> |
15146 |
|
15147 |
@@ -48311,9 +46444,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/futex.h linux-2.6.32.38/include/a |
15148 |
{ |
15149 |
return -ENOSYS; |
15150 |
} |
15151 |
-diff -urNp linux-2.6.32.38/include/asm-generic/int-l64.h linux-2.6.32.38/include/asm-generic/int-l64.h |
15152 |
---- linux-2.6.32.38/include/asm-generic/int-l64.h 2011-03-27 14:31:47.000000000 -0400 |
15153 |
-+++ linux-2.6.32.38/include/asm-generic/int-l64.h 2011-04-17 15:56:46.000000000 -0400 |
15154 |
+diff -urNp linux-2.6.32.39/include/asm-generic/int-l64.h linux-2.6.32.39/include/asm-generic/int-l64.h |
15155 |
+--- linux-2.6.32.39/include/asm-generic/int-l64.h 2011-03-27 14:31:47.000000000 -0400 |
15156 |
++++ linux-2.6.32.39/include/asm-generic/int-l64.h 2011-04-17 15:56:46.000000000 -0400 |
15157 |
@@ -46,6 +46,8 @@ typedef unsigned int u32; |
15158 |
typedef signed long s64; |
15159 |
typedef unsigned long u64; |
15160 |
@@ -48323,9 +46456,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/int-l64.h linux-2.6.32.38/include |
15161 |
#define S8_C(x) x |
15162 |
#define U8_C(x) x ## U |
15163 |
#define S16_C(x) x |
15164 |
-diff -urNp linux-2.6.32.38/include/asm-generic/int-ll64.h linux-2.6.32.38/include/asm-generic/int-ll64.h |
15165 |
---- linux-2.6.32.38/include/asm-generic/int-ll64.h 2011-03-27 14:31:47.000000000 -0400 |
15166 |
-+++ linux-2.6.32.38/include/asm-generic/int-ll64.h 2011-04-17 15:56:46.000000000 -0400 |
15167 |
+diff -urNp linux-2.6.32.39/include/asm-generic/int-ll64.h linux-2.6.32.39/include/asm-generic/int-ll64.h |
15168 |
+--- linux-2.6.32.39/include/asm-generic/int-ll64.h 2011-03-27 14:31:47.000000000 -0400 |
15169 |
++++ linux-2.6.32.39/include/asm-generic/int-ll64.h 2011-04-17 15:56:46.000000000 -0400 |
15170 |
@@ -51,6 +51,8 @@ typedef unsigned int u32; |
15171 |
typedef signed long long s64; |
15172 |
typedef unsigned long long u64; |
15173 |
@@ -48335,9 +46468,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/int-ll64.h linux-2.6.32.38/includ |
15174 |
#define S8_C(x) x |
15175 |
#define U8_C(x) x ## U |
15176 |
#define S16_C(x) x |
15177 |
-diff -urNp linux-2.6.32.38/include/asm-generic/kmap_types.h linux-2.6.32.38/include/asm-generic/kmap_types.h |
15178 |
---- linux-2.6.32.38/include/asm-generic/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
15179 |
-+++ linux-2.6.32.38/include/asm-generic/kmap_types.h 2011-04-17 15:56:46.000000000 -0400 |
15180 |
+diff -urNp linux-2.6.32.39/include/asm-generic/kmap_types.h linux-2.6.32.39/include/asm-generic/kmap_types.h |
15181 |
+--- linux-2.6.32.39/include/asm-generic/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 |
15182 |
++++ linux-2.6.32.39/include/asm-generic/kmap_types.h 2011-04-17 15:56:46.000000000 -0400 |
15183 |
@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, |
15184 |
KMAP_D(16) KM_IRQ_PTE, |
15185 |
KMAP_D(17) KM_NMI, |
15186 |
@@ -48348,9 +46481,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/kmap_types.h linux-2.6.32.38/incl |
15187 |
}; |
15188 |
|
15189 |
#undef KMAP_D |
15190 |
-diff -urNp linux-2.6.32.38/include/asm-generic/pgtable.h linux-2.6.32.38/include/asm-generic/pgtable.h |
15191 |
---- linux-2.6.32.38/include/asm-generic/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
15192 |
-+++ linux-2.6.32.38/include/asm-generic/pgtable.h 2011-04-17 15:56:46.000000000 -0400 |
15193 |
+diff -urNp linux-2.6.32.39/include/asm-generic/pgtable.h linux-2.6.32.39/include/asm-generic/pgtable.h |
15194 |
+--- linux-2.6.32.39/include/asm-generic/pgtable.h 2011-03-27 14:31:47.000000000 -0400 |
15195 |
++++ linux-2.6.32.39/include/asm-generic/pgtable.h 2011-04-17 15:56:46.000000000 -0400 |
15196 |
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar |
15197 |
unsigned long size); |
15198 |
#endif |
15199 |
@@ -48366,9 +46499,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/pgtable.h linux-2.6.32.38/include |
15200 |
#endif /* !__ASSEMBLY__ */ |
15201 |
|
15202 |
#endif /* _ASM_GENERIC_PGTABLE_H */ |
15203 |
-diff -urNp linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h |
15204 |
---- linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h 2011-03-27 14:31:47.000000000 -0400 |
15205 |
-+++ linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:56:46.000000000 -0400 |
15206 |
+diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h |
15207 |
+--- linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h 2011-03-27 14:31:47.000000000 -0400 |
15208 |
++++ linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:56:46.000000000 -0400 |
15209 |
@@ -1,14 +1,19 @@ |
15210 |
#ifndef _PGTABLE_NOPMD_H |
15211 |
#define _PGTABLE_NOPMD_H |
15212 |
@@ -48405,9 +46538,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/pgtable-nopmd.h linux-2.6.32.38/i |
15213 |
/* |
15214 |
* The "pud_xxx()" functions here are trivial for a folded two-level |
15215 |
* setup: the pmd is never bad, and a pmd always exists (as it's folded |
15216 |
-diff -urNp linux-2.6.32.38/include/asm-generic/pgtable-nopud.h linux-2.6.32.38/include/asm-generic/pgtable-nopud.h |
15217 |
---- linux-2.6.32.38/include/asm-generic/pgtable-nopud.h 2011-03-27 14:31:47.000000000 -0400 |
15218 |
-+++ linux-2.6.32.38/include/asm-generic/pgtable-nopud.h 2011-04-17 15:56:46.000000000 -0400 |
15219 |
+diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopud.h linux-2.6.32.39/include/asm-generic/pgtable-nopud.h |
15220 |
+--- linux-2.6.32.39/include/asm-generic/pgtable-nopud.h 2011-03-27 14:31:47.000000000 -0400 |
15221 |
++++ linux-2.6.32.39/include/asm-generic/pgtable-nopud.h 2011-04-17 15:56:46.000000000 -0400 |
15222 |
@@ -1,10 +1,15 @@ |
15223 |
#ifndef _PGTABLE_NOPUD_H |
15224 |
#define _PGTABLE_NOPUD_H |
15225 |
@@ -48438,9 +46571,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/pgtable-nopud.h linux-2.6.32.38/i |
15226 |
/* |
15227 |
* The "pgd_xxx()" functions here are trivial for a folded two-level |
15228 |
* setup: the pud is never bad, and a pud always exists (as it's folded |
15229 |
-diff -urNp linux-2.6.32.38/include/asm-generic/vmlinux.lds.h linux-2.6.32.38/include/asm-generic/vmlinux.lds.h |
15230 |
---- linux-2.6.32.38/include/asm-generic/vmlinux.lds.h 2011-03-27 14:31:47.000000000 -0400 |
15231 |
-+++ linux-2.6.32.38/include/asm-generic/vmlinux.lds.h 2011-04-17 15:56:46.000000000 -0400 |
15232 |
+diff -urNp linux-2.6.32.39/include/asm-generic/vmlinux.lds.h linux-2.6.32.39/include/asm-generic/vmlinux.lds.h |
15233 |
+--- linux-2.6.32.39/include/asm-generic/vmlinux.lds.h 2011-03-27 14:31:47.000000000 -0400 |
15234 |
++++ linux-2.6.32.39/include/asm-generic/vmlinux.lds.h 2011-04-17 15:56:46.000000000 -0400 |
15235 |
@@ -199,6 +199,7 @@ |
15236 |
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ |
15237 |
VMLINUX_SYMBOL(__start_rodata) = .; \ |
15238 |
@@ -48479,115 +46612,9 @@ diff -urNp linux-2.6.32.38/include/asm-generic/vmlinux.lds.h linux-2.6.32.38/inc |
15239 |
|
15240 |
/** |
15241 |
* PERCPU - define output section for percpu area, simple version |
15242 |
-diff -urNp linux-2.6.32.38/include/drm/drm_pciids.h linux-2.6.32.38/include/drm/drm_pciids.h |
15243 |
---- linux-2.6.32.38/include/drm/drm_pciids.h 2011-03-27 14:31:47.000000000 -0400 |
15244 |
-+++ linux-2.6.32.38/include/drm/drm_pciids.h 2011-04-17 15:56:46.000000000 -0400 |
15245 |
-@@ -376,7 +376,7 @@ |
15246 |
- {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
15247 |
- {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
15248 |
- {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
15249 |
-- {0, 0, 0} |
15250 |
-+ {0, 0, 0, 0, 0, 0} |
15251 |
- |
15252 |
- #define r128_PCI_IDS \ |
15253 |
- {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15254 |
-@@ -416,14 +416,14 @@ |
15255 |
- {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15256 |
- {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15257 |
- {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15258 |
-- {0, 0, 0} |
15259 |
-+ {0, 0, 0, 0, 0, 0} |
15260 |
- |
15261 |
- #define mga_PCI_IDS \ |
15262 |
- {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ |
15263 |
- {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ |
15264 |
- {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \ |
15265 |
- {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \ |
15266 |
-- {0, 0, 0} |
15267 |
-+ {0, 0, 0, 0, 0, 0} |
15268 |
- |
15269 |
- #define mach64_PCI_IDS \ |
15270 |
- {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15271 |
-@@ -446,7 +446,7 @@ |
15272 |
- {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15273 |
- {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15274 |
- {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15275 |
-- {0, 0, 0} |
15276 |
-+ {0, 0, 0, 0, 0, 0} |
15277 |
- |
15278 |
- #define sisdrv_PCI_IDS \ |
15279 |
- {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15280 |
-@@ -457,7 +457,7 @@ |
15281 |
- {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15282 |
- {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ |
15283 |
- {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ |
15284 |
-- {0, 0, 0} |
15285 |
-+ {0, 0, 0, 0, 0, 0} |
15286 |
- |
15287 |
- #define tdfx_PCI_IDS \ |
15288 |
- {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15289 |
-@@ -466,7 +466,7 @@ |
15290 |
- {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15291 |
- {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15292 |
- {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15293 |
-- {0, 0, 0} |
15294 |
-+ {0, 0, 0, 0, 0, 0} |
15295 |
- |
15296 |
- #define viadrv_PCI_IDS \ |
15297 |
- {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15298 |
-@@ -478,14 +478,14 @@ |
15299 |
- {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15300 |
- {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \ |
15301 |
- {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ |
15302 |
-- {0, 0, 0} |
15303 |
-+ {0, 0, 0, 0, 0, 0} |
15304 |
- |
15305 |
- #define i810_PCI_IDS \ |
15306 |
- {0x8086, 0x7121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15307 |
- {0x8086, 0x7123, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15308 |
- {0x8086, 0x7125, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15309 |
- {0x8086, 0x1132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15310 |
-- {0, 0, 0} |
15311 |
-+ {0, 0, 0, 0, 0, 0} |
15312 |
- |
15313 |
- #define i830_PCI_IDS \ |
15314 |
- {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15315 |
-@@ -493,11 +493,11 @@ |
15316 |
- {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15317 |
- {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15318 |
- {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15319 |
-- {0, 0, 0} |
15320 |
-+ {0, 0, 0, 0, 0, 0} |
15321 |
- |
15322 |
- #define gamma_PCI_IDS \ |
15323 |
- {0x3d3d, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
15324 |
-- {0, 0, 0} |
15325 |
-+ {0, 0, 0, 0, 0, 0} |
15326 |
- |
15327 |
- #define savage_PCI_IDS \ |
15328 |
- {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \ |
15329 |
-@@ -523,10 +523,10 @@ |
15330 |
- {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \ |
15331 |
- {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ |
15332 |
- {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ |
15333 |
-- {0, 0, 0} |
15334 |
-+ {0, 0, 0, 0, 0, 0} |
15335 |
- |
15336 |
- #define ffb_PCI_IDS \ |
15337 |
-- {0, 0, 0} |
15338 |
-+ {0, 0, 0, 0, 0, 0} |
15339 |
- |
15340 |
- #define i915_PCI_IDS \ |
15341 |
- {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
15342 |
-@@ -559,4 +559,4 @@ |
15343 |
- {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
15344 |
- {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
15345 |
- {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
15346 |
-- {0, 0, 0} |
15347 |
-+ {0, 0, 0, 0, 0, 0} |
15348 |
-diff -urNp linux-2.6.32.38/include/drm/drmP.h linux-2.6.32.38/include/drm/drmP.h |
15349 |
---- linux-2.6.32.38/include/drm/drmP.h 2011-03-27 14:31:47.000000000 -0400 |
15350 |
-+++ linux-2.6.32.38/include/drm/drmP.h 2011-04-17 15:56:46.000000000 -0400 |
15351 |
+diff -urNp linux-2.6.32.39/include/drm/drmP.h linux-2.6.32.39/include/drm/drmP.h |
15352 |
+--- linux-2.6.32.39/include/drm/drmP.h 2011-03-27 14:31:47.000000000 -0400 |
15353 |
++++ linux-2.6.32.39/include/drm/drmP.h 2011-04-17 15:56:46.000000000 -0400 |
15354 |
@@ -71,6 +71,7 @@ |
15355 |
#include <linux/workqueue.h> |
15356 |
#include <linux/poll.h> |
15357 |
@@ -48647,9 +46674,9 @@ diff -urNp linux-2.6.32.38/include/drm/drmP.h linux-2.6.32.38/include/drm/drmP.h |
15358 |
uint32_t gtt_total; |
15359 |
uint32_t invalidate_domains; /* domains pending invalidation */ |
15360 |
uint32_t flush_domains; /* domains pending flush */ |
15361 |
-diff -urNp linux-2.6.32.38/include/linux/a.out.h linux-2.6.32.38/include/linux/a.out.h |
15362 |
---- linux-2.6.32.38/include/linux/a.out.h 2011-03-27 14:31:47.000000000 -0400 |
15363 |
-+++ linux-2.6.32.38/include/linux/a.out.h 2011-04-17 15:56:46.000000000 -0400 |
15364 |
+diff -urNp linux-2.6.32.39/include/linux/a.out.h linux-2.6.32.39/include/linux/a.out.h |
15365 |
+--- linux-2.6.32.39/include/linux/a.out.h 2011-03-27 14:31:47.000000000 -0400 |
15366 |
++++ linux-2.6.32.39/include/linux/a.out.h 2011-04-17 15:56:46.000000000 -0400 |
15367 |
@@ -39,6 +39,14 @@ enum machine_type { |
15368 |
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ |
15369 |
}; |
15370 |
@@ -48665,9 +46692,9 @@ diff -urNp linux-2.6.32.38/include/linux/a.out.h linux-2.6.32.38/include/linux/a |
15371 |
#if !defined (N_MAGIC) |
15372 |
#define N_MAGIC(exec) ((exec).a_info & 0xffff) |
15373 |
#endif |
15374 |
-diff -urNp linux-2.6.32.38/include/linux/atmdev.h linux-2.6.32.38/include/linux/atmdev.h |
15375 |
---- linux-2.6.32.38/include/linux/atmdev.h 2011-03-27 14:31:47.000000000 -0400 |
15376 |
-+++ linux-2.6.32.38/include/linux/atmdev.h 2011-04-17 15:56:46.000000000 -0400 |
15377 |
+diff -urNp linux-2.6.32.39/include/linux/atmdev.h linux-2.6.32.39/include/linux/atmdev.h |
15378 |
+--- linux-2.6.32.39/include/linux/atmdev.h 2011-03-27 14:31:47.000000000 -0400 |
15379 |
++++ linux-2.6.32.39/include/linux/atmdev.h 2011-04-17 15:56:46.000000000 -0400 |
15380 |
@@ -237,7 +237,7 @@ struct compat_atm_iobuf { |
15381 |
#endif |
15382 |
|
15383 |
@@ -48677,9 +46704,9 @@ diff -urNp linux-2.6.32.38/include/linux/atmdev.h linux-2.6.32.38/include/linux/ |
15384 |
__AAL_STAT_ITEMS |
15385 |
#undef __HANDLE_ITEM |
15386 |
}; |
15387 |
-diff -urNp linux-2.6.32.38/include/linux/backlight.h linux-2.6.32.38/include/linux/backlight.h |
15388 |
---- linux-2.6.32.38/include/linux/backlight.h 2011-03-27 14:31:47.000000000 -0400 |
15389 |
-+++ linux-2.6.32.38/include/linux/backlight.h 2011-04-17 15:56:46.000000000 -0400 |
15390 |
+diff -urNp linux-2.6.32.39/include/linux/backlight.h linux-2.6.32.39/include/linux/backlight.h |
15391 |
+--- linux-2.6.32.39/include/linux/backlight.h 2011-03-27 14:31:47.000000000 -0400 |
15392 |
++++ linux-2.6.32.39/include/linux/backlight.h 2011-04-17 15:56:46.000000000 -0400 |
15393 |
@@ -36,18 +36,18 @@ struct backlight_device; |
15394 |
struct fb_info; |
15395 |
|
15396 |
@@ -48721,9 +46748,9 @@ diff -urNp linux-2.6.32.38/include/linux/backlight.h linux-2.6.32.38/include/lin |
15397 |
extern void backlight_device_unregister(struct backlight_device *bd); |
15398 |
extern void backlight_force_update(struct backlight_device *bd, |
15399 |
enum backlight_update_reason reason); |
15400 |
-diff -urNp linux-2.6.32.38/include/linux/binfmts.h linux-2.6.32.38/include/linux/binfmts.h |
15401 |
---- linux-2.6.32.38/include/linux/binfmts.h 2011-04-17 17:00:52.000000000 -0400 |
15402 |
-+++ linux-2.6.32.38/include/linux/binfmts.h 2011-04-17 15:56:46.000000000 -0400 |
15403 |
+diff -urNp linux-2.6.32.39/include/linux/binfmts.h linux-2.6.32.39/include/linux/binfmts.h |
15404 |
+--- linux-2.6.32.39/include/linux/binfmts.h 2011-04-17 17:00:52.000000000 -0400 |
15405 |
++++ linux-2.6.32.39/include/linux/binfmts.h 2011-04-17 15:56:46.000000000 -0400 |
15406 |
@@ -83,6 +83,7 @@ struct linux_binfmt { |
15407 |
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); |
15408 |
int (*load_shlib)(struct file *); |
15409 |
@@ -48732,9 +46759,9 @@ diff -urNp linux-2.6.32.38/include/linux/binfmts.h linux-2.6.32.38/include/linux |
15410 |
unsigned long min_coredump; /* minimal dump size */ |
15411 |
int hasvdso; |
15412 |
}; |
15413 |
-diff -urNp linux-2.6.32.38/include/linux/blkdev.h linux-2.6.32.38/include/linux/blkdev.h |
15414 |
---- linux-2.6.32.38/include/linux/blkdev.h 2011-03-27 14:31:47.000000000 -0400 |
15415 |
-+++ linux-2.6.32.38/include/linux/blkdev.h 2011-04-17 15:56:46.000000000 -0400 |
15416 |
+diff -urNp linux-2.6.32.39/include/linux/blkdev.h linux-2.6.32.39/include/linux/blkdev.h |
15417 |
+--- linux-2.6.32.39/include/linux/blkdev.h 2011-03-27 14:31:47.000000000 -0400 |
15418 |
++++ linux-2.6.32.39/include/linux/blkdev.h 2011-04-17 15:56:46.000000000 -0400 |
15419 |
@@ -1265,19 +1265,19 @@ static inline int blk_integrity_rq(struc |
15420 |
#endif /* CONFIG_BLK_DEV_INTEGRITY */ |
15421 |
|
15422 |
@@ -48766,9 +46793,9 @@ diff -urNp linux-2.6.32.38/include/linux/blkdev.h linux-2.6.32.38/include/linux/ |
15423 |
}; |
15424 |
|
15425 |
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, |
15426 |
-diff -urNp linux-2.6.32.38/include/linux/byteorder/little_endian.h linux-2.6.32.38/include/linux/byteorder/little_endian.h |
15427 |
---- linux-2.6.32.38/include/linux/byteorder/little_endian.h 2011-03-27 14:31:47.000000000 -0400 |
15428 |
-+++ linux-2.6.32.38/include/linux/byteorder/little_endian.h 2011-04-17 15:56:46.000000000 -0400 |
15429 |
+diff -urNp linux-2.6.32.39/include/linux/byteorder/little_endian.h linux-2.6.32.39/include/linux/byteorder/little_endian.h |
15430 |
+--- linux-2.6.32.39/include/linux/byteorder/little_endian.h 2011-03-27 14:31:47.000000000 -0400 |
15431 |
++++ linux-2.6.32.39/include/linux/byteorder/little_endian.h 2011-04-17 15:56:46.000000000 -0400 |
15432 |
@@ -42,51 +42,51 @@ |
15433 |
|
15434 |
static inline __le64 __cpu_to_le64p(const __u64 *p) |
15435 |
@@ -48833,9 +46860,9 @@ diff -urNp linux-2.6.32.38/include/linux/byteorder/little_endian.h linux-2.6.32. |
15436 |
} |
15437 |
#define __cpu_to_le64s(x) do { (void)(x); } while (0) |
15438 |
#define __le64_to_cpus(x) do { (void)(x); } while (0) |
15439 |
-diff -urNp linux-2.6.32.38/include/linux/cache.h linux-2.6.32.38/include/linux/cache.h |
15440 |
---- linux-2.6.32.38/include/linux/cache.h 2011-03-27 14:31:47.000000000 -0400 |
15441 |
-+++ linux-2.6.32.38/include/linux/cache.h 2011-04-17 15:56:46.000000000 -0400 |
15442 |
+diff -urNp linux-2.6.32.39/include/linux/cache.h linux-2.6.32.39/include/linux/cache.h |
15443 |
+--- linux-2.6.32.39/include/linux/cache.h 2011-03-27 14:31:47.000000000 -0400 |
15444 |
++++ linux-2.6.32.39/include/linux/cache.h 2011-04-17 15:56:46.000000000 -0400 |
15445 |
@@ -16,6 +16,10 @@ |
15446 |
#define __read_mostly |
15447 |
#endif |
15448 |
@@ -48847,9 +46874,9 @@ diff -urNp linux-2.6.32.38/include/linux/cache.h linux-2.6.32.38/include/linux/c |
15449 |
#ifndef ____cacheline_aligned |
15450 |
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) |
15451 |
#endif |
15452 |
-diff -urNp linux-2.6.32.38/include/linux/capability.h linux-2.6.32.38/include/linux/capability.h |
15453 |
---- linux-2.6.32.38/include/linux/capability.h 2011-03-27 14:31:47.000000000 -0400 |
15454 |
-+++ linux-2.6.32.38/include/linux/capability.h 2011-04-17 15:56:46.000000000 -0400 |
15455 |
+diff -urNp linux-2.6.32.39/include/linux/capability.h linux-2.6.32.39/include/linux/capability.h |
15456 |
+--- linux-2.6.32.39/include/linux/capability.h 2011-03-27 14:31:47.000000000 -0400 |
15457 |
++++ linux-2.6.32.39/include/linux/capability.h 2011-04-17 15:56:46.000000000 -0400 |
15458 |
@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff |
15459 |
(security_real_capable_noaudit((t), (cap)) == 0) |
15460 |
|
15461 |
@@ -48858,9 +46885,9 @@ diff -urNp linux-2.6.32.38/include/linux/capability.h linux-2.6.32.38/include/li |
15462 |
|
15463 |
/* audit system wants to get cap info from files as well */ |
15464 |
struct dentry; |
15465 |
-diff -urNp linux-2.6.32.38/include/linux/compiler-gcc4.h linux-2.6.32.38/include/linux/compiler-gcc4.h |
15466 |
---- linux-2.6.32.38/include/linux/compiler-gcc4.h 2011-03-27 14:31:47.000000000 -0400 |
15467 |
-+++ linux-2.6.32.38/include/linux/compiler-gcc4.h 2011-04-17 15:56:46.000000000 -0400 |
15468 |
+diff -urNp linux-2.6.32.39/include/linux/compiler-gcc4.h linux-2.6.32.39/include/linux/compiler-gcc4.h |
15469 |
+--- linux-2.6.32.39/include/linux/compiler-gcc4.h 2011-03-27 14:31:47.000000000 -0400 |
15470 |
++++ linux-2.6.32.39/include/linux/compiler-gcc4.h 2011-04-17 15:56:46.000000000 -0400 |
15471 |
@@ -36,4 +36,8 @@ |
15472 |
the kernel context */ |
15473 |
#define __cold __attribute__((__cold__)) |
15474 |
@@ -48870,9 +46897,9 @@ diff -urNp linux-2.6.32.38/include/linux/compiler-gcc4.h linux-2.6.32.38/include |
15475 |
+#define __bos0(ptr) __bos((ptr), 0) |
15476 |
+#define __bos1(ptr) __bos((ptr), 1) |
15477 |
#endif |
15478 |
-diff -urNp linux-2.6.32.38/include/linux/compiler.h linux-2.6.32.38/include/linux/compiler.h |
15479 |
---- linux-2.6.32.38/include/linux/compiler.h 2011-03-27 14:31:47.000000000 -0400 |
15480 |
-+++ linux-2.6.32.38/include/linux/compiler.h 2011-04-17 15:56:46.000000000 -0400 |
15481 |
+diff -urNp linux-2.6.32.39/include/linux/compiler.h linux-2.6.32.39/include/linux/compiler.h |
15482 |
+--- linux-2.6.32.39/include/linux/compiler.h 2011-03-27 14:31:47.000000000 -0400 |
15483 |
++++ linux-2.6.32.39/include/linux/compiler.h 2011-04-17 15:56:46.000000000 -0400 |
15484 |
@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ |
15485 |
#define __cold |
15486 |
#endif |
15487 |
@@ -48905,9 +46932,21 @@ diff -urNp linux-2.6.32.38/include/linux/compiler.h linux-2.6.32.38/include/linu |
15488 |
+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) |
15489 |
|
15490 |
#endif /* __LINUX_COMPILER_H */ |
15491 |
-diff -urNp linux-2.6.32.38/include/linux/decompress/mm.h linux-2.6.32.38/include/linux/decompress/mm.h |
15492 |
---- linux-2.6.32.38/include/linux/decompress/mm.h 2011-03-27 14:31:47.000000000 -0400 |
15493 |
-+++ linux-2.6.32.38/include/linux/decompress/mm.h 2011-04-17 15:56:46.000000000 -0400 |
15494 |
+diff -urNp linux-2.6.32.39/include/linux/dcache.h linux-2.6.32.39/include/linux/dcache.h |
15495 |
+--- linux-2.6.32.39/include/linux/dcache.h 2011-03-27 14:31:47.000000000 -0400 |
15496 |
++++ linux-2.6.32.39/include/linux/dcache.h 2011-04-23 13:34:46.000000000 -0400 |
15497 |
+@@ -119,6 +119,8 @@ struct dentry { |
15498 |
+ unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */ |
15499 |
+ }; |
15500 |
+ |
15501 |
++#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname)) |
15502 |
++ |
15503 |
+ /* |
15504 |
+ * dentry->d_lock spinlock nesting subclasses: |
15505 |
+ * |
15506 |
+diff -urNp linux-2.6.32.39/include/linux/decompress/mm.h linux-2.6.32.39/include/linux/decompress/mm.h |
15507 |
+--- linux-2.6.32.39/include/linux/decompress/mm.h 2011-03-27 14:31:47.000000000 -0400 |
15508 |
++++ linux-2.6.32.39/include/linux/decompress/mm.h 2011-04-17 15:56:46.000000000 -0400 |
15509 |
@@ -78,7 +78,7 @@ static void free(void *where) |
15510 |
* warnings when not needed (indeed large_malloc / large_free are not |
15511 |
* needed by inflate */ |
15512 |
@@ -48917,9 +46956,9 @@ diff -urNp linux-2.6.32.38/include/linux/decompress/mm.h linux-2.6.32.38/include |
15513 |
#define free(a) kfree(a) |
15514 |
|
15515 |
#define large_malloc(a) vmalloc(a) |
15516 |
-diff -urNp linux-2.6.32.38/include/linux/dma-mapping.h linux-2.6.32.38/include/linux/dma-mapping.h |
15517 |
---- linux-2.6.32.38/include/linux/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
15518 |
-+++ linux-2.6.32.38/include/linux/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 |
15519 |
+diff -urNp linux-2.6.32.39/include/linux/dma-mapping.h linux-2.6.32.39/include/linux/dma-mapping.h |
15520 |
+--- linux-2.6.32.39/include/linux/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 |
15521 |
++++ linux-2.6.32.39/include/linux/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 |
15522 |
@@ -16,50 +16,50 @@ enum dma_data_direction { |
15523 |
}; |
15524 |
|
15525 |
@@ -48986,9 +47025,9 @@ diff -urNp linux-2.6.32.38/include/linux/dma-mapping.h linux-2.6.32.38/include/l |
15526 |
}; |
15527 |
|
15528 |
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) |
15529 |
-diff -urNp linux-2.6.32.38/include/linux/dst.h linux-2.6.32.38/include/linux/dst.h |
15530 |
---- linux-2.6.32.38/include/linux/dst.h 2011-03-27 14:31:47.000000000 -0400 |
15531 |
-+++ linux-2.6.32.38/include/linux/dst.h 2011-04-17 15:56:46.000000000 -0400 |
15532 |
+diff -urNp linux-2.6.32.39/include/linux/dst.h linux-2.6.32.39/include/linux/dst.h |
15533 |
+--- linux-2.6.32.39/include/linux/dst.h 2011-03-27 14:31:47.000000000 -0400 |
15534 |
++++ linux-2.6.32.39/include/linux/dst.h 2011-04-17 15:56:46.000000000 -0400 |
15535 |
@@ -380,7 +380,7 @@ struct dst_node |
15536 |
struct thread_pool *pool; |
15537 |
|
15538 |
@@ -48998,9 +47037,9 @@ diff -urNp linux-2.6.32.38/include/linux/dst.h linux-2.6.32.38/include/linux/dst |
15539 |
|
15540 |
/* |
15541 |
* How frequently and how many times transaction |
15542 |
-diff -urNp linux-2.6.32.38/include/linux/elf.h linux-2.6.32.38/include/linux/elf.h |
15543 |
---- linux-2.6.32.38/include/linux/elf.h 2011-03-27 14:31:47.000000000 -0400 |
15544 |
-+++ linux-2.6.32.38/include/linux/elf.h 2011-04-17 15:56:46.000000000 -0400 |
15545 |
+diff -urNp linux-2.6.32.39/include/linux/elf.h linux-2.6.32.39/include/linux/elf.h |
15546 |
+--- linux-2.6.32.39/include/linux/elf.h 2011-03-27 14:31:47.000000000 -0400 |
15547 |
++++ linux-2.6.32.39/include/linux/elf.h 2011-04-17 15:56:46.000000000 -0400 |
15548 |
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; |
15549 |
#define PT_GNU_EH_FRAME 0x6474e550 |
15550 |
|
15551 |
@@ -49073,9 +47112,9 @@ diff -urNp linux-2.6.32.38/include/linux/elf.h linux-2.6.32.38/include/linux/elf |
15552 |
|
15553 |
#endif |
15554 |
|
15555 |
-diff -urNp linux-2.6.32.38/include/linux/fs.h linux-2.6.32.38/include/linux/fs.h |
15556 |
---- linux-2.6.32.38/include/linux/fs.h 2011-03-27 14:31:47.000000000 -0400 |
15557 |
-+++ linux-2.6.32.38/include/linux/fs.h 2011-04-17 15:56:46.000000000 -0400 |
15558 |
+diff -urNp linux-2.6.32.39/include/linux/fs.h linux-2.6.32.39/include/linux/fs.h |
15559 |
+--- linux-2.6.32.39/include/linux/fs.h 2011-03-27 14:31:47.000000000 -0400 |
15560 |
++++ linux-2.6.32.39/include/linux/fs.h 2011-04-17 15:56:46.000000000 -0400 |
15561 |
@@ -90,6 +90,11 @@ struct inodes_stat_t { |
15562 |
/* Expect random access pattern */ |
15563 |
#define FMODE_RANDOM ((__force fmode_t)4096) |
15564 |
@@ -49237,9 +47276,9 @@ diff -urNp linux-2.6.32.38/include/linux/fs.h linux-2.6.32.38/include/linux/fs.h |
15565 |
}; |
15566 |
|
15567 |
/* |
15568 |
-diff -urNp linux-2.6.32.38/include/linux/fs_struct.h linux-2.6.32.38/include/linux/fs_struct.h |
15569 |
---- linux-2.6.32.38/include/linux/fs_struct.h 2011-03-27 14:31:47.000000000 -0400 |
15570 |
-+++ linux-2.6.32.38/include/linux/fs_struct.h 2011-04-17 15:56:46.000000000 -0400 |
15571 |
+diff -urNp linux-2.6.32.39/include/linux/fs_struct.h linux-2.6.32.39/include/linux/fs_struct.h |
15572 |
+--- linux-2.6.32.39/include/linux/fs_struct.h 2011-03-27 14:31:47.000000000 -0400 |
15573 |
++++ linux-2.6.32.39/include/linux/fs_struct.h 2011-04-17 15:56:46.000000000 -0400 |
15574 |
@@ -4,7 +4,7 @@ |
15575 |
#include <linux/path.h> |
15576 |
|
15577 |
@@ -49249,9 +47288,9 @@ diff -urNp linux-2.6.32.38/include/linux/fs_struct.h linux-2.6.32.38/include/lin |
15578 |
rwlock_t lock; |
15579 |
int umask; |
15580 |
int in_exec; |
15581 |
-diff -urNp linux-2.6.32.38/include/linux/genhd.h linux-2.6.32.38/include/linux/genhd.h |
15582 |
---- linux-2.6.32.38/include/linux/genhd.h 2011-03-27 14:31:47.000000000 -0400 |
15583 |
-+++ linux-2.6.32.38/include/linux/genhd.h 2011-04-17 15:56:46.000000000 -0400 |
15584 |
+diff -urNp linux-2.6.32.39/include/linux/genhd.h linux-2.6.32.39/include/linux/genhd.h |
15585 |
+--- linux-2.6.32.39/include/linux/genhd.h 2011-03-27 14:31:47.000000000 -0400 |
15586 |
++++ linux-2.6.32.39/include/linux/genhd.h 2011-04-17 15:56:46.000000000 -0400 |
15587 |
@@ -161,7 +161,7 @@ struct gendisk { |
15588 |
|
15589 |
struct timer_rand_state *random; |
15590 |
@@ -49261,9 +47300,9 @@ diff -urNp linux-2.6.32.38/include/linux/genhd.h linux-2.6.32.38/include/linux/g |
15591 |
struct work_struct async_notify; |
15592 |
#ifdef CONFIG_BLK_DEV_INTEGRITY |
15593 |
struct blk_integrity *integrity; |
15594 |
-diff -urNp linux-2.6.32.38/include/linux/gracl.h linux-2.6.32.38/include/linux/gracl.h |
15595 |
---- linux-2.6.32.38/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 |
15596 |
-+++ linux-2.6.32.38/include/linux/gracl.h 2011-04-17 15:56:46.000000000 -0400 |
15597 |
+diff -urNp linux-2.6.32.39/include/linux/gracl.h linux-2.6.32.39/include/linux/gracl.h |
15598 |
+--- linux-2.6.32.39/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 |
15599 |
++++ linux-2.6.32.39/include/linux/gracl.h 2011-04-17 15:56:46.000000000 -0400 |
15600 |
@@ -0,0 +1,317 @@ |
15601 |
+#ifndef GR_ACL_H |
15602 |
+#define GR_ACL_H |
15603 |
@@ -49582,9 +47621,9 @@ diff -urNp linux-2.6.32.38/include/linux/gracl.h linux-2.6.32.38/include/linux/g |
15604 |
+ |
15605 |
+#endif |
15606 |
+ |
15607 |
-diff -urNp linux-2.6.32.38/include/linux/gralloc.h linux-2.6.32.38/include/linux/gralloc.h |
15608 |
---- linux-2.6.32.38/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 |
15609 |
-+++ linux-2.6.32.38/include/linux/gralloc.h 2011-04-17 15:56:46.000000000 -0400 |
15610 |
+diff -urNp linux-2.6.32.39/include/linux/gralloc.h linux-2.6.32.39/include/linux/gralloc.h |
15611 |
+--- linux-2.6.32.39/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 |
15612 |
++++ linux-2.6.32.39/include/linux/gralloc.h 2011-04-17 15:56:46.000000000 -0400 |
15613 |
@@ -0,0 +1,9 @@ |
15614 |
+#ifndef __GRALLOC_H |
15615 |
+#define __GRALLOC_H |
15616 |
@@ -49595,9 +47634,9 @@ diff -urNp linux-2.6.32.38/include/linux/gralloc.h linux-2.6.32.38/include/linux |
15617 |
+void *acl_alloc_num(unsigned long num, unsigned long len); |
15618 |
+ |
15619 |
+#endif |
15620 |
-diff -urNp linux-2.6.32.38/include/linux/grdefs.h linux-2.6.32.38/include/linux/grdefs.h |
15621 |
---- linux-2.6.32.38/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 |
15622 |
-+++ linux-2.6.32.38/include/linux/grdefs.h 2011-04-17 15:56:46.000000000 -0400 |
15623 |
+diff -urNp linux-2.6.32.39/include/linux/grdefs.h linux-2.6.32.39/include/linux/grdefs.h |
15624 |
+--- linux-2.6.32.39/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 |
15625 |
++++ linux-2.6.32.39/include/linux/grdefs.h 2011-04-17 15:56:46.000000000 -0400 |
15626 |
@@ -0,0 +1,139 @@ |
15627 |
+#ifndef GRDEFS_H |
15628 |
+#define GRDEFS_H |
15629 |
@@ -49738,9 +47777,9 @@ diff -urNp linux-2.6.32.38/include/linux/grdefs.h linux-2.6.32.38/include/linux/ |
15630 |
+}; |
15631 |
+ |
15632 |
+#endif |
15633 |
-diff -urNp linux-2.6.32.38/include/linux/grinternal.h linux-2.6.32.38/include/linux/grinternal.h |
15634 |
---- linux-2.6.32.38/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 |
15635 |
-+++ linux-2.6.32.38/include/linux/grinternal.h 2011-04-17 15:56:46.000000000 -0400 |
15636 |
+diff -urNp linux-2.6.32.39/include/linux/grinternal.h linux-2.6.32.39/include/linux/grinternal.h |
15637 |
+--- linux-2.6.32.39/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 |
15638 |
++++ linux-2.6.32.39/include/linux/grinternal.h 2011-04-17 15:56:46.000000000 -0400 |
15639 |
@@ -0,0 +1,218 @@ |
15640 |
+#ifndef __GRINTERNAL_H |
15641 |
+#define __GRINTERNAL_H |
15642 |
@@ -49960,9 +47999,9 @@ diff -urNp linux-2.6.32.38/include/linux/grinternal.h linux-2.6.32.38/include/li |
15643 |
+#endif |
15644 |
+ |
15645 |
+#endif |
15646 |
-diff -urNp linux-2.6.32.38/include/linux/grmsg.h linux-2.6.32.38/include/linux/grmsg.h |
15647 |
---- linux-2.6.32.38/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 |
15648 |
-+++ linux-2.6.32.38/include/linux/grmsg.h 2011-04-17 15:56:46.000000000 -0400 |
15649 |
+diff -urNp linux-2.6.32.39/include/linux/grmsg.h linux-2.6.32.39/include/linux/grmsg.h |
15650 |
+--- linux-2.6.32.39/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 |
15651 |
++++ linux-2.6.32.39/include/linux/grmsg.h 2011-04-17 15:56:46.000000000 -0400 |
15652 |
@@ -0,0 +1,108 @@ |
15653 |
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" |
15654 |
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" |
15655 |
@@ -50072,9 +48111,9 @@ diff -urNp linux-2.6.32.38/include/linux/grmsg.h linux-2.6.32.38/include/linux/g |
15656 |
+#define GR_VM86_MSG "denied use of vm86 by " |
15657 |
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " |
15658 |
+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by " |
15659 |
-diff -urNp linux-2.6.32.38/include/linux/grsecurity.h linux-2.6.32.38/include/linux/grsecurity.h |
15660 |
---- linux-2.6.32.38/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 |
15661 |
-+++ linux-2.6.32.38/include/linux/grsecurity.h 2011-04-17 15:56:46.000000000 -0400 |
15662 |
+diff -urNp linux-2.6.32.39/include/linux/grsecurity.h linux-2.6.32.39/include/linux/grsecurity.h |
15663 |
+--- linux-2.6.32.39/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 |
15664 |
++++ linux-2.6.32.39/include/linux/grsecurity.h 2011-04-17 15:56:46.000000000 -0400 |
15665 |
@@ -0,0 +1,212 @@ |
15666 |
+#ifndef GR_SECURITY_H |
15667 |
+#define GR_SECURITY_H |
15668 |
@@ -50288,9 +48327,9 @@ diff -urNp linux-2.6.32.38/include/linux/grsecurity.h linux-2.6.32.38/include/li |
15669 |
+#endif |
15670 |
+ |
15671 |
+#endif |
15672 |
-diff -urNp linux-2.6.32.38/include/linux/hdpu_features.h linux-2.6.32.38/include/linux/hdpu_features.h |
15673 |
---- linux-2.6.32.38/include/linux/hdpu_features.h 2011-03-27 14:31:47.000000000 -0400 |
15674 |
-+++ linux-2.6.32.38/include/linux/hdpu_features.h 2011-04-17 15:56:46.000000000 -0400 |
15675 |
+diff -urNp linux-2.6.32.39/include/linux/hdpu_features.h linux-2.6.32.39/include/linux/hdpu_features.h |
15676 |
+--- linux-2.6.32.39/include/linux/hdpu_features.h 2011-03-27 14:31:47.000000000 -0400 |
15677 |
++++ linux-2.6.32.39/include/linux/hdpu_features.h 2011-04-17 15:56:46.000000000 -0400 |
15678 |
@@ -3,7 +3,7 @@ |
15679 |
struct cpustate_t { |
15680 |
spinlock_t lock; |
15681 |
@@ -50300,9 +48339,9 @@ diff -urNp linux-2.6.32.38/include/linux/hdpu_features.h linux-2.6.32.38/include |
15682 |
unsigned char cached_val; |
15683 |
int inited; |
15684 |
unsigned long *set_addr; |
15685 |
-diff -urNp linux-2.6.32.38/include/linux/highmem.h linux-2.6.32.38/include/linux/highmem.h |
15686 |
---- linux-2.6.32.38/include/linux/highmem.h 2011-03-27 14:31:47.000000000 -0400 |
15687 |
-+++ linux-2.6.32.38/include/linux/highmem.h 2011-04-17 15:56:46.000000000 -0400 |
15688 |
+diff -urNp linux-2.6.32.39/include/linux/highmem.h linux-2.6.32.39/include/linux/highmem.h |
15689 |
+--- linux-2.6.32.39/include/linux/highmem.h 2011-03-27 14:31:47.000000000 -0400 |
15690 |
++++ linux-2.6.32.39/include/linux/highmem.h 2011-04-17 15:56:46.000000000 -0400 |
15691 |
@@ -137,6 +137,18 @@ static inline void clear_highpage(struct |
15692 |
kunmap_atomic(kaddr, KM_USER0); |
15693 |
} |
15694 |
@@ -50322,9 +48361,9 @@ diff -urNp linux-2.6.32.38/include/linux/highmem.h linux-2.6.32.38/include/linux |
15695 |
static inline void zero_user_segments(struct page *page, |
15696 |
unsigned start1, unsigned end1, |
15697 |
unsigned start2, unsigned end2) |
15698 |
-diff -urNp linux-2.6.32.38/include/linux/init_task.h linux-2.6.32.38/include/linux/init_task.h |
15699 |
---- linux-2.6.32.38/include/linux/init_task.h 2011-03-27 14:31:47.000000000 -0400 |
15700 |
-+++ linux-2.6.32.38/include/linux/init_task.h 2011-04-18 18:02:57.000000000 -0400 |
15701 |
+diff -urNp linux-2.6.32.39/include/linux/init_task.h linux-2.6.32.39/include/linux/init_task.h |
15702 |
+--- linux-2.6.32.39/include/linux/init_task.h 2011-03-27 14:31:47.000000000 -0400 |
15703 |
++++ linux-2.6.32.39/include/linux/init_task.h 2011-04-18 18:02:57.000000000 -0400 |
15704 |
@@ -83,6 +83,12 @@ extern struct group_info init_groups; |
15705 |
#define INIT_IDS |
15706 |
#endif |
15707 |
@@ -50346,9 +48385,9 @@ diff -urNp linux-2.6.32.38/include/linux/init_task.h linux-2.6.32.38/include/lin |
15708 |
.fs = &init_fs, \ |
15709 |
.files = &init_files, \ |
15710 |
.signal = &init_signals, \ |
15711 |
-diff -urNp linux-2.6.32.38/include/linux/interrupt.h linux-2.6.32.38/include/linux/interrupt.h |
15712 |
---- linux-2.6.32.38/include/linux/interrupt.h 2011-03-27 14:31:47.000000000 -0400 |
15713 |
-+++ linux-2.6.32.38/include/linux/interrupt.h 2011-04-17 15:56:46.000000000 -0400 |
15714 |
+diff -urNp linux-2.6.32.39/include/linux/interrupt.h linux-2.6.32.39/include/linux/interrupt.h |
15715 |
+--- linux-2.6.32.39/include/linux/interrupt.h 2011-03-27 14:31:47.000000000 -0400 |
15716 |
++++ linux-2.6.32.39/include/linux/interrupt.h 2011-04-17 15:56:46.000000000 -0400 |
15717 |
@@ -362,7 +362,7 @@ enum |
15718 |
/* map softirq index to softirq name. update 'softirq_to_name' in |
15719 |
* kernel/softirq.c when adding a new softirq. |
15720 |
@@ -50373,9 +48412,9 @@ diff -urNp linux-2.6.32.38/include/linux/interrupt.h linux-2.6.32.38/include/lin |
15721 |
extern void softirq_init(void); |
15722 |
#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) |
15723 |
extern void raise_softirq_irqoff(unsigned int nr); |
15724 |
-diff -urNp linux-2.6.32.38/include/linux/irq.h linux-2.6.32.38/include/linux/irq.h |
15725 |
---- linux-2.6.32.38/include/linux/irq.h 2011-03-27 14:31:47.000000000 -0400 |
15726 |
-+++ linux-2.6.32.38/include/linux/irq.h 2011-04-17 15:56:46.000000000 -0400 |
15727 |
+diff -urNp linux-2.6.32.39/include/linux/irq.h linux-2.6.32.39/include/linux/irq.h |
15728 |
+--- linux-2.6.32.39/include/linux/irq.h 2011-03-27 14:31:47.000000000 -0400 |
15729 |
++++ linux-2.6.32.39/include/linux/irq.h 2011-04-17 15:56:46.000000000 -0400 |
15730 |
@@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq, |
15731 |
static inline bool alloc_desc_masks(struct irq_desc *desc, int node, |
15732 |
bool boot) |
15733 |
@@ -50390,33 +48429,9 @@ diff -urNp linux-2.6.32.38/include/linux/irq.h linux-2.6.32.38/include/linux/irq |
15734 |
if (!alloc_cpumask_var_node(&desc->affinity, gfp, node)) |
15735 |
return false; |
15736 |
|
15737 |
-diff -urNp linux-2.6.32.38/include/linux/jbd2.h linux-2.6.32.38/include/linux/jbd2.h |
15738 |
---- linux-2.6.32.38/include/linux/jbd2.h 2011-03-27 14:31:47.000000000 -0400 |
15739 |
-+++ linux-2.6.32.38/include/linux/jbd2.h 2011-04-17 15:56:46.000000000 -0400 |
15740 |
-@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; |
15741 |
- } \ |
15742 |
- } while (0) |
15743 |
- #else |
15744 |
--#define jbd_debug(f, a...) /**/ |
15745 |
-+#define jbd_debug(f, a...) do {} while (0) |
15746 |
- #endif |
15747 |
- |
15748 |
- static inline void *jbd2_alloc(size_t size, gfp_t flags) |
15749 |
-diff -urNp linux-2.6.32.38/include/linux/jbd.h linux-2.6.32.38/include/linux/jbd.h |
15750 |
---- linux-2.6.32.38/include/linux/jbd.h 2011-03-27 14:31:47.000000000 -0400 |
15751 |
-+++ linux-2.6.32.38/include/linux/jbd.h 2011-04-17 15:56:46.000000000 -0400 |
15752 |
-@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; |
15753 |
- } \ |
15754 |
- } while (0) |
15755 |
- #else |
15756 |
--#define jbd_debug(f, a...) /**/ |
15757 |
-+#define jbd_debug(f, a...) do {} while (0) |
15758 |
- #endif |
15759 |
- |
15760 |
- static inline void *jbd_alloc(size_t size, gfp_t flags) |
15761 |
-diff -urNp linux-2.6.32.38/include/linux/kallsyms.h linux-2.6.32.38/include/linux/kallsyms.h |
15762 |
---- linux-2.6.32.38/include/linux/kallsyms.h 2011-03-27 14:31:47.000000000 -0400 |
15763 |
-+++ linux-2.6.32.38/include/linux/kallsyms.h 2011-04-17 15:56:46.000000000 -0400 |
15764 |
+diff -urNp linux-2.6.32.39/include/linux/kallsyms.h linux-2.6.32.39/include/linux/kallsyms.h |
15765 |
+--- linux-2.6.32.39/include/linux/kallsyms.h 2011-03-27 14:31:47.000000000 -0400 |
15766 |
++++ linux-2.6.32.39/include/linux/kallsyms.h 2011-04-17 15:56:46.000000000 -0400 |
15767 |
@@ -15,7 +15,8 @@ |
15768 |
|
15769 |
struct module; |
15770 |
@@ -50443,9 +48458,9 @@ diff -urNp linux-2.6.32.38/include/linux/kallsyms.h linux-2.6.32.38/include/linu |
15771 |
|
15772 |
/* This macro allows us to keep printk typechecking */ |
15773 |
static void __check_printsym_format(const char *fmt, ...) |
15774 |
-diff -urNp linux-2.6.32.38/include/linux/kgdb.h linux-2.6.32.38/include/linux/kgdb.h |
15775 |
---- linux-2.6.32.38/include/linux/kgdb.h 2011-03-27 14:31:47.000000000 -0400 |
15776 |
-+++ linux-2.6.32.38/include/linux/kgdb.h 2011-04-17 15:56:46.000000000 -0400 |
15777 |
+diff -urNp linux-2.6.32.39/include/linux/kgdb.h linux-2.6.32.39/include/linux/kgdb.h |
15778 |
+--- linux-2.6.32.39/include/linux/kgdb.h 2011-03-27 14:31:47.000000000 -0400 |
15779 |
++++ linux-2.6.32.39/include/linux/kgdb.h 2011-04-17 15:56:46.000000000 -0400 |
15780 |
@@ -251,20 +251,20 @@ struct kgdb_arch { |
15781 |
*/ |
15782 |
struct kgdb_io { |
15783 |
@@ -50476,9 +48491,9 @@ diff -urNp linux-2.6.32.38/include/linux/kgdb.h linux-2.6.32.38/include/linux/kg |
15784 |
|
15785 |
extern int kgdb_hex2long(char **ptr, unsigned long *long_val); |
15786 |
extern int kgdb_mem2hex(char *mem, char *buf, int count); |
15787 |
-diff -urNp linux-2.6.32.38/include/linux/kmod.h linux-2.6.32.38/include/linux/kmod.h |
15788 |
---- linux-2.6.32.38/include/linux/kmod.h 2011-03-27 14:31:47.000000000 -0400 |
15789 |
-+++ linux-2.6.32.38/include/linux/kmod.h 2011-04-17 15:56:46.000000000 -0400 |
15790 |
+diff -urNp linux-2.6.32.39/include/linux/kmod.h linux-2.6.32.39/include/linux/kmod.h |
15791 |
+--- linux-2.6.32.39/include/linux/kmod.h 2011-03-27 14:31:47.000000000 -0400 |
15792 |
++++ linux-2.6.32.39/include/linux/kmod.h 2011-04-17 15:56:46.000000000 -0400 |
15793 |
@@ -31,6 +31,8 @@ |
15794 |
* usually useless though. */ |
15795 |
extern int __request_module(bool wait, const char *name, ...) \ |
15796 |
@@ -50488,9 +48503,9 @@ diff -urNp linux-2.6.32.38/include/linux/kmod.h linux-2.6.32.38/include/linux/km |
15797 |
#define request_module(mod...) __request_module(true, mod) |
15798 |
#define request_module_nowait(mod...) __request_module(false, mod) |
15799 |
#define try_then_request_module(x, mod...) \ |
15800 |
-diff -urNp linux-2.6.32.38/include/linux/kobject.h linux-2.6.32.38/include/linux/kobject.h |
15801 |
---- linux-2.6.32.38/include/linux/kobject.h 2011-03-27 14:31:47.000000000 -0400 |
15802 |
-+++ linux-2.6.32.38/include/linux/kobject.h 2011-04-17 15:56:46.000000000 -0400 |
15803 |
+diff -urNp linux-2.6.32.39/include/linux/kobject.h linux-2.6.32.39/include/linux/kobject.h |
15804 |
+--- linux-2.6.32.39/include/linux/kobject.h 2011-03-27 14:31:47.000000000 -0400 |
15805 |
++++ linux-2.6.32.39/include/linux/kobject.h 2011-04-17 15:56:46.000000000 -0400 |
15806 |
@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob |
15807 |
|
15808 |
struct kobj_type { |
15809 |
@@ -50539,9 +48554,9 @@ diff -urNp linux-2.6.32.38/include/linux/kobject.h linux-2.6.32.38/include/linux |
15810 |
struct kobject *parent_kobj); |
15811 |
|
15812 |
static inline struct kset *to_kset(struct kobject *kobj) |
15813 |
-diff -urNp linux-2.6.32.38/include/linux/kvm_host.h linux-2.6.32.38/include/linux/kvm_host.h |
15814 |
---- linux-2.6.32.38/include/linux/kvm_host.h 2011-03-27 14:31:47.000000000 -0400 |
15815 |
-+++ linux-2.6.32.38/include/linux/kvm_host.h 2011-04-17 15:56:46.000000000 -0400 |
15816 |
+diff -urNp linux-2.6.32.39/include/linux/kvm_host.h linux-2.6.32.39/include/linux/kvm_host.h |
15817 |
+--- linux-2.6.32.39/include/linux/kvm_host.h 2011-03-27 14:31:47.000000000 -0400 |
15818 |
++++ linux-2.6.32.39/include/linux/kvm_host.h 2011-04-17 15:56:46.000000000 -0400 |
15819 |
@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc |
15820 |
void vcpu_load(struct kvm_vcpu *vcpu); |
15821 |
void vcpu_put(struct kvm_vcpu *vcpu); |
15822 |
@@ -50560,24 +48575,9 @@ diff -urNp linux-2.6.32.38/include/linux/kvm_host.h linux-2.6.32.38/include/linu |
15823 |
void kvm_arch_exit(void); |
15824 |
|
15825 |
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); |
15826 |
-diff -urNp linux-2.6.32.38/include/linux/libata.h linux-2.6.32.38/include/linux/libata.h |
15827 |
---- linux-2.6.32.38/include/linux/libata.h 2011-03-27 14:31:47.000000000 -0400 |
15828 |
-+++ linux-2.6.32.38/include/linux/libata.h 2011-04-17 15:56:46.000000000 -0400 |
15829 |
-@@ -64,11 +64,11 @@ |
15830 |
- #ifdef ATA_VERBOSE_DEBUG |
15831 |
- #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) |
15832 |
- #else |
15833 |
--#define VPRINTK(fmt, args...) |
15834 |
-+#define VPRINTK(fmt, args...) do {} while (0) |
15835 |
- #endif /* ATA_VERBOSE_DEBUG */ |
15836 |
- #else |
15837 |
--#define DPRINTK(fmt, args...) |
15838 |
--#define VPRINTK(fmt, args...) |
15839 |
-+#define DPRINTK(fmt, args...) do {} while (0) |
15840 |
-+#define VPRINTK(fmt, args...) do {} while (0) |
15841 |
- #endif /* ATA_DEBUG */ |
15842 |
- |
15843 |
- #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) |
15844 |
+diff -urNp linux-2.6.32.39/include/linux/libata.h linux-2.6.32.39/include/linux/libata.h |
15845 |
+--- linux-2.6.32.39/include/linux/libata.h 2011-03-27 14:31:47.000000000 -0400 |
15846 |
++++ linux-2.6.32.39/include/linux/libata.h 2011-04-23 12:56:11.000000000 -0400 |
15847 |
@@ -525,11 +525,11 @@ struct ata_ioports { |
15848 |
|
15849 |
struct ata_host { |
15850 |
@@ -50628,9 +48628,9 @@ diff -urNp linux-2.6.32.38/include/linux/libata.h linux-2.6.32.38/include/linux/ |
15851 |
extern int ata_scsi_detect(struct scsi_host_template *sht); |
15852 |
extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
15853 |
extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); |
15854 |
-diff -urNp linux-2.6.32.38/include/linux/lockd/bind.h linux-2.6.32.38/include/linux/lockd/bind.h |
15855 |
---- linux-2.6.32.38/include/linux/lockd/bind.h 2011-03-27 14:31:47.000000000 -0400 |
15856 |
-+++ linux-2.6.32.38/include/linux/lockd/bind.h 2011-04-17 15:56:46.000000000 -0400 |
15857 |
+diff -urNp linux-2.6.32.39/include/linux/lockd/bind.h linux-2.6.32.39/include/linux/lockd/bind.h |
15858 |
+--- linux-2.6.32.39/include/linux/lockd/bind.h 2011-03-27 14:31:47.000000000 -0400 |
15859 |
++++ linux-2.6.32.39/include/linux/lockd/bind.h 2011-04-17 15:56:46.000000000 -0400 |
15860 |
@@ -23,13 +23,13 @@ struct svc_rqst; |
15861 |
* This is the set of functions for lockd->nfsd communication |
15862 |
*/ |
15863 |
@@ -50648,9 +48648,9 @@ diff -urNp linux-2.6.32.38/include/linux/lockd/bind.h linux-2.6.32.38/include/li |
15864 |
|
15865 |
/* |
15866 |
* Similar to nfs_client_initdata, but without the NFS-specific |
15867 |
-diff -urNp linux-2.6.32.38/include/linux/mm.h linux-2.6.32.38/include/linux/mm.h |
15868 |
---- linux-2.6.32.38/include/linux/mm.h 2011-03-27 14:31:47.000000000 -0400 |
15869 |
-+++ linux-2.6.32.38/include/linux/mm.h 2011-04-17 15:56:46.000000000 -0400 |
15870 |
+diff -urNp linux-2.6.32.39/include/linux/mm.h linux-2.6.32.39/include/linux/mm.h |
15871 |
+--- linux-2.6.32.39/include/linux/mm.h 2011-03-27 14:31:47.000000000 -0400 |
15872 |
++++ linux-2.6.32.39/include/linux/mm.h 2011-04-17 15:56:46.000000000 -0400 |
15873 |
@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void |
15874 |
|
15875 |
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ |
15876 |
@@ -50730,9 +48730,9 @@ diff -urNp linux-2.6.32.38/include/linux/mm.h linux-2.6.32.38/include/linux/mm.h |
15877 |
|
15878 |
#endif /* __KERNEL__ */ |
15879 |
#endif /* _LINUX_MM_H */ |
15880 |
-diff -urNp linux-2.6.32.38/include/linux/mm_types.h linux-2.6.32.38/include/linux/mm_types.h |
15881 |
---- linux-2.6.32.38/include/linux/mm_types.h 2011-03-27 14:31:47.000000000 -0400 |
15882 |
-+++ linux-2.6.32.38/include/linux/mm_types.h 2011-04-17 15:56:46.000000000 -0400 |
15883 |
+diff -urNp linux-2.6.32.39/include/linux/mm_types.h linux-2.6.32.39/include/linux/mm_types.h |
15884 |
+--- linux-2.6.32.39/include/linux/mm_types.h 2011-03-27 14:31:47.000000000 -0400 |
15885 |
++++ linux-2.6.32.39/include/linux/mm_types.h 2011-04-17 15:56:46.000000000 -0400 |
15886 |
@@ -186,6 +186,8 @@ struct vm_area_struct { |
15887 |
#ifdef CONFIG_NUMA |
15888 |
struct mempolicy *vm_policy; /* NUMA policy for the VMA */ |
15889 |
@@ -50767,9 +48767,9 @@ diff -urNp linux-2.6.32.38/include/linux/mm_types.h linux-2.6.32.38/include/linu |
15890 |
}; |
15891 |
|
15892 |
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ |
15893 |
-diff -urNp linux-2.6.32.38/include/linux/mmu_notifier.h linux-2.6.32.38/include/linux/mmu_notifier.h |
15894 |
---- linux-2.6.32.38/include/linux/mmu_notifier.h 2011-03-27 14:31:47.000000000 -0400 |
15895 |
-+++ linux-2.6.32.38/include/linux/mmu_notifier.h 2011-04-17 15:56:46.000000000 -0400 |
15896 |
+diff -urNp linux-2.6.32.39/include/linux/mmu_notifier.h linux-2.6.32.39/include/linux/mmu_notifier.h |
15897 |
+--- linux-2.6.32.39/include/linux/mmu_notifier.h 2011-03-27 14:31:47.000000000 -0400 |
15898 |
++++ linux-2.6.32.39/include/linux/mmu_notifier.h 2011-04-17 15:56:46.000000000 -0400 |
15899 |
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr |
15900 |
*/ |
15901 |
#define ptep_clear_flush_notify(__vma, __address, __ptep) \ |
15902 |
@@ -50786,9 +48786,9 @@ diff -urNp linux-2.6.32.38/include/linux/mmu_notifier.h linux-2.6.32.38/include/ |
15903 |
}) |
15904 |
|
15905 |
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ |
15906 |
-diff -urNp linux-2.6.32.38/include/linux/mmzone.h linux-2.6.32.38/include/linux/mmzone.h |
15907 |
---- linux-2.6.32.38/include/linux/mmzone.h 2011-03-27 14:31:47.000000000 -0400 |
15908 |
-+++ linux-2.6.32.38/include/linux/mmzone.h 2011-04-17 15:56:46.000000000 -0400 |
15909 |
+diff -urNp linux-2.6.32.39/include/linux/mmzone.h linux-2.6.32.39/include/linux/mmzone.h |
15910 |
+--- linux-2.6.32.39/include/linux/mmzone.h 2011-03-27 14:31:47.000000000 -0400 |
15911 |
++++ linux-2.6.32.39/include/linux/mmzone.h 2011-04-17 15:56:46.000000000 -0400 |
15912 |
@@ -350,7 +350,7 @@ struct zone { |
15913 |
unsigned long flags; /* zone flags, see below */ |
15914 |
|
15915 |
@@ -50798,9 +48798,9 @@ diff -urNp linux-2.6.32.38/include/linux/mmzone.h linux-2.6.32.38/include/linux/ |
15916 |
|
15917 |
/* |
15918 |
* prev_priority holds the scanning priority for this zone. It is |
15919 |
-diff -urNp linux-2.6.32.38/include/linux/mod_devicetable.h linux-2.6.32.38/include/linux/mod_devicetable.h |
15920 |
---- linux-2.6.32.38/include/linux/mod_devicetable.h 2011-03-27 14:31:47.000000000 -0400 |
15921 |
-+++ linux-2.6.32.38/include/linux/mod_devicetable.h 2011-04-17 15:56:46.000000000 -0400 |
15922 |
+diff -urNp linux-2.6.32.39/include/linux/mod_devicetable.h linux-2.6.32.39/include/linux/mod_devicetable.h |
15923 |
+--- linux-2.6.32.39/include/linux/mod_devicetable.h 2011-03-27 14:31:47.000000000 -0400 |
15924 |
++++ linux-2.6.32.39/include/linux/mod_devicetable.h 2011-04-17 15:56:46.000000000 -0400 |
15925 |
@@ -12,7 +12,7 @@ |
15926 |
typedef unsigned long kernel_ulong_t; |
15927 |
#endif |
15928 |
@@ -50819,9 +48819,9 @@ diff -urNp linux-2.6.32.38/include/linux/mod_devicetable.h linux-2.6.32.38/inclu |
15929 |
|
15930 |
struct hid_device_id { |
15931 |
__u16 bus; |
15932 |
-diff -urNp linux-2.6.32.38/include/linux/module.h linux-2.6.32.38/include/linux/module.h |
15933 |
---- linux-2.6.32.38/include/linux/module.h 2011-03-27 14:31:47.000000000 -0400 |
15934 |
-+++ linux-2.6.32.38/include/linux/module.h 2011-04-17 15:56:46.000000000 -0400 |
15935 |
+diff -urNp linux-2.6.32.39/include/linux/module.h linux-2.6.32.39/include/linux/module.h |
15936 |
+--- linux-2.6.32.39/include/linux/module.h 2011-03-27 14:31:47.000000000 -0400 |
15937 |
++++ linux-2.6.32.39/include/linux/module.h 2011-04-17 15:56:46.000000000 -0400 |
15938 |
@@ -287,16 +287,16 @@ struct module |
15939 |
int (*init)(void); |
15940 |
|
15941 |
@@ -50894,9 +48894,9 @@ diff -urNp linux-2.6.32.38/include/linux/module.h linux-2.6.32.38/include/linux/ |
15942 |
} |
15943 |
|
15944 |
/* Search for module by name: must hold module_mutex. */ |
15945 |
-diff -urNp linux-2.6.32.38/include/linux/moduleloader.h linux-2.6.32.38/include/linux/moduleloader.h |
15946 |
---- linux-2.6.32.38/include/linux/moduleloader.h 2011-03-27 14:31:47.000000000 -0400 |
15947 |
-+++ linux-2.6.32.38/include/linux/moduleloader.h 2011-04-17 15:56:46.000000000 -0400 |
15948 |
+diff -urNp linux-2.6.32.39/include/linux/moduleloader.h linux-2.6.32.39/include/linux/moduleloader.h |
15949 |
+--- linux-2.6.32.39/include/linux/moduleloader.h 2011-03-27 14:31:47.000000000 -0400 |
15950 |
++++ linux-2.6.32.39/include/linux/moduleloader.h 2011-04-17 15:56:46.000000000 -0400 |
15951 |
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st |
15952 |
sections. Returns NULL on failure. */ |
15953 |
void *module_alloc(unsigned long size); |
15954 |
@@ -50919,9 +48919,9 @@ diff -urNp linux-2.6.32.38/include/linux/moduleloader.h linux-2.6.32.38/include/ |
15955 |
/* Apply the given relocation to the (simplified) ELF. Return -error |
15956 |
or 0. */ |
15957 |
int apply_relocate(Elf_Shdr *sechdrs, |
15958 |
-diff -urNp linux-2.6.32.38/include/linux/moduleparam.h linux-2.6.32.38/include/linux/moduleparam.h |
15959 |
---- linux-2.6.32.38/include/linux/moduleparam.h 2011-03-27 14:31:47.000000000 -0400 |
15960 |
-+++ linux-2.6.32.38/include/linux/moduleparam.h 2011-04-17 15:56:46.000000000 -0400 |
15961 |
+diff -urNp linux-2.6.32.39/include/linux/moduleparam.h linux-2.6.32.39/include/linux/moduleparam.h |
15962 |
+--- linux-2.6.32.39/include/linux/moduleparam.h 2011-03-27 14:31:47.000000000 -0400 |
15963 |
++++ linux-2.6.32.39/include/linux/moduleparam.h 2011-04-17 15:56:46.000000000 -0400 |
15964 |
@@ -132,7 +132,7 @@ struct kparam_array |
15965 |
|
15966 |
/* Actually copy string: maxlen param is usually sizeof(string). */ |
15967 |
@@ -50940,9 +48940,9 @@ diff -urNp linux-2.6.32.38/include/linux/moduleparam.h linux-2.6.32.38/include/l |
15968 |
= { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\ |
15969 |
sizeof(array[0]), array }; \ |
15970 |
__module_param_call(MODULE_PARAM_PREFIX, name, \ |
15971 |
-diff -urNp linux-2.6.32.38/include/linux/mutex.h linux-2.6.32.38/include/linux/mutex.h |
15972 |
---- linux-2.6.32.38/include/linux/mutex.h 2011-03-27 14:31:47.000000000 -0400 |
15973 |
-+++ linux-2.6.32.38/include/linux/mutex.h 2011-04-17 15:56:46.000000000 -0400 |
15974 |
+diff -urNp linux-2.6.32.39/include/linux/mutex.h linux-2.6.32.39/include/linux/mutex.h |
15975 |
+--- linux-2.6.32.39/include/linux/mutex.h 2011-03-27 14:31:47.000000000 -0400 |
15976 |
++++ linux-2.6.32.39/include/linux/mutex.h 2011-04-17 15:56:46.000000000 -0400 |
15977 |
@@ -51,7 +51,7 @@ struct mutex { |
15978 |
spinlock_t wait_lock; |
15979 |
struct list_head wait_list; |
15980 |
@@ -50952,9 +48952,9 @@ diff -urNp linux-2.6.32.38/include/linux/mutex.h linux-2.6.32.38/include/linux/m |
15981 |
#endif |
15982 |
#ifdef CONFIG_DEBUG_MUTEXES |
15983 |
const char *name; |
15984 |
-diff -urNp linux-2.6.32.38/include/linux/namei.h linux-2.6.32.38/include/linux/namei.h |
15985 |
---- linux-2.6.32.38/include/linux/namei.h 2011-03-27 14:31:47.000000000 -0400 |
15986 |
-+++ linux-2.6.32.38/include/linux/namei.h 2011-04-17 15:56:46.000000000 -0400 |
15987 |
+diff -urNp linux-2.6.32.39/include/linux/namei.h linux-2.6.32.39/include/linux/namei.h |
15988 |
+--- linux-2.6.32.39/include/linux/namei.h 2011-03-27 14:31:47.000000000 -0400 |
15989 |
++++ linux-2.6.32.39/include/linux/namei.h 2011-04-17 15:56:46.000000000 -0400 |
15990 |
@@ -22,7 +22,7 @@ struct nameidata { |
15991 |
unsigned int flags; |
15992 |
int last_type; |
15993 |
@@ -50979,9 +48979,9 @@ diff -urNp linux-2.6.32.38/include/linux/namei.h linux-2.6.32.38/include/linux/n |
15994 |
{ |
15995 |
return nd->saved_names[nd->depth]; |
15996 |
} |
15997 |
-diff -urNp linux-2.6.32.38/include/linux/netfilter/xt_gradm.h linux-2.6.32.38/include/linux/netfilter/xt_gradm.h |
15998 |
---- linux-2.6.32.38/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 |
15999 |
-+++ linux-2.6.32.38/include/linux/netfilter/xt_gradm.h 2011-04-17 15:56:46.000000000 -0400 |
16000 |
+diff -urNp linux-2.6.32.39/include/linux/netfilter/xt_gradm.h linux-2.6.32.39/include/linux/netfilter/xt_gradm.h |
16001 |
+--- linux-2.6.32.39/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 |
16002 |
++++ linux-2.6.32.39/include/linux/netfilter/xt_gradm.h 2011-04-17 15:56:46.000000000 -0400 |
16003 |
@@ -0,0 +1,9 @@ |
16004 |
+#ifndef _LINUX_NETFILTER_XT_GRADM_H |
16005 |
+#define _LINUX_NETFILTER_XT_GRADM_H 1 |
16006 |
@@ -50992,9 +48992,9 @@ diff -urNp linux-2.6.32.38/include/linux/netfilter/xt_gradm.h linux-2.6.32.38/in |
16007 |
+}; |
16008 |
+ |
16009 |
+#endif |
16010 |
-diff -urNp linux-2.6.32.38/include/linux/nodemask.h linux-2.6.32.38/include/linux/nodemask.h |
16011 |
---- linux-2.6.32.38/include/linux/nodemask.h 2011-03-27 14:31:47.000000000 -0400 |
16012 |
-+++ linux-2.6.32.38/include/linux/nodemask.h 2011-04-17 15:56:46.000000000 -0400 |
16013 |
+diff -urNp linux-2.6.32.39/include/linux/nodemask.h linux-2.6.32.39/include/linux/nodemask.h |
16014 |
+--- linux-2.6.32.39/include/linux/nodemask.h 2011-03-27 14:31:47.000000000 -0400 |
16015 |
++++ linux-2.6.32.39/include/linux/nodemask.h 2011-04-17 15:56:46.000000000 -0400 |
16016 |
@@ -464,11 +464,11 @@ static inline int num_node_state(enum no |
16017 |
|
16018 |
#define any_online_node(mask) \ |
16019 |
@@ -51011,9 +49011,9 @@ diff -urNp linux-2.6.32.38/include/linux/nodemask.h linux-2.6.32.38/include/linu |
16020 |
}) |
16021 |
|
16022 |
#define num_online_nodes() num_node_state(N_ONLINE) |
16023 |
-diff -urNp linux-2.6.32.38/include/linux/oprofile.h linux-2.6.32.38/include/linux/oprofile.h |
16024 |
---- linux-2.6.32.38/include/linux/oprofile.h 2011-03-27 14:31:47.000000000 -0400 |
16025 |
-+++ linux-2.6.32.38/include/linux/oprofile.h 2011-04-17 15:56:46.000000000 -0400 |
16026 |
+diff -urNp linux-2.6.32.39/include/linux/oprofile.h linux-2.6.32.39/include/linux/oprofile.h |
16027 |
+--- linux-2.6.32.39/include/linux/oprofile.h 2011-03-27 14:31:47.000000000 -0400 |
16028 |
++++ linux-2.6.32.39/include/linux/oprofile.h 2011-04-17 15:56:46.000000000 -0400 |
16029 |
@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super |
16030 |
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, |
16031 |
char const * name, ulong * val); |
16032 |
@@ -51026,21 +49026,9 @@ diff -urNp linux-2.6.32.38/include/linux/oprofile.h linux-2.6.32.38/include/linu |
16033 |
|
16034 |
/** create a directory */ |
16035 |
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, |
16036 |
-diff -urNp linux-2.6.32.38/include/linux/pid.h linux-2.6.32.38/include/linux/pid.h |
16037 |
---- linux-2.6.32.38/include/linux/pid.h 2011-03-27 14:31:47.000000000 -0400 |
16038 |
-+++ linux-2.6.32.38/include/linux/pid.h 2011-04-18 19:20:59.000000000 -0400 |
16039 |
-@@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr); |
16040 |
- */ |
16041 |
- extern struct pid *find_get_pid(int nr); |
16042 |
- extern struct pid *find_ge_pid(int nr, struct pid_namespace *); |
16043 |
--int next_pidmap(struct pid_namespace *pid_ns, int last); |
16044 |
-+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last); |
16045 |
- |
16046 |
- extern struct pid *alloc_pid(struct pid_namespace *ns); |
16047 |
- extern void free_pid(struct pid *pid); |
16048 |
-diff -urNp linux-2.6.32.38/include/linux/pipe_fs_i.h linux-2.6.32.38/include/linux/pipe_fs_i.h |
16049 |
---- linux-2.6.32.38/include/linux/pipe_fs_i.h 2011-03-27 14:31:47.000000000 -0400 |
16050 |
-+++ linux-2.6.32.38/include/linux/pipe_fs_i.h 2011-04-17 15:56:46.000000000 -0400 |
16051 |
+diff -urNp linux-2.6.32.39/include/linux/pipe_fs_i.h linux-2.6.32.39/include/linux/pipe_fs_i.h |
16052 |
+--- linux-2.6.32.39/include/linux/pipe_fs_i.h 2011-03-27 14:31:47.000000000 -0400 |
16053 |
++++ linux-2.6.32.39/include/linux/pipe_fs_i.h 2011-04-17 15:56:46.000000000 -0400 |
16054 |
@@ -46,9 +46,9 @@ struct pipe_inode_info { |
16055 |
wait_queue_head_t wait; |
16056 |
unsigned int nrbufs, curbuf; |
16057 |
@@ -51054,9 +49042,9 @@ diff -urNp linux-2.6.32.38/include/linux/pipe_fs_i.h linux-2.6.32.38/include/lin |
16058 |
unsigned int r_counter; |
16059 |
unsigned int w_counter; |
16060 |
struct fasync_struct *fasync_readers; |
16061 |
-diff -urNp linux-2.6.32.38/include/linux/poison.h linux-2.6.32.38/include/linux/poison.h |
16062 |
---- linux-2.6.32.38/include/linux/poison.h 2011-03-27 14:31:47.000000000 -0400 |
16063 |
-+++ linux-2.6.32.38/include/linux/poison.h 2011-04-17 15:56:46.000000000 -0400 |
16064 |
+diff -urNp linux-2.6.32.39/include/linux/poison.h linux-2.6.32.39/include/linux/poison.h |
16065 |
+--- linux-2.6.32.39/include/linux/poison.h 2011-03-27 14:31:47.000000000 -0400 |
16066 |
++++ linux-2.6.32.39/include/linux/poison.h 2011-04-17 15:56:46.000000000 -0400 |
16067 |
@@ -19,8 +19,8 @@ |
16068 |
* under normal circumstances, used to verify that nobody uses |
16069 |
* non-initialized list entries. |
16070 |
@@ -51068,9 +49056,9 @@ diff -urNp linux-2.6.32.38/include/linux/poison.h linux-2.6.32.38/include/linux/ |
16071 |
|
16072 |
/********** include/linux/timer.h **********/ |
16073 |
/* |
16074 |
-diff -urNp linux-2.6.32.38/include/linux/proc_fs.h linux-2.6.32.38/include/linux/proc_fs.h |
16075 |
---- linux-2.6.32.38/include/linux/proc_fs.h 2011-03-27 14:31:47.000000000 -0400 |
16076 |
-+++ linux-2.6.32.38/include/linux/proc_fs.h 2011-04-17 15:56:46.000000000 -0400 |
16077 |
+diff -urNp linux-2.6.32.39/include/linux/proc_fs.h linux-2.6.32.39/include/linux/proc_fs.h |
16078 |
+--- linux-2.6.32.39/include/linux/proc_fs.h 2011-03-27 14:31:47.000000000 -0400 |
16079 |
++++ linux-2.6.32.39/include/linux/proc_fs.h 2011-04-17 15:56:46.000000000 -0400 |
16080 |
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro |
16081 |
return proc_create_data(name, mode, parent, proc_fops, NULL); |
16082 |
} |
16083 |
@@ -51091,9 +49079,9 @@ diff -urNp linux-2.6.32.38/include/linux/proc_fs.h linux-2.6.32.38/include/linux |
16084 |
static inline struct proc_dir_entry *create_proc_read_entry(const char *name, |
16085 |
mode_t mode, struct proc_dir_entry *base, |
16086 |
read_proc_t *read_proc, void * data) |
16087 |
-diff -urNp linux-2.6.32.38/include/linux/ptrace.h linux-2.6.32.38/include/linux/ptrace.h |
16088 |
---- linux-2.6.32.38/include/linux/ptrace.h 2011-03-27 14:31:47.000000000 -0400 |
16089 |
-+++ linux-2.6.32.38/include/linux/ptrace.h 2011-04-17 15:56:46.000000000 -0400 |
16090 |
+diff -urNp linux-2.6.32.39/include/linux/ptrace.h linux-2.6.32.39/include/linux/ptrace.h |
16091 |
+--- linux-2.6.32.39/include/linux/ptrace.h 2011-03-27 14:31:47.000000000 -0400 |
16092 |
++++ linux-2.6.32.39/include/linux/ptrace.h 2011-04-17 15:56:46.000000000 -0400 |
16093 |
@@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_ |
16094 |
extern void exit_ptrace(struct task_struct *tracer); |
16095 |
#define PTRACE_MODE_READ 1 |
16096 |
@@ -51107,9 +49095,9 @@ diff -urNp linux-2.6.32.38/include/linux/ptrace.h linux-2.6.32.38/include/linux/ |
16097 |
|
16098 |
static inline int ptrace_reparented(struct task_struct *child) |
16099 |
{ |
16100 |
-diff -urNp linux-2.6.32.38/include/linux/random.h linux-2.6.32.38/include/linux/random.h |
16101 |
---- linux-2.6.32.38/include/linux/random.h 2011-03-27 14:31:47.000000000 -0400 |
16102 |
-+++ linux-2.6.32.38/include/linux/random.h 2011-04-17 15:56:46.000000000 -0400 |
16103 |
+diff -urNp linux-2.6.32.39/include/linux/random.h linux-2.6.32.39/include/linux/random.h |
16104 |
+--- linux-2.6.32.39/include/linux/random.h 2011-03-27 14:31:47.000000000 -0400 |
16105 |
++++ linux-2.6.32.39/include/linux/random.h 2011-04-17 15:56:46.000000000 -0400 |
16106 |
@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l |
16107 |
u32 random32(void); |
16108 |
void srandom32(u32 seed); |
16109 |
@@ -51122,9 +49110,9 @@ diff -urNp linux-2.6.32.38/include/linux/random.h linux-2.6.32.38/include/linux/ |
16110 |
#endif /* __KERNEL___ */ |
16111 |
|
16112 |
#endif /* _LINUX_RANDOM_H */ |
16113 |
-diff -urNp linux-2.6.32.38/include/linux/reiserfs_fs.h linux-2.6.32.38/include/linux/reiserfs_fs.h |
16114 |
---- linux-2.6.32.38/include/linux/reiserfs_fs.h 2011-03-27 14:31:47.000000000 -0400 |
16115 |
-+++ linux-2.6.32.38/include/linux/reiserfs_fs.h 2011-04-17 15:56:46.000000000 -0400 |
16116 |
+diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs.h linux-2.6.32.39/include/linux/reiserfs_fs.h |
16117 |
+--- linux-2.6.32.39/include/linux/reiserfs_fs.h 2011-03-27 14:31:47.000000000 -0400 |
16118 |
++++ linux-2.6.32.39/include/linux/reiserfs_fs.h 2011-04-17 15:56:46.000000000 -0400 |
16119 |
@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset |
16120 |
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ |
16121 |
|
16122 |
@@ -51171,9 +49159,9 @@ diff -urNp linux-2.6.32.38/include/linux/reiserfs_fs.h linux-2.6.32.38/include/l |
16123 |
|
16124 |
#define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) |
16125 |
#define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) |
16126 |
-diff -urNp linux-2.6.32.38/include/linux/reiserfs_fs_sb.h linux-2.6.32.38/include/linux/reiserfs_fs_sb.h |
16127 |
---- linux-2.6.32.38/include/linux/reiserfs_fs_sb.h 2011-03-27 14:31:47.000000000 -0400 |
16128 |
-+++ linux-2.6.32.38/include/linux/reiserfs_fs_sb.h 2011-04-17 15:56:46.000000000 -0400 |
16129 |
+diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs_sb.h linux-2.6.32.39/include/linux/reiserfs_fs_sb.h |
16130 |
+--- linux-2.6.32.39/include/linux/reiserfs_fs_sb.h 2011-03-27 14:31:47.000000000 -0400 |
16131 |
++++ linux-2.6.32.39/include/linux/reiserfs_fs_sb.h 2011-04-17 15:56:46.000000000 -0400 |
16132 |
@@ -377,7 +377,7 @@ struct reiserfs_sb_info { |
16133 |
/* Comment? -Hans */ |
16134 |
wait_queue_head_t s_wait; |
16135 |
@@ -51183,9 +49171,9 @@ diff -urNp linux-2.6.32.38/include/linux/reiserfs_fs_sb.h linux-2.6.32.38/includ |
16136 |
// tree gets re-balanced |
16137 |
unsigned long s_properties; /* File system properties. Currently holds |
16138 |
on-disk FS format */ |
16139 |
-diff -urNp linux-2.6.32.38/include/linux/sched.h linux-2.6.32.38/include/linux/sched.h |
16140 |
---- linux-2.6.32.38/include/linux/sched.h 2011-03-27 14:31:47.000000000 -0400 |
16141 |
-+++ linux-2.6.32.38/include/linux/sched.h 2011-04-18 22:03:00.000000000 -0400 |
16142 |
+diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include/linux/sched.h |
16143 |
+--- linux-2.6.32.39/include/linux/sched.h 2011-03-27 14:31:47.000000000 -0400 |
16144 |
++++ linux-2.6.32.39/include/linux/sched.h 2011-04-18 22:03:00.000000000 -0400 |
16145 |
@@ -101,6 +101,7 @@ struct bio; |
16146 |
struct fs_struct; |
16147 |
struct bts_context; |
16148 |
@@ -51423,9 +49411,9 @@ diff -urNp linux-2.6.32.38/include/linux/sched.h linux-2.6.32.38/include/linux/s |
16149 |
extern void thread_info_cache_init(void); |
16150 |
|
16151 |
#ifdef CONFIG_DEBUG_STACK_USAGE |
16152 |
-diff -urNp linux-2.6.32.38/include/linux/screen_info.h linux-2.6.32.38/include/linux/screen_info.h |
16153 |
---- linux-2.6.32.38/include/linux/screen_info.h 2011-03-27 14:31:47.000000000 -0400 |
16154 |
-+++ linux-2.6.32.38/include/linux/screen_info.h 2011-04-17 15:56:46.000000000 -0400 |
16155 |
+diff -urNp linux-2.6.32.39/include/linux/screen_info.h linux-2.6.32.39/include/linux/screen_info.h |
16156 |
+--- linux-2.6.32.39/include/linux/screen_info.h 2011-03-27 14:31:47.000000000 -0400 |
16157 |
++++ linux-2.6.32.39/include/linux/screen_info.h 2011-04-17 15:56:46.000000000 -0400 |
16158 |
@@ -42,7 +42,8 @@ struct screen_info { |
16159 |
__u16 pages; /* 0x32 */ |
16160 |
__u16 vesa_attributes; /* 0x34 */ |
16161 |
@@ -51436,9 +49424,9 @@ diff -urNp linux-2.6.32.38/include/linux/screen_info.h linux-2.6.32.38/include/l |
16162 |
} __attribute__((packed)); |
16163 |
|
16164 |
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ |
16165 |
-diff -urNp linux-2.6.32.38/include/linux/security.h linux-2.6.32.38/include/linux/security.h |
16166 |
---- linux-2.6.32.38/include/linux/security.h 2011-03-27 14:31:47.000000000 -0400 |
16167 |
-+++ linux-2.6.32.38/include/linux/security.h 2011-04-17 15:56:46.000000000 -0400 |
16168 |
+diff -urNp linux-2.6.32.39/include/linux/security.h linux-2.6.32.39/include/linux/security.h |
16169 |
+--- linux-2.6.32.39/include/linux/security.h 2011-03-27 14:31:47.000000000 -0400 |
16170 |
++++ linux-2.6.32.39/include/linux/security.h 2011-04-17 15:56:46.000000000 -0400 |
16171 |
@@ -34,6 +34,7 @@ |
16172 |
#include <linux/key.h> |
16173 |
#include <linux/xfrm.h> |
16174 |
@@ -51447,9 +49435,9 @@ diff -urNp linux-2.6.32.38/include/linux/security.h linux-2.6.32.38/include/linu |
16175 |
#include <net/flow.h> |
16176 |
|
16177 |
/* Maximum number of letters for an LSM name string */ |
16178 |
-diff -urNp linux-2.6.32.38/include/linux/shm.h linux-2.6.32.38/include/linux/shm.h |
16179 |
---- linux-2.6.32.38/include/linux/shm.h 2011-03-27 14:31:47.000000000 -0400 |
16180 |
-+++ linux-2.6.32.38/include/linux/shm.h 2011-04-17 15:56:46.000000000 -0400 |
16181 |
+diff -urNp linux-2.6.32.39/include/linux/shm.h linux-2.6.32.39/include/linux/shm.h |
16182 |
+--- linux-2.6.32.39/include/linux/shm.h 2011-03-27 14:31:47.000000000 -0400 |
16183 |
++++ linux-2.6.32.39/include/linux/shm.h 2011-04-17 15:56:46.000000000 -0400 |
16184 |
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke |
16185 |
pid_t shm_cprid; |
16186 |
pid_t shm_lprid; |
16187 |
@@ -51461,9 +49449,9 @@ diff -urNp linux-2.6.32.38/include/linux/shm.h linux-2.6.32.38/include/linux/shm |
16188 |
}; |
16189 |
|
16190 |
/* shm_mode upper byte flags */ |
16191 |
-diff -urNp linux-2.6.32.38/include/linux/skbuff.h linux-2.6.32.38/include/linux/skbuff.h |
16192 |
---- linux-2.6.32.38/include/linux/skbuff.h 2011-03-27 14:31:47.000000000 -0400 |
16193 |
-+++ linux-2.6.32.38/include/linux/skbuff.h 2011-04-17 15:56:46.000000000 -0400 |
16194 |
+diff -urNp linux-2.6.32.39/include/linux/skbuff.h linux-2.6.32.39/include/linux/skbuff.h |
16195 |
+--- linux-2.6.32.39/include/linux/skbuff.h 2011-03-27 14:31:47.000000000 -0400 |
16196 |
++++ linux-2.6.32.39/include/linux/skbuff.h 2011-04-17 15:56:46.000000000 -0400 |
16197 |
@@ -544,7 +544,7 @@ static inline union skb_shared_tx *skb_t |
16198 |
*/ |
16199 |
static inline int skb_queue_empty(const struct sk_buff_head *list) |
16200 |
@@ -51491,9 +49479,9 @@ diff -urNp linux-2.6.32.38/include/linux/skbuff.h linux-2.6.32.38/include/linux/ |
16201 |
} |
16202 |
|
16203 |
/** |
16204 |
-diff -urNp linux-2.6.32.38/include/linux/slab.h linux-2.6.32.38/include/linux/slab.h |
16205 |
---- linux-2.6.32.38/include/linux/slab.h 2011-03-27 14:31:47.000000000 -0400 |
16206 |
-+++ linux-2.6.32.38/include/linux/slab.h 2011-04-17 15:56:46.000000000 -0400 |
16207 |
+diff -urNp linux-2.6.32.39/include/linux/slab.h linux-2.6.32.39/include/linux/slab.h |
16208 |
+--- linux-2.6.32.39/include/linux/slab.h 2011-03-27 14:31:47.000000000 -0400 |
16209 |
++++ linux-2.6.32.39/include/linux/slab.h 2011-04-17 15:56:46.000000000 -0400 |
16210 |
@@ -11,12 +11,20 @@ |
16211 |
|
16212 |
#include <linux/gfp.h> |
16213 |
@@ -51578,9 +49566,9 @@ diff -urNp linux-2.6.32.38/include/linux/slab.h linux-2.6.32.38/include/linux/sl |
16214 |
+}) |
16215 |
+ |
16216 |
#endif /* _LINUX_SLAB_H */ |
16217 |
-diff -urNp linux-2.6.32.38/include/linux/slub_def.h linux-2.6.32.38/include/linux/slub_def.h |
16218 |
---- linux-2.6.32.38/include/linux/slub_def.h 2011-03-27 14:31:47.000000000 -0400 |
16219 |
-+++ linux-2.6.32.38/include/linux/slub_def.h 2011-04-17 15:56:46.000000000 -0400 |
16220 |
+diff -urNp linux-2.6.32.39/include/linux/slub_def.h linux-2.6.32.39/include/linux/slub_def.h |
16221 |
+--- linux-2.6.32.39/include/linux/slub_def.h 2011-03-27 14:31:47.000000000 -0400 |
16222 |
++++ linux-2.6.32.39/include/linux/slub_def.h 2011-04-17 15:56:46.000000000 -0400 |
16223 |
@@ -86,7 +86,7 @@ struct kmem_cache { |
16224 |
struct kmem_cache_order_objects max; |
16225 |
struct kmem_cache_order_objects min; |
16226 |
@@ -51590,9 +49578,9 @@ diff -urNp linux-2.6.32.38/include/linux/slub_def.h linux-2.6.32.38/include/linu |
16227 |
void (*ctor)(void *); |
16228 |
int inuse; /* Offset to metadata */ |
16229 |
int align; /* Alignment */ |
16230 |
-diff -urNp linux-2.6.32.38/include/linux/sonet.h linux-2.6.32.38/include/linux/sonet.h |
16231 |
---- linux-2.6.32.38/include/linux/sonet.h 2011-03-27 14:31:47.000000000 -0400 |
16232 |
-+++ linux-2.6.32.38/include/linux/sonet.h 2011-04-17 15:56:46.000000000 -0400 |
16233 |
+diff -urNp linux-2.6.32.39/include/linux/sonet.h linux-2.6.32.39/include/linux/sonet.h |
16234 |
+--- linux-2.6.32.39/include/linux/sonet.h 2011-03-27 14:31:47.000000000 -0400 |
16235 |
++++ linux-2.6.32.39/include/linux/sonet.h 2011-04-17 15:56:46.000000000 -0400 |
16236 |
@@ -61,7 +61,7 @@ struct sonet_stats { |
16237 |
#include <asm/atomic.h> |
16238 |
|
16239 |
@@ -51602,9 +49590,9 @@ diff -urNp linux-2.6.32.38/include/linux/sonet.h linux-2.6.32.38/include/linux/s |
16240 |
__SONET_ITEMS |
16241 |
#undef __HANDLE_ITEM |
16242 |
}; |
16243 |
-diff -urNp linux-2.6.32.38/include/linux/sunrpc/clnt.h linux-2.6.32.38/include/linux/sunrpc/clnt.h |
16244 |
---- linux-2.6.32.38/include/linux/sunrpc/clnt.h 2011-03-27 14:31:47.000000000 -0400 |
16245 |
-+++ linux-2.6.32.38/include/linux/sunrpc/clnt.h 2011-04-17 15:56:46.000000000 -0400 |
16246 |
+diff -urNp linux-2.6.32.39/include/linux/sunrpc/clnt.h linux-2.6.32.39/include/linux/sunrpc/clnt.h |
16247 |
+--- linux-2.6.32.39/include/linux/sunrpc/clnt.h 2011-03-27 14:31:47.000000000 -0400 |
16248 |
++++ linux-2.6.32.39/include/linux/sunrpc/clnt.h 2011-04-17 15:56:46.000000000 -0400 |
16249 |
@@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por |
16250 |
{ |
16251 |
switch (sap->sa_family) { |
16252 |
@@ -51635,9 +49623,9 @@ diff -urNp linux-2.6.32.38/include/linux/sunrpc/clnt.h linux-2.6.32.38/include/l |
16253 |
} |
16254 |
|
16255 |
#endif /* __KERNEL__ */ |
16256 |
-diff -urNp linux-2.6.32.38/include/linux/suspend.h linux-2.6.32.38/include/linux/suspend.h |
16257 |
---- linux-2.6.32.38/include/linux/suspend.h 2011-03-27 14:31:47.000000000 -0400 |
16258 |
-+++ linux-2.6.32.38/include/linux/suspend.h 2011-04-17 15:56:46.000000000 -0400 |
16259 |
+diff -urNp linux-2.6.32.39/include/linux/suspend.h linux-2.6.32.39/include/linux/suspend.h |
16260 |
+--- linux-2.6.32.39/include/linux/suspend.h 2011-03-27 14:31:47.000000000 -0400 |
16261 |
++++ linux-2.6.32.39/include/linux/suspend.h 2011-04-17 15:56:46.000000000 -0400 |
16262 |
@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; |
16263 |
* which require special recovery actions in that situation. |
16264 |
*/ |
16265 |
@@ -51726,9 +49714,9 @@ diff -urNp linux-2.6.32.38/include/linux/suspend.h linux-2.6.32.38/include/linux |
16266 |
static inline int hibernate(void) { return -ENOSYS; } |
16267 |
static inline bool system_entering_hibernation(void) { return false; } |
16268 |
#endif /* CONFIG_HIBERNATION */ |
16269 |
-diff -urNp linux-2.6.32.38/include/linux/sysctl.h linux-2.6.32.38/include/linux/sysctl.h |
16270 |
---- linux-2.6.32.38/include/linux/sysctl.h 2011-03-27 14:31:47.000000000 -0400 |
16271 |
-+++ linux-2.6.32.38/include/linux/sysctl.h 2011-04-17 15:56:46.000000000 -0400 |
16272 |
+diff -urNp linux-2.6.32.39/include/linux/sysctl.h linux-2.6.32.39/include/linux/sysctl.h |
16273 |
+--- linux-2.6.32.39/include/linux/sysctl.h 2011-03-27 14:31:47.000000000 -0400 |
16274 |
++++ linux-2.6.32.39/include/linux/sysctl.h 2011-04-17 15:56:46.000000000 -0400 |
16275 |
@@ -164,7 +164,11 @@ enum |
16276 |
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ |
16277 |
}; |
16278 |
@@ -51759,9 +49747,9 @@ diff -urNp linux-2.6.32.38/include/linux/sysctl.h linux-2.6.32.38/include/linux/ |
16279 |
extern ctl_handler sysctl_intvec; |
16280 |
extern ctl_handler sysctl_jiffies; |
16281 |
extern ctl_handler sysctl_ms_jiffies; |
16282 |
-diff -urNp linux-2.6.32.38/include/linux/sysfs.h linux-2.6.32.38/include/linux/sysfs.h |
16283 |
---- linux-2.6.32.38/include/linux/sysfs.h 2011-03-27 14:31:47.000000000 -0400 |
16284 |
-+++ linux-2.6.32.38/include/linux/sysfs.h 2011-04-17 15:56:46.000000000 -0400 |
16285 |
+diff -urNp linux-2.6.32.39/include/linux/sysfs.h linux-2.6.32.39/include/linux/sysfs.h |
16286 |
+--- linux-2.6.32.39/include/linux/sysfs.h 2011-03-27 14:31:47.000000000 -0400 |
16287 |
++++ linux-2.6.32.39/include/linux/sysfs.h 2011-04-17 15:56:46.000000000 -0400 |
16288 |
@@ -75,8 +75,8 @@ struct bin_attribute { |
16289 |
}; |
16290 |
|
16291 |
@@ -51773,9 +49761,9 @@ diff -urNp linux-2.6.32.38/include/linux/sysfs.h linux-2.6.32.38/include/linux/s |
16292 |
}; |
16293 |
|
16294 |
struct sysfs_dirent; |
16295 |
-diff -urNp linux-2.6.32.38/include/linux/thread_info.h linux-2.6.32.38/include/linux/thread_info.h |
16296 |
---- linux-2.6.32.38/include/linux/thread_info.h 2011-03-27 14:31:47.000000000 -0400 |
16297 |
-+++ linux-2.6.32.38/include/linux/thread_info.h 2011-04-17 15:56:46.000000000 -0400 |
16298 |
+diff -urNp linux-2.6.32.39/include/linux/thread_info.h linux-2.6.32.39/include/linux/thread_info.h |
16299 |
+--- linux-2.6.32.39/include/linux/thread_info.h 2011-03-27 14:31:47.000000000 -0400 |
16300 |
++++ linux-2.6.32.39/include/linux/thread_info.h 2011-04-17 15:56:46.000000000 -0400 |
16301 |
@@ -23,7 +23,7 @@ struct restart_block { |
16302 |
}; |
16303 |
/* For futex_wait and futex_wait_requeue_pi */ |
16304 |
@@ -51785,9 +49773,9 @@ diff -urNp linux-2.6.32.38/include/linux/thread_info.h linux-2.6.32.38/include/l |
16305 |
u32 val; |
16306 |
u32 flags; |
16307 |
u32 bitset; |
16308 |
-diff -urNp linux-2.6.32.38/include/linux/tty.h linux-2.6.32.38/include/linux/tty.h |
16309 |
---- linux-2.6.32.38/include/linux/tty.h 2011-03-27 14:31:47.000000000 -0400 |
16310 |
-+++ linux-2.6.32.38/include/linux/tty.h 2011-04-17 15:56:46.000000000 -0400 |
16311 |
+diff -urNp linux-2.6.32.39/include/linux/tty.h linux-2.6.32.39/include/linux/tty.h |
16312 |
+--- linux-2.6.32.39/include/linux/tty.h 2011-03-27 14:31:47.000000000 -0400 |
16313 |
++++ linux-2.6.32.39/include/linux/tty.h 2011-04-17 15:56:46.000000000 -0400 |
16314 |
@@ -13,6 +13,7 @@ |
16315 |
#include <linux/tty_driver.h> |
16316 |
#include <linux/tty_ldisc.h> |
16317 |
@@ -51823,9 +49811,9 @@ diff -urNp linux-2.6.32.38/include/linux/tty.h linux-2.6.32.38/include/linux/tty |
16318 |
|
16319 |
/* n_tty.c */ |
16320 |
extern struct tty_ldisc_ops tty_ldisc_N_TTY; |
16321 |
-diff -urNp linux-2.6.32.38/include/linux/tty_ldisc.h linux-2.6.32.38/include/linux/tty_ldisc.h |
16322 |
---- linux-2.6.32.38/include/linux/tty_ldisc.h 2011-03-27 14:31:47.000000000 -0400 |
16323 |
-+++ linux-2.6.32.38/include/linux/tty_ldisc.h 2011-04-17 15:56:46.000000000 -0400 |
16324 |
+diff -urNp linux-2.6.32.39/include/linux/tty_ldisc.h linux-2.6.32.39/include/linux/tty_ldisc.h |
16325 |
+--- linux-2.6.32.39/include/linux/tty_ldisc.h 2011-03-27 14:31:47.000000000 -0400 |
16326 |
++++ linux-2.6.32.39/include/linux/tty_ldisc.h 2011-04-17 15:56:46.000000000 -0400 |
16327 |
@@ -139,7 +139,7 @@ struct tty_ldisc_ops { |
16328 |
|
16329 |
struct module *owner; |
16330 |
@@ -51835,9 +49823,9 @@ diff -urNp linux-2.6.32.38/include/linux/tty_ldisc.h linux-2.6.32.38/include/lin |
16331 |
}; |
16332 |
|
16333 |
struct tty_ldisc { |
16334 |
-diff -urNp linux-2.6.32.38/include/linux/types.h linux-2.6.32.38/include/linux/types.h |
16335 |
---- linux-2.6.32.38/include/linux/types.h 2011-03-27 14:31:47.000000000 -0400 |
16336 |
-+++ linux-2.6.32.38/include/linux/types.h 2011-04-17 15:56:46.000000000 -0400 |
16337 |
+diff -urNp linux-2.6.32.39/include/linux/types.h linux-2.6.32.39/include/linux/types.h |
16338 |
+--- linux-2.6.32.39/include/linux/types.h 2011-03-27 14:31:47.000000000 -0400 |
16339 |
++++ linux-2.6.32.39/include/linux/types.h 2011-04-17 15:56:46.000000000 -0400 |
16340 |
@@ -191,10 +191,26 @@ typedef struct { |
16341 |
volatile int counter; |
16342 |
} atomic_t; |
16343 |
@@ -51865,9 +49853,9 @@ diff -urNp linux-2.6.32.38/include/linux/types.h linux-2.6.32.38/include/linux/t |
16344 |
#endif |
16345 |
|
16346 |
struct ustat { |
16347 |
-diff -urNp linux-2.6.32.38/include/linux/uaccess.h linux-2.6.32.38/include/linux/uaccess.h |
16348 |
---- linux-2.6.32.38/include/linux/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
16349 |
-+++ linux-2.6.32.38/include/linux/uaccess.h 2011-04-17 15:56:46.000000000 -0400 |
16350 |
+diff -urNp linux-2.6.32.39/include/linux/uaccess.h linux-2.6.32.39/include/linux/uaccess.h |
16351 |
+--- linux-2.6.32.39/include/linux/uaccess.h 2011-03-27 14:31:47.000000000 -0400 |
16352 |
++++ linux-2.6.32.39/include/linux/uaccess.h 2011-04-17 15:56:46.000000000 -0400 |
16353 |
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ |
16354 |
long ret; \ |
16355 |
mm_segment_t old_fs = get_fs(); \ |
16356 |
@@ -51899,9 +49887,9 @@ diff -urNp linux-2.6.32.38/include/linux/uaccess.h linux-2.6.32.38/include/linux |
16357 |
+extern long probe_kernel_write(void *dst, const void *src, size_t size); |
16358 |
|
16359 |
#endif /* __LINUX_UACCESS_H__ */ |
16360 |
-diff -urNp linux-2.6.32.38/include/linux/unaligned/access_ok.h linux-2.6.32.38/include/linux/unaligned/access_ok.h |
16361 |
---- linux-2.6.32.38/include/linux/unaligned/access_ok.h 2011-03-27 14:31:47.000000000 -0400 |
16362 |
-+++ linux-2.6.32.38/include/linux/unaligned/access_ok.h 2011-04-17 15:56:46.000000000 -0400 |
16363 |
+diff -urNp linux-2.6.32.39/include/linux/unaligned/access_ok.h linux-2.6.32.39/include/linux/unaligned/access_ok.h |
16364 |
+--- linux-2.6.32.39/include/linux/unaligned/access_ok.h 2011-03-27 14:31:47.000000000 -0400 |
16365 |
++++ linux-2.6.32.39/include/linux/unaligned/access_ok.h 2011-04-17 15:56:46.000000000 -0400 |
16366 |
@@ -6,32 +6,32 @@ |
16367 |
|
16368 |
static inline u16 get_unaligned_le16(const void *p) |
16369 |
@@ -51941,9 +49929,9 @@ diff -urNp linux-2.6.32.38/include/linux/unaligned/access_ok.h linux-2.6.32.38/i |
16370 |
} |
16371 |
|
16372 |
static inline void put_unaligned_le16(u16 val, void *p) |
16373 |
-diff -urNp linux-2.6.32.38/include/linux/vmalloc.h linux-2.6.32.38/include/linux/vmalloc.h |
16374 |
---- linux-2.6.32.38/include/linux/vmalloc.h 2011-03-27 14:31:47.000000000 -0400 |
16375 |
-+++ linux-2.6.32.38/include/linux/vmalloc.h 2011-04-17 15:56:46.000000000 -0400 |
16376 |
+diff -urNp linux-2.6.32.39/include/linux/vmalloc.h linux-2.6.32.39/include/linux/vmalloc.h |
16377 |
+--- linux-2.6.32.39/include/linux/vmalloc.h 2011-03-27 14:31:47.000000000 -0400 |
16378 |
++++ linux-2.6.32.39/include/linux/vmalloc.h 2011-04-17 15:56:46.000000000 -0400 |
16379 |
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining |
16380 |
#define VM_MAP 0x00000004 /* vmap()ed pages */ |
16381 |
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ |
16382 |
@@ -52038,9 +50026,9 @@ diff -urNp linux-2.6.32.38/include/linux/vmalloc.h linux-2.6.32.38/include/linux |
16383 |
+}) |
16384 |
+ |
16385 |
#endif /* _LINUX_VMALLOC_H */ |
16386 |
-diff -urNp linux-2.6.32.38/include/linux/vmstat.h linux-2.6.32.38/include/linux/vmstat.h |
16387 |
---- linux-2.6.32.38/include/linux/vmstat.h 2011-03-27 14:31:47.000000000 -0400 |
16388 |
-+++ linux-2.6.32.38/include/linux/vmstat.h 2011-04-17 15:56:46.000000000 -0400 |
16389 |
+diff -urNp linux-2.6.32.39/include/linux/vmstat.h linux-2.6.32.39/include/linux/vmstat.h |
16390 |
+--- linux-2.6.32.39/include/linux/vmstat.h 2011-03-27 14:31:47.000000000 -0400 |
16391 |
++++ linux-2.6.32.39/include/linux/vmstat.h 2011-04-17 15:56:46.000000000 -0400 |
16392 |
@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in |
16393 |
/* |
16394 |
* Zone based page accounting with per cpu differentials. |
16395 |
@@ -52104,9 +50092,9 @@ diff -urNp linux-2.6.32.38/include/linux/vmstat.h linux-2.6.32.38/include/linux/ |
16396 |
} |
16397 |
|
16398 |
static inline void __dec_zone_page_state(struct page *page, |
16399 |
-diff -urNp linux-2.6.32.38/include/net/inetpeer.h linux-2.6.32.38/include/net/inetpeer.h |
16400 |
---- linux-2.6.32.38/include/net/inetpeer.h 2011-03-27 14:31:47.000000000 -0400 |
16401 |
-+++ linux-2.6.32.38/include/net/inetpeer.h 2011-04-17 15:56:46.000000000 -0400 |
16402 |
+diff -urNp linux-2.6.32.39/include/net/inetpeer.h linux-2.6.32.39/include/net/inetpeer.h |
16403 |
+--- linux-2.6.32.39/include/net/inetpeer.h 2011-03-27 14:31:47.000000000 -0400 |
16404 |
++++ linux-2.6.32.39/include/net/inetpeer.h 2011-04-17 15:56:46.000000000 -0400 |
16405 |
@@ -24,7 +24,7 @@ struct inet_peer |
16406 |
__u32 dtime; /* the time of last use of not |
16407 |
* referenced entries */ |
16408 |
@@ -52116,9 +50104,9 @@ diff -urNp linux-2.6.32.38/include/net/inetpeer.h linux-2.6.32.38/include/net/in |
16409 |
__u32 tcp_ts; |
16410 |
unsigned long tcp_ts_stamp; |
16411 |
}; |
16412 |
-diff -urNp linux-2.6.32.38/include/net/irda/ircomm_tty.h linux-2.6.32.38/include/net/irda/ircomm_tty.h |
16413 |
---- linux-2.6.32.38/include/net/irda/ircomm_tty.h 2011-03-27 14:31:47.000000000 -0400 |
16414 |
-+++ linux-2.6.32.38/include/net/irda/ircomm_tty.h 2011-04-17 15:56:46.000000000 -0400 |
16415 |
+diff -urNp linux-2.6.32.39/include/net/irda/ircomm_tty.h linux-2.6.32.39/include/net/irda/ircomm_tty.h |
16416 |
+--- linux-2.6.32.39/include/net/irda/ircomm_tty.h 2011-03-27 14:31:47.000000000 -0400 |
16417 |
++++ linux-2.6.32.39/include/net/irda/ircomm_tty.h 2011-04-17 15:56:46.000000000 -0400 |
16418 |
@@ -35,6 +35,7 @@ |
16419 |
#include <linux/termios.h> |
16420 |
#include <linux/timer.h> |
16421 |
@@ -52138,9 +50126,9 @@ diff -urNp linux-2.6.32.38/include/net/irda/ircomm_tty.h linux-2.6.32.38/include |
16422 |
|
16423 |
/* Protect concurent access to : |
16424 |
* o self->open_count |
16425 |
-diff -urNp linux-2.6.32.38/include/net/neighbour.h linux-2.6.32.38/include/net/neighbour.h |
16426 |
---- linux-2.6.32.38/include/net/neighbour.h 2011-03-27 14:31:47.000000000 -0400 |
16427 |
-+++ linux-2.6.32.38/include/net/neighbour.h 2011-04-17 15:56:46.000000000 -0400 |
16428 |
+diff -urNp linux-2.6.32.39/include/net/neighbour.h linux-2.6.32.39/include/net/neighbour.h |
16429 |
+--- linux-2.6.32.39/include/net/neighbour.h 2011-03-27 14:31:47.000000000 -0400 |
16430 |
++++ linux-2.6.32.39/include/net/neighbour.h 2011-04-17 15:56:46.000000000 -0400 |
16431 |
@@ -125,12 +125,12 @@ struct neighbour |
16432 |
struct neigh_ops |
16433 |
{ |
16434 |
@@ -52160,9 +50148,9 @@ diff -urNp linux-2.6.32.38/include/net/neighbour.h linux-2.6.32.38/include/net/n |
16435 |
}; |
16436 |
|
16437 |
struct pneigh_entry |
16438 |
-diff -urNp linux-2.6.32.38/include/net/netlink.h linux-2.6.32.38/include/net/netlink.h |
16439 |
---- linux-2.6.32.38/include/net/netlink.h 2011-03-27 14:31:47.000000000 -0400 |
16440 |
-+++ linux-2.6.32.38/include/net/netlink.h 2011-04-17 15:56:46.000000000 -0400 |
16441 |
+diff -urNp linux-2.6.32.39/include/net/netlink.h linux-2.6.32.39/include/net/netlink.h |
16442 |
+--- linux-2.6.32.39/include/net/netlink.h 2011-03-27 14:31:47.000000000 -0400 |
16443 |
++++ linux-2.6.32.39/include/net/netlink.h 2011-04-17 15:56:46.000000000 -0400 |
16444 |
@@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct |
16445 |
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) |
16446 |
{ |
16447 |
@@ -52172,9 +50160,9 @@ diff -urNp linux-2.6.32.38/include/net/netlink.h linux-2.6.32.38/include/net/net |
16448 |
} |
16449 |
|
16450 |
/** |
16451 |
-diff -urNp linux-2.6.32.38/include/net/sctp/sctp.h linux-2.6.32.38/include/net/sctp/sctp.h |
16452 |
---- linux-2.6.32.38/include/net/sctp/sctp.h 2011-03-27 14:31:47.000000000 -0400 |
16453 |
-+++ linux-2.6.32.38/include/net/sctp/sctp.h 2011-04-17 15:56:46.000000000 -0400 |
16454 |
+diff -urNp linux-2.6.32.39/include/net/sctp/sctp.h linux-2.6.32.39/include/net/sctp/sctp.h |
16455 |
+--- linux-2.6.32.39/include/net/sctp/sctp.h 2011-03-27 14:31:47.000000000 -0400 |
16456 |
++++ linux-2.6.32.39/include/net/sctp/sctp.h 2011-04-17 15:56:46.000000000 -0400 |
16457 |
@@ -305,8 +305,8 @@ extern int sctp_debug_flag; |
16458 |
|
16459 |
#else /* SCTP_DEBUG */ |
16460 |
@@ -52186,9 +50174,9 @@ diff -urNp linux-2.6.32.38/include/net/sctp/sctp.h linux-2.6.32.38/include/net/s |
16461 |
#define SCTP_ENABLE_DEBUG |
16462 |
#define SCTP_DISABLE_DEBUG |
16463 |
#define SCTP_ASSERT(expr, str, func) |
16464 |
-diff -urNp linux-2.6.32.38/include/net/tcp.h linux-2.6.32.38/include/net/tcp.h |
16465 |
---- linux-2.6.32.38/include/net/tcp.h 2011-03-27 14:31:47.000000000 -0400 |
16466 |
-+++ linux-2.6.32.38/include/net/tcp.h 2011-04-17 15:56:46.000000000 -0400 |
16467 |
+diff -urNp linux-2.6.32.39/include/net/tcp.h linux-2.6.32.39/include/net/tcp.h |
16468 |
+--- linux-2.6.32.39/include/net/tcp.h 2011-03-27 14:31:47.000000000 -0400 |
16469 |
++++ linux-2.6.32.39/include/net/tcp.h 2011-04-17 15:56:46.000000000 -0400 |
16470 |
@@ -1444,6 +1444,7 @@ enum tcp_seq_states { |
16471 |
struct tcp_seq_afinfo { |
16472 |
char *name; |
16473 |
@@ -52197,9 +50185,9 @@ diff -urNp linux-2.6.32.38/include/net/tcp.h linux-2.6.32.38/include/net/tcp.h |
16474 |
struct file_operations seq_fops; |
16475 |
struct seq_operations seq_ops; |
16476 |
}; |
16477 |
-diff -urNp linux-2.6.32.38/include/net/udp.h linux-2.6.32.38/include/net/udp.h |
16478 |
---- linux-2.6.32.38/include/net/udp.h 2011-03-27 14:31:47.000000000 -0400 |
16479 |
-+++ linux-2.6.32.38/include/net/udp.h 2011-04-17 15:56:46.000000000 -0400 |
16480 |
+diff -urNp linux-2.6.32.39/include/net/udp.h linux-2.6.32.39/include/net/udp.h |
16481 |
+--- linux-2.6.32.39/include/net/udp.h 2011-03-27 14:31:47.000000000 -0400 |
16482 |
++++ linux-2.6.32.39/include/net/udp.h 2011-04-17 15:56:46.000000000 -0400 |
16483 |
@@ -187,6 +187,7 @@ struct udp_seq_afinfo { |
16484 |
char *name; |
16485 |
sa_family_t family; |
16486 |
@@ -52208,9 +50196,9 @@ diff -urNp linux-2.6.32.38/include/net/udp.h linux-2.6.32.38/include/net/udp.h |
16487 |
struct file_operations seq_fops; |
16488 |
struct seq_operations seq_ops; |
16489 |
}; |
16490 |
-diff -urNp linux-2.6.32.38/include/sound/ac97_codec.h linux-2.6.32.38/include/sound/ac97_codec.h |
16491 |
---- linux-2.6.32.38/include/sound/ac97_codec.h 2011-03-27 14:31:47.000000000 -0400 |
16492 |
-+++ linux-2.6.32.38/include/sound/ac97_codec.h 2011-04-17 15:56:46.000000000 -0400 |
16493 |
+diff -urNp linux-2.6.32.39/include/sound/ac97_codec.h linux-2.6.32.39/include/sound/ac97_codec.h |
16494 |
+--- linux-2.6.32.39/include/sound/ac97_codec.h 2011-03-27 14:31:47.000000000 -0400 |
16495 |
++++ linux-2.6.32.39/include/sound/ac97_codec.h 2011-04-17 15:56:46.000000000 -0400 |
16496 |
@@ -419,15 +419,15 @@ |
16497 |
struct snd_ac97; |
16498 |
|
16499 |
@@ -52243,9 +50231,9 @@ diff -urNp linux-2.6.32.38/include/sound/ac97_codec.h linux-2.6.32.38/include/so |
16500 |
void *private_data; |
16501 |
void (*private_free) (struct snd_ac97 *ac97); |
16502 |
/* --- */ |
16503 |
-diff -urNp linux-2.6.32.38/include/trace/events/irq.h linux-2.6.32.38/include/trace/events/irq.h |
16504 |
---- linux-2.6.32.38/include/trace/events/irq.h 2011-03-27 14:31:47.000000000 -0400 |
16505 |
-+++ linux-2.6.32.38/include/trace/events/irq.h 2011-04-17 15:56:46.000000000 -0400 |
16506 |
+diff -urNp linux-2.6.32.39/include/trace/events/irq.h linux-2.6.32.39/include/trace/events/irq.h |
16507 |
+--- linux-2.6.32.39/include/trace/events/irq.h 2011-03-27 14:31:47.000000000 -0400 |
16508 |
++++ linux-2.6.32.39/include/trace/events/irq.h 2011-04-17 15:56:46.000000000 -0400 |
16509 |
@@ -34,7 +34,7 @@ |
16510 |
*/ |
16511 |
TRACE_EVENT(irq_handler_entry, |
16512 |
@@ -52282,9 +50270,9 @@ diff -urNp linux-2.6.32.38/include/trace/events/irq.h linux-2.6.32.38/include/tr |
16513 |
|
16514 |
TP_ARGS(h, vec), |
16515 |
|
16516 |
-diff -urNp linux-2.6.32.38/include/video/uvesafb.h linux-2.6.32.38/include/video/uvesafb.h |
16517 |
---- linux-2.6.32.38/include/video/uvesafb.h 2011-03-27 14:31:47.000000000 -0400 |
16518 |
-+++ linux-2.6.32.38/include/video/uvesafb.h 2011-04-17 15:56:46.000000000 -0400 |
16519 |
+diff -urNp linux-2.6.32.39/include/video/uvesafb.h linux-2.6.32.39/include/video/uvesafb.h |
16520 |
+--- linux-2.6.32.39/include/video/uvesafb.h 2011-03-27 14:31:47.000000000 -0400 |
16521 |
++++ linux-2.6.32.39/include/video/uvesafb.h 2011-04-17 15:56:46.000000000 -0400 |
16522 |
@@ -177,6 +177,7 @@ struct uvesafb_par { |
16523 |
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ |
16524 |
u8 pmi_setpal; /* PMI for palette changes */ |
16525 |
@@ -52293,9 +50281,9 @@ diff -urNp linux-2.6.32.38/include/video/uvesafb.h linux-2.6.32.38/include/video |
16526 |
void *pmi_start; |
16527 |
void *pmi_pal; |
16528 |
u8 *vbe_state_orig; /* |
16529 |
-diff -urNp linux-2.6.32.38/init/do_mounts.c linux-2.6.32.38/init/do_mounts.c |
16530 |
---- linux-2.6.32.38/init/do_mounts.c 2011-03-27 14:31:47.000000000 -0400 |
16531 |
-+++ linux-2.6.32.38/init/do_mounts.c 2011-04-17 15:56:46.000000000 -0400 |
16532 |
+diff -urNp linux-2.6.32.39/init/do_mounts.c linux-2.6.32.39/init/do_mounts.c |
16533 |
+--- linux-2.6.32.39/init/do_mounts.c 2011-03-27 14:31:47.000000000 -0400 |
16534 |
++++ linux-2.6.32.39/init/do_mounts.c 2011-04-17 15:56:46.000000000 -0400 |
16535 |
@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa |
16536 |
|
16537 |
static int __init do_mount_root(char *name, char *fs, int flags, void *data) |
16538 |
@@ -52341,9 +50329,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts.c linux-2.6.32.38/init/do_mounts.c |
16539 |
+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); |
16540 |
+ sys_chroot((__force char __user *)"."); |
16541 |
} |
16542 |
-diff -urNp linux-2.6.32.38/init/do_mounts.h linux-2.6.32.38/init/do_mounts.h |
16543 |
---- linux-2.6.32.38/init/do_mounts.h 2011-03-27 14:31:47.000000000 -0400 |
16544 |
-+++ linux-2.6.32.38/init/do_mounts.h 2011-04-17 15:56:46.000000000 -0400 |
16545 |
+diff -urNp linux-2.6.32.39/init/do_mounts.h linux-2.6.32.39/init/do_mounts.h |
16546 |
+--- linux-2.6.32.39/init/do_mounts.h 2011-03-27 14:31:47.000000000 -0400 |
16547 |
++++ linux-2.6.32.39/init/do_mounts.h 2011-04-17 15:56:46.000000000 -0400 |
16548 |
@@ -15,15 +15,15 @@ extern int root_mountflags; |
16549 |
|
16550 |
static inline int create_dev(char *name, dev_t dev) |
16551 |
@@ -52363,9 +50351,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts.h linux-2.6.32.38/init/do_mounts.h |
16552 |
return 0; |
16553 |
if (!S_ISBLK(stat.st_mode)) |
16554 |
return 0; |
16555 |
-diff -urNp linux-2.6.32.38/init/do_mounts_initrd.c linux-2.6.32.38/init/do_mounts_initrd.c |
16556 |
---- linux-2.6.32.38/init/do_mounts_initrd.c 2011-03-27 14:31:47.000000000 -0400 |
16557 |
-+++ linux-2.6.32.38/init/do_mounts_initrd.c 2011-04-17 15:56:46.000000000 -0400 |
16558 |
+diff -urNp linux-2.6.32.39/init/do_mounts_initrd.c linux-2.6.32.39/init/do_mounts_initrd.c |
16559 |
+--- linux-2.6.32.39/init/do_mounts_initrd.c 2011-03-27 14:31:47.000000000 -0400 |
16560 |
++++ linux-2.6.32.39/init/do_mounts_initrd.c 2011-04-17 15:56:46.000000000 -0400 |
16561 |
@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel |
16562 |
sys_close(old_fd);sys_close(root_fd); |
16563 |
sys_close(0);sys_close(1);sys_close(2); |
16564 |
@@ -52449,9 +50437,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts_initrd.c linux-2.6.32.38/init/do_mount |
16565 |
+ sys_unlink((__force const char __user *)"/initrd.image"); |
16566 |
return 0; |
16567 |
} |
16568 |
-diff -urNp linux-2.6.32.38/init/do_mounts_md.c linux-2.6.32.38/init/do_mounts_md.c |
16569 |
---- linux-2.6.32.38/init/do_mounts_md.c 2011-03-27 14:31:47.000000000 -0400 |
16570 |
-+++ linux-2.6.32.38/init/do_mounts_md.c 2011-04-17 15:56:46.000000000 -0400 |
16571 |
+diff -urNp linux-2.6.32.39/init/do_mounts_md.c linux-2.6.32.39/init/do_mounts_md.c |
16572 |
+--- linux-2.6.32.39/init/do_mounts_md.c 2011-03-27 14:31:47.000000000 -0400 |
16573 |
++++ linux-2.6.32.39/init/do_mounts_md.c 2011-04-17 15:56:46.000000000 -0400 |
16574 |
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) |
16575 |
partitioned ? "_d" : "", minor, |
16576 |
md_setup_args[ent].device_names); |
16577 |
@@ -52479,9 +50467,9 @@ diff -urNp linux-2.6.32.38/init/do_mounts_md.c linux-2.6.32.38/init/do_mounts_md |
16578 |
if (fd >= 0) { |
16579 |
sys_ioctl(fd, RAID_AUTORUN, raid_autopart); |
16580 |
sys_close(fd); |
16581 |
-diff -urNp linux-2.6.32.38/init/initramfs.c linux-2.6.32.38/init/initramfs.c |
16582 |
---- linux-2.6.32.38/init/initramfs.c 2011-03-27 14:31:47.000000000 -0400 |
16583 |
-+++ linux-2.6.32.38/init/initramfs.c 2011-04-17 15:56:46.000000000 -0400 |
16584 |
+diff -urNp linux-2.6.32.39/init/initramfs.c linux-2.6.32.39/init/initramfs.c |
16585 |
+--- linux-2.6.32.39/init/initramfs.c 2011-03-27 14:31:47.000000000 -0400 |
16586 |
++++ linux-2.6.32.39/init/initramfs.c 2011-04-17 15:56:46.000000000 -0400 |
16587 |
@@ -74,7 +74,7 @@ static void __init free_hash(void) |
16588 |
} |
16589 |
} |
16590 |
@@ -52590,9 +50578,9 @@ diff -urNp linux-2.6.32.38/init/initramfs.c linux-2.6.32.38/init/initramfs.c |
16591 |
state = SkipIt; |
16592 |
next_state = Reset; |
16593 |
return 0; |
16594 |
-diff -urNp linux-2.6.32.38/init/Kconfig linux-2.6.32.38/init/Kconfig |
16595 |
---- linux-2.6.32.38/init/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
16596 |
-+++ linux-2.6.32.38/init/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
16597 |
+diff -urNp linux-2.6.32.39/init/Kconfig linux-2.6.32.39/init/Kconfig |
16598 |
+--- linux-2.6.32.39/init/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
16599 |
++++ linux-2.6.32.39/init/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
16600 |
@@ -1004,7 +1004,7 @@ config SLUB_DEBUG |
16601 |
|
16602 |
config COMPAT_BRK |
16603 |
@@ -52602,9 +50590,9 @@ diff -urNp linux-2.6.32.38/init/Kconfig linux-2.6.32.38/init/Kconfig |
16604 |
help |
16605 |
Randomizing heap placement makes heap exploits harder, but it |
16606 |
also breaks ancient binaries (including anything libc5 based). |
16607 |
-diff -urNp linux-2.6.32.38/init/main.c linux-2.6.32.38/init/main.c |
16608 |
---- linux-2.6.32.38/init/main.c 2011-03-27 14:31:47.000000000 -0400 |
16609 |
-+++ linux-2.6.32.38/init/main.c 2011-04-17 15:56:46.000000000 -0400 |
16610 |
+diff -urNp linux-2.6.32.39/init/main.c linux-2.6.32.39/init/main.c |
16611 |
+--- linux-2.6.32.39/init/main.c 2011-03-27 14:31:47.000000000 -0400 |
16612 |
++++ linux-2.6.32.39/init/main.c 2011-04-17 15:56:46.000000000 -0400 |
16613 |
@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) |
16614 |
#ifdef CONFIG_TC |
16615 |
extern void tc_init(void); |
16616 |
@@ -52746,9 +50734,9 @@ diff -urNp linux-2.6.32.38/init/main.c linux-2.6.32.38/init/main.c |
16617 |
/* |
16618 |
* Ok, we have completed the initial bootup, and |
16619 |
* we're essentially up and running. Get rid of the |
16620 |
-diff -urNp linux-2.6.32.38/init/noinitramfs.c linux-2.6.32.38/init/noinitramfs.c |
16621 |
---- linux-2.6.32.38/init/noinitramfs.c 2011-03-27 14:31:47.000000000 -0400 |
16622 |
-+++ linux-2.6.32.38/init/noinitramfs.c 2011-04-17 15:56:46.000000000 -0400 |
16623 |
+diff -urNp linux-2.6.32.39/init/noinitramfs.c linux-2.6.32.39/init/noinitramfs.c |
16624 |
+--- linux-2.6.32.39/init/noinitramfs.c 2011-03-27 14:31:47.000000000 -0400 |
16625 |
++++ linux-2.6.32.39/init/noinitramfs.c 2011-04-17 15:56:46.000000000 -0400 |
16626 |
@@ -29,7 +29,7 @@ static int __init default_rootfs(void) |
16627 |
{ |
16628 |
int err; |
16629 |
@@ -52767,30 +50755,9 @@ diff -urNp linux-2.6.32.38/init/noinitramfs.c linux-2.6.32.38/init/noinitramfs.c |
16630 |
if (err < 0) |
16631 |
goto out; |
16632 |
|
16633 |
-diff -urNp linux-2.6.32.38/ipc/ipc_sysctl.c linux-2.6.32.38/ipc/ipc_sysctl.c |
16634 |
---- linux-2.6.32.38/ipc/ipc_sysctl.c 2011-03-27 14:31:47.000000000 -0400 |
16635 |
-+++ linux-2.6.32.38/ipc/ipc_sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
16636 |
-@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] |
16637 |
- .extra1 = &zero, |
16638 |
- .extra2 = &one, |
16639 |
- }, |
16640 |
-- {} |
16641 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
16642 |
- }; |
16643 |
- |
16644 |
- static struct ctl_table ipc_root_table[] = { |
16645 |
-@@ -277,7 +277,7 @@ static struct ctl_table ipc_root_table[] |
16646 |
- .mode = 0555, |
16647 |
- .child = ipc_kern_table, |
16648 |
- }, |
16649 |
-- {} |
16650 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
16651 |
- }; |
16652 |
- |
16653 |
- static int __init ipc_sysctl_init(void) |
16654 |
-diff -urNp linux-2.6.32.38/ipc/mqueue.c linux-2.6.32.38/ipc/mqueue.c |
16655 |
---- linux-2.6.32.38/ipc/mqueue.c 2011-03-27 14:31:47.000000000 -0400 |
16656 |
-+++ linux-2.6.32.38/ipc/mqueue.c 2011-04-17 15:56:46.000000000 -0400 |
16657 |
+diff -urNp linux-2.6.32.39/ipc/mqueue.c linux-2.6.32.39/ipc/mqueue.c |
16658 |
+--- linux-2.6.32.39/ipc/mqueue.c 2011-03-27 14:31:47.000000000 -0400 |
16659 |
++++ linux-2.6.32.39/ipc/mqueue.c 2011-04-17 15:56:46.000000000 -0400 |
16660 |
@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st |
16661 |
mq_bytes = (mq_msg_tblsz + |
16662 |
(info->attr.mq_maxmsg * info->attr.mq_msgsize)); |
16663 |
@@ -52799,9 +50766,9 @@ diff -urNp linux-2.6.32.38/ipc/mqueue.c linux-2.6.32.38/ipc/mqueue.c |
16664 |
spin_lock(&mq_lock); |
16665 |
if (u->mq_bytes + mq_bytes < u->mq_bytes || |
16666 |
u->mq_bytes + mq_bytes > |
16667 |
-diff -urNp linux-2.6.32.38/ipc/shm.c linux-2.6.32.38/ipc/shm.c |
16668 |
---- linux-2.6.32.38/ipc/shm.c 2011-03-27 14:31:47.000000000 -0400 |
16669 |
-+++ linux-2.6.32.38/ipc/shm.c 2011-04-17 15:56:46.000000000 -0400 |
16670 |
+diff -urNp linux-2.6.32.39/ipc/shm.c linux-2.6.32.39/ipc/shm.c |
16671 |
+--- linux-2.6.32.39/ipc/shm.c 2011-03-27 14:31:47.000000000 -0400 |
16672 |
++++ linux-2.6.32.39/ipc/shm.c 2011-04-17 15:56:46.000000000 -0400 |
16673 |
@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name |
16674 |
static int sysvipc_shm_proc_show(struct seq_file *s, void *it); |
16675 |
#endif |
16676 |
@@ -52854,9 +50821,9 @@ diff -urNp linux-2.6.32.38/ipc/shm.c linux-2.6.32.38/ipc/shm.c |
16677 |
size = i_size_read(path.dentry->d_inode); |
16678 |
shm_unlock(shp); |
16679 |
|
16680 |
-diff -urNp linux-2.6.32.38/kernel/acct.c linux-2.6.32.38/kernel/acct.c |
16681 |
---- linux-2.6.32.38/kernel/acct.c 2011-03-27 14:31:47.000000000 -0400 |
16682 |
-+++ linux-2.6.32.38/kernel/acct.c 2011-04-17 15:56:46.000000000 -0400 |
16683 |
+diff -urNp linux-2.6.32.39/kernel/acct.c linux-2.6.32.39/kernel/acct.c |
16684 |
+--- linux-2.6.32.39/kernel/acct.c 2011-03-27 14:31:47.000000000 -0400 |
16685 |
++++ linux-2.6.32.39/kernel/acct.c 2011-04-17 15:56:46.000000000 -0400 |
16686 |
@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a |
16687 |
*/ |
16688 |
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; |
16689 |
@@ -52866,9 +50833,9 @@ diff -urNp linux-2.6.32.38/kernel/acct.c linux-2.6.32.38/kernel/acct.c |
16690 |
sizeof(acct_t), &file->f_pos); |
16691 |
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; |
16692 |
set_fs(fs); |
16693 |
-diff -urNp linux-2.6.32.38/kernel/audit.c linux-2.6.32.38/kernel/audit.c |
16694 |
---- linux-2.6.32.38/kernel/audit.c 2011-03-27 14:31:47.000000000 -0400 |
16695 |
-+++ linux-2.6.32.38/kernel/audit.c 2011-04-17 15:56:46.000000000 -0400 |
16696 |
+diff -urNp linux-2.6.32.39/kernel/audit.c linux-2.6.32.39/kernel/audit.c |
16697 |
+--- linux-2.6.32.39/kernel/audit.c 2011-03-27 14:31:47.000000000 -0400 |
16698 |
++++ linux-2.6.32.39/kernel/audit.c 2011-04-17 15:56:46.000000000 -0400 |
16699 |
@@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b |
16700 |
spin_unlock_irq(&tsk->sighand->siglock); |
16701 |
} |
16702 |
@@ -52882,9 +50849,9 @@ diff -urNp linux-2.6.32.38/kernel/audit.c linux-2.6.32.38/kernel/audit.c |
16703 |
break; |
16704 |
} |
16705 |
case AUDIT_TTY_SET: { |
16706 |
-diff -urNp linux-2.6.32.38/kernel/capability.c linux-2.6.32.38/kernel/capability.c |
16707 |
---- linux-2.6.32.38/kernel/capability.c 2011-03-27 14:31:47.000000000 -0400 |
16708 |
-+++ linux-2.6.32.38/kernel/capability.c 2011-04-17 15:56:46.000000000 -0400 |
16709 |
+diff -urNp linux-2.6.32.39/kernel/capability.c linux-2.6.32.39/kernel/capability.c |
16710 |
+--- linux-2.6.32.39/kernel/capability.c 2011-03-27 14:31:47.000000000 -0400 |
16711 |
++++ linux-2.6.32.39/kernel/capability.c 2011-04-17 15:56:46.000000000 -0400 |
16712 |
@@ -305,10 +305,26 @@ int capable(int cap) |
16713 |
BUG(); |
16714 |
} |
16715 |
@@ -52913,9 +50880,9 @@ diff -urNp linux-2.6.32.38/kernel/capability.c linux-2.6.32.38/kernel/capability |
16716 |
+ |
16717 |
EXPORT_SYMBOL(capable); |
16718 |
+EXPORT_SYMBOL(capable_nolog); |
16719 |
-diff -urNp linux-2.6.32.38/kernel/configs.c linux-2.6.32.38/kernel/configs.c |
16720 |
---- linux-2.6.32.38/kernel/configs.c 2011-03-27 14:31:47.000000000 -0400 |
16721 |
-+++ linux-2.6.32.38/kernel/configs.c 2011-04-17 15:56:46.000000000 -0400 |
16722 |
+diff -urNp linux-2.6.32.39/kernel/configs.c linux-2.6.32.39/kernel/configs.c |
16723 |
+--- linux-2.6.32.39/kernel/configs.c 2011-03-27 14:31:47.000000000 -0400 |
16724 |
++++ linux-2.6.32.39/kernel/configs.c 2011-04-17 15:56:46.000000000 -0400 |
16725 |
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) |
16726 |
struct proc_dir_entry *entry; |
16727 |
|
16728 |
@@ -52936,9 +50903,9 @@ diff -urNp linux-2.6.32.38/kernel/configs.c linux-2.6.32.38/kernel/configs.c |
16729 |
if (!entry) |
16730 |
return -ENOMEM; |
16731 |
|
16732 |
-diff -urNp linux-2.6.32.38/kernel/cpu.c linux-2.6.32.38/kernel/cpu.c |
16733 |
---- linux-2.6.32.38/kernel/cpu.c 2011-03-27 14:31:47.000000000 -0400 |
16734 |
-+++ linux-2.6.32.38/kernel/cpu.c 2011-04-17 15:56:46.000000000 -0400 |
16735 |
+diff -urNp linux-2.6.32.39/kernel/cpu.c linux-2.6.32.39/kernel/cpu.c |
16736 |
+--- linux-2.6.32.39/kernel/cpu.c 2011-03-27 14:31:47.000000000 -0400 |
16737 |
++++ linux-2.6.32.39/kernel/cpu.c 2011-04-17 15:56:46.000000000 -0400 |
16738 |
@@ -19,7 +19,7 @@ |
16739 |
/* Serializes the updates to cpu_online_mask, cpu_present_mask */ |
16740 |
static DEFINE_MUTEX(cpu_add_remove_lock); |
16741 |
@@ -52948,9 +50915,9 @@ diff -urNp linux-2.6.32.38/kernel/cpu.c linux-2.6.32.38/kernel/cpu.c |
16742 |
|
16743 |
/* If set, cpu_up and cpu_down will return -EBUSY and do nothing. |
16744 |
* Should always be manipulated under cpu_add_remove_lock |
16745 |
-diff -urNp linux-2.6.32.38/kernel/cred.c linux-2.6.32.38/kernel/cred.c |
16746 |
---- linux-2.6.32.38/kernel/cred.c 2011-03-27 14:31:47.000000000 -0400 |
16747 |
-+++ linux-2.6.32.38/kernel/cred.c 2011-04-17 15:56:46.000000000 -0400 |
16748 |
+diff -urNp linux-2.6.32.39/kernel/cred.c linux-2.6.32.39/kernel/cred.c |
16749 |
+--- linux-2.6.32.39/kernel/cred.c 2011-03-27 14:31:47.000000000 -0400 |
16750 |
++++ linux-2.6.32.39/kernel/cred.c 2011-04-17 15:56:46.000000000 -0400 |
16751 |
@@ -544,6 +544,8 @@ int commit_creds(struct cred *new) |
16752 |
|
16753 |
get_cred(new); /* we will require a ref for the subj creds too */ |
16754 |
@@ -52960,9 +50927,9 @@ diff -urNp linux-2.6.32.38/kernel/cred.c linux-2.6.32.38/kernel/cred.c |
16755 |
/* dumpability changes */ |
16756 |
if (old->euid != new->euid || |
16757 |
old->egid != new->egid || |
16758 |
-diff -urNp linux-2.6.32.38/kernel/exit.c linux-2.6.32.38/kernel/exit.c |
16759 |
---- linux-2.6.32.38/kernel/exit.c 2011-03-27 14:31:47.000000000 -0400 |
16760 |
-+++ linux-2.6.32.38/kernel/exit.c 2011-04-17 15:56:46.000000000 -0400 |
16761 |
+diff -urNp linux-2.6.32.39/kernel/exit.c linux-2.6.32.39/kernel/exit.c |
16762 |
+--- linux-2.6.32.39/kernel/exit.c 2011-03-27 14:31:47.000000000 -0400 |
16763 |
++++ linux-2.6.32.39/kernel/exit.c 2011-04-17 15:56:46.000000000 -0400 |
16764 |
@@ -55,6 +55,10 @@ |
16765 |
#include <asm/pgtable.h> |
16766 |
#include <asm/mmu_context.h> |
16767 |
@@ -53091,9 +51058,9 @@ diff -urNp linux-2.6.32.38/kernel/exit.c linux-2.6.32.38/kernel/exit.c |
16768 |
|
16769 |
get_task_struct(p); |
16770 |
read_unlock(&tasklist_lock); |
16771 |
-diff -urNp linux-2.6.32.38/kernel/fork.c linux-2.6.32.38/kernel/fork.c |
16772 |
---- linux-2.6.32.38/kernel/fork.c 2011-03-27 14:31:47.000000000 -0400 |
16773 |
-+++ linux-2.6.32.38/kernel/fork.c 2011-04-17 15:56:46.000000000 -0400 |
16774 |
+diff -urNp linux-2.6.32.39/kernel/fork.c linux-2.6.32.39/kernel/fork.c |
16775 |
+--- linux-2.6.32.39/kernel/fork.c 2011-03-27 14:31:47.000000000 -0400 |
16776 |
++++ linux-2.6.32.39/kernel/fork.c 2011-04-17 15:56:46.000000000 -0400 |
16777 |
@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru |
16778 |
*stackend = STACK_END_MAGIC; /* for overflow detection */ |
16779 |
|
16780 |
@@ -53232,9 +51199,9 @@ diff -urNp linux-2.6.32.38/kernel/fork.c linux-2.6.32.38/kernel/fork.c |
16781 |
new_fs = NULL; |
16782 |
else |
16783 |
new_fs = fs; |
16784 |
-diff -urNp linux-2.6.32.38/kernel/futex.c linux-2.6.32.38/kernel/futex.c |
16785 |
---- linux-2.6.32.38/kernel/futex.c 2011-03-27 14:31:47.000000000 -0400 |
16786 |
-+++ linux-2.6.32.38/kernel/futex.c 2011-04-17 15:56:46.000000000 -0400 |
16787 |
+diff -urNp linux-2.6.32.39/kernel/futex.c linux-2.6.32.39/kernel/futex.c |
16788 |
+--- linux-2.6.32.39/kernel/futex.c 2011-03-27 14:31:47.000000000 -0400 |
16789 |
++++ linux-2.6.32.39/kernel/futex.c 2011-04-17 15:56:46.000000000 -0400 |
16790 |
@@ -54,6 +54,7 @@ |
16791 |
#include <linux/mount.h> |
16792 |
#include <linux/pagemap.h> |
16793 |
@@ -53319,9 +51286,9 @@ diff -urNp linux-2.6.32.38/kernel/futex.c linux-2.6.32.38/kernel/futex.c |
16794 |
if (curval == -EFAULT) |
16795 |
futex_cmpxchg_enabled = 1; |
16796 |
|
16797 |
-diff -urNp linux-2.6.32.38/kernel/futex_compat.c linux-2.6.32.38/kernel/futex_compat.c |
16798 |
---- linux-2.6.32.38/kernel/futex_compat.c 2011-03-27 14:31:47.000000000 -0400 |
16799 |
-+++ linux-2.6.32.38/kernel/futex_compat.c 2011-04-17 15:56:46.000000000 -0400 |
16800 |
+diff -urNp linux-2.6.32.39/kernel/futex_compat.c linux-2.6.32.39/kernel/futex_compat.c |
16801 |
+--- linux-2.6.32.39/kernel/futex_compat.c 2011-03-27 14:31:47.000000000 -0400 |
16802 |
++++ linux-2.6.32.39/kernel/futex_compat.c 2011-04-17 15:56:46.000000000 -0400 |
16803 |
@@ -10,6 +10,7 @@ |
16804 |
#include <linux/compat.h> |
16805 |
#include <linux/nsproxy.h> |
16806 |
@@ -53359,9 +51326,9 @@ diff -urNp linux-2.6.32.38/kernel/futex_compat.c linux-2.6.32.38/kernel/futex_co |
16807 |
head = p->compat_robust_list; |
16808 |
read_unlock(&tasklist_lock); |
16809 |
} |
16810 |
-diff -urNp linux-2.6.32.38/kernel/gcov/base.c linux-2.6.32.38/kernel/gcov/base.c |
16811 |
---- linux-2.6.32.38/kernel/gcov/base.c 2011-03-27 14:31:47.000000000 -0400 |
16812 |
-+++ linux-2.6.32.38/kernel/gcov/base.c 2011-04-17 15:56:46.000000000 -0400 |
16813 |
+diff -urNp linux-2.6.32.39/kernel/gcov/base.c linux-2.6.32.39/kernel/gcov/base.c |
16814 |
+--- linux-2.6.32.39/kernel/gcov/base.c 2011-03-27 14:31:47.000000000 -0400 |
16815 |
++++ linux-2.6.32.39/kernel/gcov/base.c 2011-04-17 15:56:46.000000000 -0400 |
16816 |
@@ -102,11 +102,6 @@ void gcov_enable_events(void) |
16817 |
} |
16818 |
|
16819 |
@@ -53383,9 +51350,9 @@ diff -urNp linux-2.6.32.38/kernel/gcov/base.c linux-2.6.32.38/kernel/gcov/base.c |
16820 |
if (prev) |
16821 |
prev->next = info->next; |
16822 |
else |
16823 |
-diff -urNp linux-2.6.32.38/kernel/hrtimer.c linux-2.6.32.38/kernel/hrtimer.c |
16824 |
---- linux-2.6.32.38/kernel/hrtimer.c 2011-03-27 14:31:47.000000000 -0400 |
16825 |
-+++ linux-2.6.32.38/kernel/hrtimer.c 2011-04-17 15:56:46.000000000 -0400 |
16826 |
+diff -urNp linux-2.6.32.39/kernel/hrtimer.c linux-2.6.32.39/kernel/hrtimer.c |
16827 |
+--- linux-2.6.32.39/kernel/hrtimer.c 2011-03-27 14:31:47.000000000 -0400 |
16828 |
++++ linux-2.6.32.39/kernel/hrtimer.c 2011-04-17 15:56:46.000000000 -0400 |
16829 |
@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void) |
16830 |
local_irq_restore(flags); |
16831 |
} |
16832 |
@@ -53395,9 +51362,9 @@ diff -urNp linux-2.6.32.38/kernel/hrtimer.c linux-2.6.32.38/kernel/hrtimer.c |
16833 |
{ |
16834 |
hrtimer_peek_ahead_timers(); |
16835 |
} |
16836 |
-diff -urNp linux-2.6.32.38/kernel/kallsyms.c linux-2.6.32.38/kernel/kallsyms.c |
16837 |
---- linux-2.6.32.38/kernel/kallsyms.c 2011-03-27 14:31:47.000000000 -0400 |
16838 |
-+++ linux-2.6.32.38/kernel/kallsyms.c 2011-04-17 15:56:46.000000000 -0400 |
16839 |
+diff -urNp linux-2.6.32.39/kernel/kallsyms.c linux-2.6.32.39/kernel/kallsyms.c |
16840 |
+--- linux-2.6.32.39/kernel/kallsyms.c 2011-03-27 14:31:47.000000000 -0400 |
16841 |
++++ linux-2.6.32.39/kernel/kallsyms.c 2011-04-17 15:56:46.000000000 -0400 |
16842 |
@@ -11,6 +11,9 @@ |
16843 |
* Changed the compression method from stem compression to "table lookup" |
16844 |
* compression (see scripts/kallsyms.c for a more complete description) |
16845 |
@@ -53500,9 +51467,9 @@ diff -urNp linux-2.6.32.38/kernel/kallsyms.c linux-2.6.32.38/kernel/kallsyms.c |
16846 |
if (!iter) |
16847 |
return -ENOMEM; |
16848 |
reset_iter(iter, 0); |
16849 |
-diff -urNp linux-2.6.32.38/kernel/kgdb.c linux-2.6.32.38/kernel/kgdb.c |
16850 |
---- linux-2.6.32.38/kernel/kgdb.c 2011-04-17 17:00:52.000000000 -0400 |
16851 |
-+++ linux-2.6.32.38/kernel/kgdb.c 2011-04-17 17:03:58.000000000 -0400 |
16852 |
+diff -urNp linux-2.6.32.39/kernel/kgdb.c linux-2.6.32.39/kernel/kgdb.c |
16853 |
+--- linux-2.6.32.39/kernel/kgdb.c 2011-04-17 17:00:52.000000000 -0400 |
16854 |
++++ linux-2.6.32.39/kernel/kgdb.c 2011-04-17 17:03:58.000000000 -0400 |
16855 |
@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; |
16856 |
/* Guard for recursive entry */ |
16857 |
static int exception_level; |
16858 |
@@ -53530,9 +51497,9 @@ diff -urNp linux-2.6.32.38/kernel/kgdb.c linux-2.6.32.38/kernel/kgdb.c |
16859 |
{ |
16860 |
BUG_ON(kgdb_connected); |
16861 |
|
16862 |
-diff -urNp linux-2.6.32.38/kernel/kmod.c linux-2.6.32.38/kernel/kmod.c |
16863 |
---- linux-2.6.32.38/kernel/kmod.c 2011-03-27 14:31:47.000000000 -0400 |
16864 |
-+++ linux-2.6.32.38/kernel/kmod.c 2011-04-17 15:56:46.000000000 -0400 |
16865 |
+diff -urNp linux-2.6.32.39/kernel/kmod.c linux-2.6.32.39/kernel/kmod.c |
16866 |
+--- linux-2.6.32.39/kernel/kmod.c 2011-03-27 14:31:47.000000000 -0400 |
16867 |
++++ linux-2.6.32.39/kernel/kmod.c 2011-04-17 15:56:46.000000000 -0400 |
16868 |
@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb |
16869 |
* If module auto-loading support is disabled then this function |
16870 |
* becomes a no-operation. |
16871 |
@@ -53626,9 +51593,9 @@ diff -urNp linux-2.6.32.38/kernel/kmod.c linux-2.6.32.38/kernel/kmod.c |
16872 |
EXPORT_SYMBOL(__request_module); |
16873 |
#endif /* CONFIG_MODULES */ |
16874 |
|
16875 |
-diff -urNp linux-2.6.32.38/kernel/kprobes.c linux-2.6.32.38/kernel/kprobes.c |
16876 |
---- linux-2.6.32.38/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 |
16877 |
-+++ linux-2.6.32.38/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 |
16878 |
+diff -urNp linux-2.6.32.39/kernel/kprobes.c linux-2.6.32.39/kernel/kprobes.c |
16879 |
+--- linux-2.6.32.39/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 |
16880 |
++++ linux-2.6.32.39/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 |
16881 |
@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ |
16882 |
* kernel image and loaded module images reside. This is required |
16883 |
* so x86_64 can correctly handle the %rip-relative fixups. |
16884 |
@@ -53665,9 +51632,9 @@ diff -urNp linux-2.6.32.38/kernel/kprobes.c linux-2.6.32.38/kernel/kprobes.c |
16885 |
|
16886 |
head = &kprobe_table[i]; |
16887 |
preempt_disable(); |
16888 |
-diff -urNp linux-2.6.32.38/kernel/lockdep.c linux-2.6.32.38/kernel/lockdep.c |
16889 |
---- linux-2.6.32.38/kernel/lockdep.c 2011-03-27 14:31:47.000000000 -0400 |
16890 |
-+++ linux-2.6.32.38/kernel/lockdep.c 2011-04-17 15:56:46.000000000 -0400 |
16891 |
+diff -urNp linux-2.6.32.39/kernel/lockdep.c linux-2.6.32.39/kernel/lockdep.c |
16892 |
+--- linux-2.6.32.39/kernel/lockdep.c 2011-03-27 14:31:47.000000000 -0400 |
16893 |
++++ linux-2.6.32.39/kernel/lockdep.c 2011-04-17 15:56:46.000000000 -0400 |
16894 |
@@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t |
16895 |
/* |
16896 |
* Various lockdep statistics: |
16897 |
@@ -53741,9 +51708,9 @@ diff -urNp linux-2.6.32.38/kernel/lockdep.c linux-2.6.32.38/kernel/lockdep.c |
16898 |
if (very_verbose(class)) { |
16899 |
printk("\nacquire class [%p] %s", class->key, class->name); |
16900 |
if (class->name_version > 1) |
16901 |
-diff -urNp linux-2.6.32.38/kernel/lockdep_internals.h linux-2.6.32.38/kernel/lockdep_internals.h |
16902 |
---- linux-2.6.32.38/kernel/lockdep_internals.h 2011-03-27 14:31:47.000000000 -0400 |
16903 |
-+++ linux-2.6.32.38/kernel/lockdep_internals.h 2011-04-17 15:56:46.000000000 -0400 |
16904 |
+diff -urNp linux-2.6.32.39/kernel/lockdep_internals.h linux-2.6.32.39/kernel/lockdep_internals.h |
16905 |
+--- linux-2.6.32.39/kernel/lockdep_internals.h 2011-03-27 14:31:47.000000000 -0400 |
16906 |
++++ linux-2.6.32.39/kernel/lockdep_internals.h 2011-04-17 15:56:46.000000000 -0400 |
16907 |
@@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_ |
16908 |
/* |
16909 |
* Various lockdep statistics: |
16910 |
@@ -53791,9 +51758,9 @@ diff -urNp linux-2.6.32.38/kernel/lockdep_internals.h linux-2.6.32.38/kernel/loc |
16911 |
#else |
16912 |
# define debug_atomic_inc(ptr) do { } while (0) |
16913 |
# define debug_atomic_dec(ptr) do { } while (0) |
16914 |
-diff -urNp linux-2.6.32.38/kernel/lockdep_proc.c linux-2.6.32.38/kernel/lockdep_proc.c |
16915 |
---- linux-2.6.32.38/kernel/lockdep_proc.c 2011-03-27 14:31:47.000000000 -0400 |
16916 |
-+++ linux-2.6.32.38/kernel/lockdep_proc.c 2011-04-17 15:56:46.000000000 -0400 |
16917 |
+diff -urNp linux-2.6.32.39/kernel/lockdep_proc.c linux-2.6.32.39/kernel/lockdep_proc.c |
16918 |
+--- linux-2.6.32.39/kernel/lockdep_proc.c 2011-03-27 14:31:47.000000000 -0400 |
16919 |
++++ linux-2.6.32.39/kernel/lockdep_proc.c 2011-04-17 15:56:46.000000000 -0400 |
16920 |
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v |
16921 |
|
16922 |
static void print_name(struct seq_file *m, struct lock_class *class) |
16923 |
@@ -53803,9 +51770,9 @@ diff -urNp linux-2.6.32.38/kernel/lockdep_proc.c linux-2.6.32.38/kernel/lockdep_ |
16924 |
const char *name = class->name; |
16925 |
|
16926 |
if (!name) { |
16927 |
-diff -urNp linux-2.6.32.38/kernel/module.c linux-2.6.32.38/kernel/module.c |
16928 |
---- linux-2.6.32.38/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
16929 |
-+++ linux-2.6.32.38/kernel/module.c 2011-04-19 06:33:26.000000000 -0400 |
16930 |
+diff -urNp linux-2.6.32.39/kernel/module.c linux-2.6.32.39/kernel/module.c |
16931 |
+--- linux-2.6.32.39/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 |
16932 |
++++ linux-2.6.32.39/kernel/module.c 2011-04-19 06:33:26.000000000 -0400 |
16933 |
@@ -55,6 +55,7 @@ |
16934 |
#include <linux/async.h> |
16935 |
#include <linux/percpu.h> |
16936 |
@@ -54439,9 +52406,9 @@ diff -urNp linux-2.6.32.38/kernel/module.c linux-2.6.32.38/kernel/module.c |
16937 |
mod = NULL; |
16938 |
} |
16939 |
return mod; |
16940 |
-diff -urNp linux-2.6.32.38/kernel/mutex.c linux-2.6.32.38/kernel/mutex.c |
16941 |
---- linux-2.6.32.38/kernel/mutex.c 2011-03-27 14:31:47.000000000 -0400 |
16942 |
-+++ linux-2.6.32.38/kernel/mutex.c 2011-04-17 15:56:46.000000000 -0400 |
16943 |
+diff -urNp linux-2.6.32.39/kernel/mutex.c linux-2.6.32.39/kernel/mutex.c |
16944 |
+--- linux-2.6.32.39/kernel/mutex.c 2011-03-27 14:31:47.000000000 -0400 |
16945 |
++++ linux-2.6.32.39/kernel/mutex.c 2011-04-17 15:56:46.000000000 -0400 |
16946 |
@@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, |
16947 |
*/ |
16948 |
|
16949 |
@@ -54479,9 +52446,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex.c linux-2.6.32.38/kernel/mutex.c |
16950 |
mutex_set_owner(lock); |
16951 |
|
16952 |
/* set it to 0 if there are no waiters left: */ |
16953 |
-diff -urNp linux-2.6.32.38/kernel/mutex-debug.c linux-2.6.32.38/kernel/mutex-debug.c |
16954 |
---- linux-2.6.32.38/kernel/mutex-debug.c 2011-03-27 14:31:47.000000000 -0400 |
16955 |
-+++ linux-2.6.32.38/kernel/mutex-debug.c 2011-04-17 15:56:46.000000000 -0400 |
16956 |
+diff -urNp linux-2.6.32.39/kernel/mutex-debug.c linux-2.6.32.39/kernel/mutex-debug.c |
16957 |
+--- linux-2.6.32.39/kernel/mutex-debug.c 2011-03-27 14:31:47.000000000 -0400 |
16958 |
++++ linux-2.6.32.39/kernel/mutex-debug.c 2011-04-17 15:56:46.000000000 -0400 |
16959 |
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute |
16960 |
} |
16961 |
|
16962 |
@@ -54519,9 +52486,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex-debug.c linux-2.6.32.38/kernel/mutex-deb |
16963 |
DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); |
16964 |
mutex_clear_owner(lock); |
16965 |
} |
16966 |
-diff -urNp linux-2.6.32.38/kernel/mutex-debug.h linux-2.6.32.38/kernel/mutex-debug.h |
16967 |
---- linux-2.6.32.38/kernel/mutex-debug.h 2011-03-27 14:31:47.000000000 -0400 |
16968 |
-+++ linux-2.6.32.38/kernel/mutex-debug.h 2011-04-17 15:56:46.000000000 -0400 |
16969 |
+diff -urNp linux-2.6.32.39/kernel/mutex-debug.h linux-2.6.32.39/kernel/mutex-debug.h |
16970 |
+--- linux-2.6.32.39/kernel/mutex-debug.h 2011-03-27 14:31:47.000000000 -0400 |
16971 |
++++ linux-2.6.32.39/kernel/mutex-debug.h 2011-04-17 15:56:46.000000000 -0400 |
16972 |
@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru |
16973 |
extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); |
16974 |
extern void debug_mutex_add_waiter(struct mutex *lock, |
16975 |
@@ -54542,9 +52509,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex-debug.h linux-2.6.32.38/kernel/mutex-deb |
16976 |
} |
16977 |
|
16978 |
static inline void mutex_clear_owner(struct mutex *lock) |
16979 |
-diff -urNp linux-2.6.32.38/kernel/mutex.h linux-2.6.32.38/kernel/mutex.h |
16980 |
---- linux-2.6.32.38/kernel/mutex.h 2011-03-27 14:31:47.000000000 -0400 |
16981 |
-+++ linux-2.6.32.38/kernel/mutex.h 2011-04-17 15:56:46.000000000 -0400 |
16982 |
+diff -urNp linux-2.6.32.39/kernel/mutex.h linux-2.6.32.39/kernel/mutex.h |
16983 |
+--- linux-2.6.32.39/kernel/mutex.h 2011-03-27 14:31:47.000000000 -0400 |
16984 |
++++ linux-2.6.32.39/kernel/mutex.h 2011-04-17 15:56:46.000000000 -0400 |
16985 |
@@ -19,7 +19,7 @@ |
16986 |
#ifdef CONFIG_SMP |
16987 |
static inline void mutex_set_owner(struct mutex *lock) |
16988 |
@@ -54554,9 +52521,9 @@ diff -urNp linux-2.6.32.38/kernel/mutex.h linux-2.6.32.38/kernel/mutex.h |
16989 |
} |
16990 |
|
16991 |
static inline void mutex_clear_owner(struct mutex *lock) |
16992 |
-diff -urNp linux-2.6.32.38/kernel/panic.c linux-2.6.32.38/kernel/panic.c |
16993 |
---- linux-2.6.32.38/kernel/panic.c 2011-03-27 14:31:47.000000000 -0400 |
16994 |
-+++ linux-2.6.32.38/kernel/panic.c 2011-04-17 15:56:46.000000000 -0400 |
16995 |
+diff -urNp linux-2.6.32.39/kernel/panic.c linux-2.6.32.39/kernel/panic.c |
16996 |
+--- linux-2.6.32.39/kernel/panic.c 2011-03-27 14:31:47.000000000 -0400 |
16997 |
++++ linux-2.6.32.39/kernel/panic.c 2011-04-17 15:56:46.000000000 -0400 |
16998 |
@@ -352,7 +352,7 @@ static void warn_slowpath_common(const c |
16999 |
const char *board; |
17000 |
|
17001 |
@@ -54576,9 +52543,9 @@ diff -urNp linux-2.6.32.38/kernel/panic.c linux-2.6.32.38/kernel/panic.c |
17002 |
__builtin_return_address(0)); |
17003 |
} |
17004 |
EXPORT_SYMBOL(__stack_chk_fail); |
17005 |
-diff -urNp linux-2.6.32.38/kernel/params.c linux-2.6.32.38/kernel/params.c |
17006 |
---- linux-2.6.32.38/kernel/params.c 2011-03-27 14:31:47.000000000 -0400 |
17007 |
-+++ linux-2.6.32.38/kernel/params.c 2011-04-17 15:56:46.000000000 -0400 |
17008 |
+diff -urNp linux-2.6.32.39/kernel/params.c linux-2.6.32.39/kernel/params.c |
17009 |
+--- linux-2.6.32.39/kernel/params.c 2011-03-27 14:31:47.000000000 -0400 |
17010 |
++++ linux-2.6.32.39/kernel/params.c 2011-04-17 15:56:46.000000000 -0400 |
17011 |
@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct |
17012 |
return ret; |
17013 |
} |
17014 |
@@ -54597,9 +52564,9 @@ diff -urNp linux-2.6.32.38/kernel/params.c linux-2.6.32.38/kernel/params.c |
17015 |
.filter = uevent_filter, |
17016 |
}; |
17017 |
|
17018 |
-diff -urNp linux-2.6.32.38/kernel/pid.c linux-2.6.32.38/kernel/pid.c |
17019 |
---- linux-2.6.32.38/kernel/pid.c 2011-03-27 14:31:47.000000000 -0400 |
17020 |
-+++ linux-2.6.32.38/kernel/pid.c 2011-04-18 19:22:38.000000000 -0400 |
17021 |
+diff -urNp linux-2.6.32.39/kernel/pid.c linux-2.6.32.39/kernel/pid.c |
17022 |
+--- linux-2.6.32.39/kernel/pid.c 2011-04-22 19:16:29.000000000 -0400 |
17023 |
++++ linux-2.6.32.39/kernel/pid.c 2011-04-18 19:22:38.000000000 -0400 |
17024 |
@@ -33,6 +33,7 @@ |
17025 |
#include <linux/rculist.h> |
17026 |
#include <linux/bootmem.h> |
17027 |
@@ -54617,23 +52584,7 @@ diff -urNp linux-2.6.32.38/kernel/pid.c linux-2.6.32.38/kernel/pid.c |
17028 |
|
17029 |
int pid_max_min = RESERVED_PIDS + 1; |
17030 |
int pid_max_max = PID_MAX_LIMIT; |
17031 |
-@@ -182,11 +183,14 @@ static int alloc_pidmap(struct pid_names |
17032 |
- return -1; |
17033 |
- } |
17034 |
- |
17035 |
--int next_pidmap(struct pid_namespace *pid_ns, int last) |
17036 |
-+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last) |
17037 |
- { |
17038 |
- int offset; |
17039 |
- struct pidmap *map, *end; |
17040 |
- |
17041 |
-+ if (last >= PID_MAX_LIMIT) |
17042 |
-+ return -1; |
17043 |
-+ |
17044 |
- offset = (last + 1) & BITS_PER_PAGE_MASK; |
17045 |
- map = &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE]; |
17046 |
- end = &pid_ns->pidmap[PIDMAP_ENTRIES]; |
17047 |
-@@ -380,7 +384,14 @@ EXPORT_SYMBOL(pid_task); |
17048 |
+@@ -383,7 +384,14 @@ EXPORT_SYMBOL(pid_task); |
17049 |
*/ |
17050 |
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns) |
17051 |
{ |
17052 |
@@ -54649,9 +52600,9 @@ diff -urNp linux-2.6.32.38/kernel/pid.c linux-2.6.32.38/kernel/pid.c |
17053 |
} |
17054 |
|
17055 |
struct task_struct *find_task_by_vpid(pid_t vnr) |
17056 |
-diff -urNp linux-2.6.32.38/kernel/posix-cpu-timers.c linux-2.6.32.38/kernel/posix-cpu-timers.c |
17057 |
---- linux-2.6.32.38/kernel/posix-cpu-timers.c 2011-03-27 14:31:47.000000000 -0400 |
17058 |
-+++ linux-2.6.32.38/kernel/posix-cpu-timers.c 2011-04-17 15:56:46.000000000 -0400 |
17059 |
+diff -urNp linux-2.6.32.39/kernel/posix-cpu-timers.c linux-2.6.32.39/kernel/posix-cpu-timers.c |
17060 |
+--- linux-2.6.32.39/kernel/posix-cpu-timers.c 2011-03-27 14:31:47.000000000 -0400 |
17061 |
++++ linux-2.6.32.39/kernel/posix-cpu-timers.c 2011-04-17 15:56:46.000000000 -0400 |
17062 |
@@ -6,6 +6,7 @@ |
17063 |
#include <linux/posix-timers.h> |
17064 |
#include <linux/errno.h> |
17065 |
@@ -54660,9 +52611,9 @@ diff -urNp linux-2.6.32.38/kernel/posix-cpu-timers.c linux-2.6.32.38/kernel/posi |
17066 |
#include <asm/uaccess.h> |
17067 |
#include <linux/kernel_stat.h> |
17068 |
#include <trace/events/timer.h> |
17069 |
-diff -urNp linux-2.6.32.38/kernel/posix-timers.c linux-2.6.32.38/kernel/posix-timers.c |
17070 |
---- linux-2.6.32.38/kernel/posix-timers.c 2011-03-27 14:31:47.000000000 -0400 |
17071 |
-+++ linux-2.6.32.38/kernel/posix-timers.c 2011-04-17 15:56:46.000000000 -0400 |
17072 |
+diff -urNp linux-2.6.32.39/kernel/posix-timers.c linux-2.6.32.39/kernel/posix-timers.c |
17073 |
+--- linux-2.6.32.39/kernel/posix-timers.c 2011-03-27 14:31:47.000000000 -0400 |
17074 |
++++ linux-2.6.32.39/kernel/posix-timers.c 2011-04-17 15:56:46.000000000 -0400 |
17075 |
@@ -42,6 +42,7 @@ |
17076 |
#include <linux/compiler.h> |
17077 |
#include <linux/idr.h> |
17078 |
@@ -54685,9 +52636,9 @@ diff -urNp linux-2.6.32.38/kernel/posix-timers.c linux-2.6.32.38/kernel/posix-ti |
17079 |
return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); |
17080 |
} |
17081 |
|
17082 |
-diff -urNp linux-2.6.32.38/kernel/power/hibernate.c linux-2.6.32.38/kernel/power/hibernate.c |
17083 |
---- linux-2.6.32.38/kernel/power/hibernate.c 2011-03-27 14:31:47.000000000 -0400 |
17084 |
-+++ linux-2.6.32.38/kernel/power/hibernate.c 2011-04-17 15:56:46.000000000 -0400 |
17085 |
+diff -urNp linux-2.6.32.39/kernel/power/hibernate.c linux-2.6.32.39/kernel/power/hibernate.c |
17086 |
+--- linux-2.6.32.39/kernel/power/hibernate.c 2011-03-27 14:31:47.000000000 -0400 |
17087 |
++++ linux-2.6.32.39/kernel/power/hibernate.c 2011-04-17 15:56:46.000000000 -0400 |
17088 |
@@ -48,14 +48,14 @@ enum { |
17089 |
|
17090 |
static int hibernation_mode = HIBERNATION_SHUTDOWN; |
17091 |
@@ -54705,9 +52656,9 @@ diff -urNp linux-2.6.32.38/kernel/power/hibernate.c linux-2.6.32.38/kernel/power |
17092 |
{ |
17093 |
if (ops && !(ops->begin && ops->end && ops->pre_snapshot |
17094 |
&& ops->prepare && ops->finish && ops->enter && ops->pre_restore |
17095 |
-diff -urNp linux-2.6.32.38/kernel/power/poweroff.c linux-2.6.32.38/kernel/power/poweroff.c |
17096 |
---- linux-2.6.32.38/kernel/power/poweroff.c 2011-03-27 14:31:47.000000000 -0400 |
17097 |
-+++ linux-2.6.32.38/kernel/power/poweroff.c 2011-04-17 15:56:46.000000000 -0400 |
17098 |
+diff -urNp linux-2.6.32.39/kernel/power/poweroff.c linux-2.6.32.39/kernel/power/poweroff.c |
17099 |
+--- linux-2.6.32.39/kernel/power/poweroff.c 2011-03-27 14:31:47.000000000 -0400 |
17100 |
++++ linux-2.6.32.39/kernel/power/poweroff.c 2011-04-17 15:56:46.000000000 -0400 |
17101 |
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof |
17102 |
.enable_mask = SYSRQ_ENABLE_BOOT, |
17103 |
}; |
17104 |
@@ -54717,9 +52668,9 @@ diff -urNp linux-2.6.32.38/kernel/power/poweroff.c linux-2.6.32.38/kernel/power/ |
17105 |
{ |
17106 |
register_sysrq_key('o', &sysrq_poweroff_op); |
17107 |
return 0; |
17108 |
-diff -urNp linux-2.6.32.38/kernel/power/process.c linux-2.6.32.38/kernel/power/process.c |
17109 |
---- linux-2.6.32.38/kernel/power/process.c 2011-03-27 14:31:47.000000000 -0400 |
17110 |
-+++ linux-2.6.32.38/kernel/power/process.c 2011-04-17 15:56:46.000000000 -0400 |
17111 |
+diff -urNp linux-2.6.32.39/kernel/power/process.c linux-2.6.32.39/kernel/power/process.c |
17112 |
+--- linux-2.6.32.39/kernel/power/process.c 2011-03-27 14:31:47.000000000 -0400 |
17113 |
++++ linux-2.6.32.39/kernel/power/process.c 2011-04-17 15:56:46.000000000 -0400 |
17114 |
@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ |
17115 |
struct timeval start, end; |
17116 |
u64 elapsed_csecs64; |
17117 |
@@ -54759,9 +52710,9 @@ diff -urNp linux-2.6.32.38/kernel/power/process.c linux-2.6.32.38/kernel/power/p |
17118 |
|
17119 |
do_gettimeofday(&end); |
17120 |
elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); |
17121 |
-diff -urNp linux-2.6.32.38/kernel/power/suspend.c linux-2.6.32.38/kernel/power/suspend.c |
17122 |
---- linux-2.6.32.38/kernel/power/suspend.c 2011-03-27 14:31:47.000000000 -0400 |
17123 |
-+++ linux-2.6.32.38/kernel/power/suspend.c 2011-04-17 15:56:46.000000000 -0400 |
17124 |
+diff -urNp linux-2.6.32.39/kernel/power/suspend.c linux-2.6.32.39/kernel/power/suspend.c |
17125 |
+--- linux-2.6.32.39/kernel/power/suspend.c 2011-03-27 14:31:47.000000000 -0400 |
17126 |
++++ linux-2.6.32.39/kernel/power/suspend.c 2011-04-17 15:56:46.000000000 -0400 |
17127 |
@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M |
17128 |
[PM_SUSPEND_MEM] = "mem", |
17129 |
}; |
17130 |
@@ -54778,9 +52729,9 @@ diff -urNp linux-2.6.32.38/kernel/power/suspend.c linux-2.6.32.38/kernel/power/s |
17131 |
{ |
17132 |
mutex_lock(&pm_mutex); |
17133 |
suspend_ops = ops; |
17134 |
-diff -urNp linux-2.6.32.38/kernel/printk.c linux-2.6.32.38/kernel/printk.c |
17135 |
---- linux-2.6.32.38/kernel/printk.c 2011-03-27 14:31:47.000000000 -0400 |
17136 |
-+++ linux-2.6.32.38/kernel/printk.c 2011-04-17 15:56:46.000000000 -0400 |
17137 |
+diff -urNp linux-2.6.32.39/kernel/printk.c linux-2.6.32.39/kernel/printk.c |
17138 |
+--- linux-2.6.32.39/kernel/printk.c 2011-03-27 14:31:47.000000000 -0400 |
17139 |
++++ linux-2.6.32.39/kernel/printk.c 2011-04-17 15:56:46.000000000 -0400 |
17140 |
@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf |
17141 |
char c; |
17142 |
int error = 0; |
17143 |
@@ -54793,9 +52744,9 @@ diff -urNp linux-2.6.32.38/kernel/printk.c linux-2.6.32.38/kernel/printk.c |
17144 |
error = security_syslog(type); |
17145 |
if (error) |
17146 |
return error; |
17147 |
-diff -urNp linux-2.6.32.38/kernel/ptrace.c linux-2.6.32.38/kernel/ptrace.c |
17148 |
---- linux-2.6.32.38/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 |
17149 |
-+++ linux-2.6.32.38/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400 |
17150 |
+diff -urNp linux-2.6.32.39/kernel/ptrace.c linux-2.6.32.39/kernel/ptrace.c |
17151 |
+--- linux-2.6.32.39/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 |
17152 |
++++ linux-2.6.32.39/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400 |
17153 |
@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru |
17154 |
return ret; |
17155 |
} |
17156 |
@@ -54941,9 +52892,9 @@ diff -urNp linux-2.6.32.38/kernel/ptrace.c linux-2.6.32.38/kernel/ptrace.c |
17157 |
goto out_put_task_struct; |
17158 |
} |
17159 |
|
17160 |
-diff -urNp linux-2.6.32.38/kernel/rcutree.c linux-2.6.32.38/kernel/rcutree.c |
17161 |
---- linux-2.6.32.38/kernel/rcutree.c 2011-03-27 14:31:47.000000000 -0400 |
17162 |
-+++ linux-2.6.32.38/kernel/rcutree.c 2011-04-17 15:56:46.000000000 -0400 |
17163 |
+diff -urNp linux-2.6.32.39/kernel/rcutree.c linux-2.6.32.39/kernel/rcutree.c |
17164 |
+--- linux-2.6.32.39/kernel/rcutree.c 2011-03-27 14:31:47.000000000 -0400 |
17165 |
++++ linux-2.6.32.39/kernel/rcutree.c 2011-04-17 15:56:46.000000000 -0400 |
17166 |
@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state |
17167 |
/* |
17168 |
* Do softirq processing for the current CPU. |
17169 |
@@ -54953,9 +52904,9 @@ diff -urNp linux-2.6.32.38/kernel/rcutree.c linux-2.6.32.38/kernel/rcutree.c |
17170 |
{ |
17171 |
/* |
17172 |
* Memory references from any prior RCU read-side critical sections |
17173 |
-diff -urNp linux-2.6.32.38/kernel/rcutree_plugin.h linux-2.6.32.38/kernel/rcutree_plugin.h |
17174 |
---- linux-2.6.32.38/kernel/rcutree_plugin.h 2011-03-27 14:31:47.000000000 -0400 |
17175 |
-+++ linux-2.6.32.38/kernel/rcutree_plugin.h 2011-04-17 15:56:46.000000000 -0400 |
17176 |
+diff -urNp linux-2.6.32.39/kernel/rcutree_plugin.h linux-2.6.32.39/kernel/rcutree_plugin.h |
17177 |
+--- linux-2.6.32.39/kernel/rcutree_plugin.h 2011-03-27 14:31:47.000000000 -0400 |
17178 |
++++ linux-2.6.32.39/kernel/rcutree_plugin.h 2011-04-17 15:56:46.000000000 -0400 |
17179 |
@@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi |
17180 |
*/ |
17181 |
void __rcu_read_lock(void) |
17182 |
@@ -54974,9 +52925,9 @@ diff -urNp linux-2.6.32.38/kernel/rcutree_plugin.h linux-2.6.32.38/kernel/rcutre |
17183 |
unlikely(ACCESS_ONCE(t->rcu_read_unlock_special))) |
17184 |
rcu_read_unlock_special(t); |
17185 |
} |
17186 |
-diff -urNp linux-2.6.32.38/kernel/relay.c linux-2.6.32.38/kernel/relay.c |
17187 |
---- linux-2.6.32.38/kernel/relay.c 2011-03-27 14:31:47.000000000 -0400 |
17188 |
-+++ linux-2.6.32.38/kernel/relay.c 2011-04-17 15:56:46.000000000 -0400 |
17189 |
+diff -urNp linux-2.6.32.39/kernel/relay.c linux-2.6.32.39/kernel/relay.c |
17190 |
+--- linux-2.6.32.39/kernel/relay.c 2011-03-27 14:31:47.000000000 -0400 |
17191 |
++++ linux-2.6.32.39/kernel/relay.c 2011-04-17 15:56:46.000000000 -0400 |
17192 |
@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi |
17193 |
unsigned int flags, |
17194 |
int *nonpad_ret) |
17195 |
@@ -54994,9 +52945,9 @@ diff -urNp linux-2.6.32.38/kernel/relay.c linux-2.6.32.38/kernel/relay.c |
17196 |
|
17197 |
if (rbuf->subbufs_produced == rbuf->subbufs_consumed) |
17198 |
return 0; |
17199 |
-diff -urNp linux-2.6.32.38/kernel/resource.c linux-2.6.32.38/kernel/resource.c |
17200 |
---- linux-2.6.32.38/kernel/resource.c 2011-03-27 14:31:47.000000000 -0400 |
17201 |
-+++ linux-2.6.32.38/kernel/resource.c 2011-04-17 15:56:46.000000000 -0400 |
17202 |
+diff -urNp linux-2.6.32.39/kernel/resource.c linux-2.6.32.39/kernel/resource.c |
17203 |
+--- linux-2.6.32.39/kernel/resource.c 2011-03-27 14:31:47.000000000 -0400 |
17204 |
++++ linux-2.6.32.39/kernel/resource.c 2011-04-17 15:56:46.000000000 -0400 |
17205 |
@@ -132,8 +132,18 @@ static const struct file_operations proc |
17206 |
|
17207 |
static int __init ioresources_init(void) |
17208 |
@@ -55016,9 +52967,9 @@ diff -urNp linux-2.6.32.38/kernel/resource.c linux-2.6.32.38/kernel/resource.c |
17209 |
return 0; |
17210 |
} |
17211 |
__initcall(ioresources_init); |
17212 |
-diff -urNp linux-2.6.32.38/kernel/rtmutex.c linux-2.6.32.38/kernel/rtmutex.c |
17213 |
---- linux-2.6.32.38/kernel/rtmutex.c 2011-03-27 14:31:47.000000000 -0400 |
17214 |
-+++ linux-2.6.32.38/kernel/rtmutex.c 2011-04-17 15:56:46.000000000 -0400 |
17215 |
+diff -urNp linux-2.6.32.39/kernel/rtmutex.c linux-2.6.32.39/kernel/rtmutex.c |
17216 |
+--- linux-2.6.32.39/kernel/rtmutex.c 2011-03-27 14:31:47.000000000 -0400 |
17217 |
++++ linux-2.6.32.39/kernel/rtmutex.c 2011-04-17 15:56:46.000000000 -0400 |
17218 |
@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt |
17219 |
*/ |
17220 |
spin_lock_irqsave(&pendowner->pi_lock, flags); |
17221 |
@@ -55028,9 +52979,9 @@ diff -urNp linux-2.6.32.38/kernel/rtmutex.c linux-2.6.32.38/kernel/rtmutex.c |
17222 |
WARN_ON(pendowner->pi_blocked_on != waiter); |
17223 |
WARN_ON(pendowner->pi_blocked_on->lock != lock); |
17224 |
|
17225 |
-diff -urNp linux-2.6.32.38/kernel/sched.c linux-2.6.32.38/kernel/sched.c |
17226 |
---- linux-2.6.32.38/kernel/sched.c 2011-03-27 14:31:47.000000000 -0400 |
17227 |
-+++ linux-2.6.32.38/kernel/sched.c 2011-04-17 15:56:46.000000000 -0400 |
17228 |
+diff -urNp linux-2.6.32.39/kernel/sched.c linux-2.6.32.39/kernel/sched.c |
17229 |
+--- linux-2.6.32.39/kernel/sched.c 2011-03-27 14:31:47.000000000 -0400 |
17230 |
++++ linux-2.6.32.39/kernel/sched.c 2011-04-23 12:56:11.000000000 -0400 |
17231 |
@@ -5043,7 +5043,7 @@ out: |
17232 |
* In CONFIG_NO_HZ case, the idle load balance owner will do the |
17233 |
* rebalancing for all the cpus for whom scheduler ticks are stopped. |
17234 |
@@ -55090,24 +53041,6 @@ diff -urNp linux-2.6.32.38/kernel/sched.c linux-2.6.32.38/kernel/sched.c |
17235 |
return -EPERM; |
17236 |
|
17237 |
retval = security_task_setnice(current, nice); |
17238 |
-@@ -7700,7 +7703,7 @@ static struct ctl_table sd_ctl_dir[] = { |
17239 |
- .procname = "sched_domain", |
17240 |
- .mode = 0555, |
17241 |
- }, |
17242 |
-- {0, }, |
17243 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
17244 |
- }; |
17245 |
- |
17246 |
- static struct ctl_table sd_ctl_root[] = { |
17247 |
-@@ -7710,7 +7713,7 @@ static struct ctl_table sd_ctl_root[] = |
17248 |
- .mode = 0555, |
17249 |
- .child = sd_ctl_dir, |
17250 |
- }, |
17251 |
-- {0, }, |
17252 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
17253 |
- }; |
17254 |
- |
17255 |
- static struct ctl_table *sd_alloc_ctl_entry(int n) |
17256 |
@@ -8774,7 +8777,7 @@ static void init_sched_groups_power(int |
17257 |
long power; |
17258 |
int weight; |
17259 |
@@ -55117,9 +53050,9 @@ diff -urNp linux-2.6.32.38/kernel/sched.c linux-2.6.32.38/kernel/sched.c |
17260 |
|
17261 |
if (cpu != group_first_cpu(sd->groups)) |
17262 |
return; |
17263 |
-diff -urNp linux-2.6.32.38/kernel/signal.c linux-2.6.32.38/kernel/signal.c |
17264 |
---- linux-2.6.32.38/kernel/signal.c 2011-04-17 17:00:52.000000000 -0400 |
17265 |
-+++ linux-2.6.32.38/kernel/signal.c 2011-04-17 17:03:58.000000000 -0400 |
17266 |
+diff -urNp linux-2.6.32.39/kernel/signal.c linux-2.6.32.39/kernel/signal.c |
17267 |
+--- linux-2.6.32.39/kernel/signal.c 2011-04-17 17:00:52.000000000 -0400 |
17268 |
++++ linux-2.6.32.39/kernel/signal.c 2011-04-17 17:03:58.000000000 -0400 |
17269 |
@@ -41,12 +41,12 @@ |
17270 |
|
17271 |
static struct kmem_cache *sigqueue_cachep; |
17272 |
@@ -55222,9 +53155,9 @@ diff -urNp linux-2.6.32.38/kernel/signal.c linux-2.6.32.38/kernel/signal.c |
17273 |
|
17274 |
return ret; |
17275 |
} |
17276 |
-diff -urNp linux-2.6.32.38/kernel/smp.c linux-2.6.32.38/kernel/smp.c |
17277 |
---- linux-2.6.32.38/kernel/smp.c 2011-03-27 14:31:47.000000000 -0400 |
17278 |
-+++ linux-2.6.32.38/kernel/smp.c 2011-04-17 15:56:46.000000000 -0400 |
17279 |
+diff -urNp linux-2.6.32.39/kernel/smp.c linux-2.6.32.39/kernel/smp.c |
17280 |
+--- linux-2.6.32.39/kernel/smp.c 2011-03-27 14:31:47.000000000 -0400 |
17281 |
++++ linux-2.6.32.39/kernel/smp.c 2011-04-17 15:56:46.000000000 -0400 |
17282 |
@@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void |
17283 |
} |
17284 |
EXPORT_SYMBOL(smp_call_function); |
17285 |
@@ -55252,9 +53185,9 @@ diff -urNp linux-2.6.32.38/kernel/smp.c linux-2.6.32.38/kernel/smp.c |
17286 |
{ |
17287 |
spin_unlock_irq(&call_function.lock); |
17288 |
} |
17289 |
-diff -urNp linux-2.6.32.38/kernel/softirq.c linux-2.6.32.38/kernel/softirq.c |
17290 |
---- linux-2.6.32.38/kernel/softirq.c 2011-03-27 14:31:47.000000000 -0400 |
17291 |
-+++ linux-2.6.32.38/kernel/softirq.c 2011-04-17 15:56:46.000000000 -0400 |
17292 |
+diff -urNp linux-2.6.32.39/kernel/softirq.c linux-2.6.32.39/kernel/softirq.c |
17293 |
+--- linux-2.6.32.39/kernel/softirq.c 2011-03-27 14:31:47.000000000 -0400 |
17294 |
++++ linux-2.6.32.39/kernel/softirq.c 2011-04-17 15:56:46.000000000 -0400 |
17295 |
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec |
17296 |
|
17297 |
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); |
17298 |
@@ -55309,9 +53242,9 @@ diff -urNp linux-2.6.32.38/kernel/softirq.c linux-2.6.32.38/kernel/softirq.c |
17299 |
{ |
17300 |
struct tasklet_struct *list; |
17301 |
|
17302 |
-diff -urNp linux-2.6.32.38/kernel/sys.c linux-2.6.32.38/kernel/sys.c |
17303 |
---- linux-2.6.32.38/kernel/sys.c 2011-03-27 14:31:47.000000000 -0400 |
17304 |
-+++ linux-2.6.32.38/kernel/sys.c 2011-04-17 15:56:46.000000000 -0400 |
17305 |
+diff -urNp linux-2.6.32.39/kernel/sys.c linux-2.6.32.39/kernel/sys.c |
17306 |
+--- linux-2.6.32.39/kernel/sys.c 2011-03-27 14:31:47.000000000 -0400 |
17307 |
++++ linux-2.6.32.39/kernel/sys.c 2011-04-17 15:56:46.000000000 -0400 |
17308 |
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru |
17309 |
error = -EACCES; |
17310 |
goto out; |
17311 |
@@ -55447,9 +53380,9 @@ diff -urNp linux-2.6.32.38/kernel/sys.c linux-2.6.32.38/kernel/sys.c |
17312 |
error = -EINVAL; |
17313 |
break; |
17314 |
} |
17315 |
-diff -urNp linux-2.6.32.38/kernel/sysctl.c linux-2.6.32.38/kernel/sysctl.c |
17316 |
---- linux-2.6.32.38/kernel/sysctl.c 2011-03-27 14:31:47.000000000 -0400 |
17317 |
-+++ linux-2.6.32.38/kernel/sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
17318 |
+diff -urNp linux-2.6.32.39/kernel/sysctl.c linux-2.6.32.39/kernel/sysctl.c |
17319 |
+--- linux-2.6.32.39/kernel/sysctl.c 2011-03-27 14:31:47.000000000 -0400 |
17320 |
++++ linux-2.6.32.39/kernel/sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
17321 |
@@ -63,6 +63,13 @@ |
17322 |
static int deprecated_sysctl_warning(struct __sysctl_args *args); |
17323 |
|
17324 |
@@ -55681,9 +53614,9 @@ diff -urNp linux-2.6.32.38/kernel/sysctl.c linux-2.6.32.38/kernel/sysctl.c |
17325 |
+EXPORT_SYMBOL(sysctl_string_modpriv); |
17326 |
EXPORT_SYMBOL(sysctl_data); |
17327 |
EXPORT_SYMBOL(unregister_sysctl_table); |
17328 |
-diff -urNp linux-2.6.32.38/kernel/sysctl_check.c linux-2.6.32.38/kernel/sysctl_check.c |
17329 |
---- linux-2.6.32.38/kernel/sysctl_check.c 2011-03-27 14:31:47.000000000 -0400 |
17330 |
-+++ linux-2.6.32.38/kernel/sysctl_check.c 2011-04-17 15:56:46.000000000 -0400 |
17331 |
+diff -urNp linux-2.6.32.39/kernel/sysctl_check.c linux-2.6.32.39/kernel/sysctl_check.c |
17332 |
+--- linux-2.6.32.39/kernel/sysctl_check.c 2011-03-27 14:31:47.000000000 -0400 |
17333 |
++++ linux-2.6.32.39/kernel/sysctl_check.c 2011-04-17 15:56:46.000000000 -0400 |
17334 |
@@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n |
17335 |
} else { |
17336 |
if ((table->strategy == sysctl_data) || |
17337 |
@@ -55697,9 +53630,9 @@ diff -urNp linux-2.6.32.38/kernel/sysctl_check.c linux-2.6.32.38/kernel/sysctl_c |
17338 |
(table->proc_handler == proc_dointvec) || |
17339 |
(table->proc_handler == proc_dointvec_minmax) || |
17340 |
(table->proc_handler == proc_dointvec_jiffies) || |
17341 |
-diff -urNp linux-2.6.32.38/kernel/taskstats.c linux-2.6.32.38/kernel/taskstats.c |
17342 |
---- linux-2.6.32.38/kernel/taskstats.c 2011-03-27 14:31:47.000000000 -0400 |
17343 |
-+++ linux-2.6.32.38/kernel/taskstats.c 2011-04-17 15:56:46.000000000 -0400 |
17344 |
+diff -urNp linux-2.6.32.39/kernel/taskstats.c linux-2.6.32.39/kernel/taskstats.c |
17345 |
+--- linux-2.6.32.39/kernel/taskstats.c 2011-03-27 14:31:47.000000000 -0400 |
17346 |
++++ linux-2.6.32.39/kernel/taskstats.c 2011-04-17 15:56:46.000000000 -0400 |
17347 |
@@ -26,9 +26,12 @@ |
17348 |
#include <linux/cgroup.h> |
17349 |
#include <linux/fs.h> |
17350 |
@@ -55723,9 +53656,9 @@ diff -urNp linux-2.6.32.38/kernel/taskstats.c linux-2.6.32.38/kernel/taskstats.c |
17351 |
if (!alloc_cpumask_var(&mask, GFP_KERNEL)) |
17352 |
return -ENOMEM; |
17353 |
|
17354 |
-diff -urNp linux-2.6.32.38/kernel/time/tick-broadcast.c linux-2.6.32.38/kernel/time/tick-broadcast.c |
17355 |
---- linux-2.6.32.38/kernel/time/tick-broadcast.c 2011-03-27 14:31:47.000000000 -0400 |
17356 |
-+++ linux-2.6.32.38/kernel/time/tick-broadcast.c 2011-04-17 15:56:46.000000000 -0400 |
17357 |
+diff -urNp linux-2.6.32.39/kernel/time/tick-broadcast.c linux-2.6.32.39/kernel/time/tick-broadcast.c |
17358 |
+--- linux-2.6.32.39/kernel/time/tick-broadcast.c 2011-03-27 14:31:47.000000000 -0400 |
17359 |
++++ linux-2.6.32.39/kernel/time/tick-broadcast.c 2011-04-17 15:56:46.000000000 -0400 |
17360 |
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl |
17361 |
* then clear the broadcast bit. |
17362 |
*/ |
17363 |
@@ -55735,9 +53668,9 @@ diff -urNp linux-2.6.32.38/kernel/time/tick-broadcast.c linux-2.6.32.38/kernel/t |
17364 |
|
17365 |
cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); |
17366 |
tick_broadcast_clear_oneshot(cpu); |
17367 |
-diff -urNp linux-2.6.32.38/kernel/time/timekeeping.c linux-2.6.32.38/kernel/time/timekeeping.c |
17368 |
---- linux-2.6.32.38/kernel/time/timekeeping.c 2011-03-27 14:31:47.000000000 -0400 |
17369 |
-+++ linux-2.6.32.38/kernel/time/timekeeping.c 2011-04-17 15:56:46.000000000 -0400 |
17370 |
+diff -urNp linux-2.6.32.39/kernel/time/timekeeping.c linux-2.6.32.39/kernel/time/timekeeping.c |
17371 |
+--- linux-2.6.32.39/kernel/time/timekeeping.c 2011-03-27 14:31:47.000000000 -0400 |
17372 |
++++ linux-2.6.32.39/kernel/time/timekeeping.c 2011-04-17 15:56:46.000000000 -0400 |
17373 |
@@ -14,6 +14,7 @@ |
17374 |
#include <linux/init.h> |
17375 |
#include <linux/mm.h> |
17376 |
@@ -55755,9 +53688,9 @@ diff -urNp linux-2.6.32.38/kernel/time/timekeeping.c linux-2.6.32.38/kernel/time |
17377 |
write_seqlock_irqsave(&xtime_lock, flags); |
17378 |
|
17379 |
timekeeping_forward_now(); |
17380 |
-diff -urNp linux-2.6.32.38/kernel/time/timer_list.c linux-2.6.32.38/kernel/time/timer_list.c |
17381 |
---- linux-2.6.32.38/kernel/time/timer_list.c 2011-03-27 14:31:47.000000000 -0400 |
17382 |
-+++ linux-2.6.32.38/kernel/time/timer_list.c 2011-04-17 15:56:46.000000000 -0400 |
17383 |
+diff -urNp linux-2.6.32.39/kernel/time/timer_list.c linux-2.6.32.39/kernel/time/timer_list.c |
17384 |
+--- linux-2.6.32.39/kernel/time/timer_list.c 2011-03-27 14:31:47.000000000 -0400 |
17385 |
++++ linux-2.6.32.39/kernel/time/timer_list.c 2011-04-17 15:56:46.000000000 -0400 |
17386 |
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, |
17387 |
|
17388 |
static void print_name_offset(struct seq_file *m, void *sym) |
17389 |
@@ -55799,9 +53732,9 @@ diff -urNp linux-2.6.32.38/kernel/time/timer_list.c linux-2.6.32.38/kernel/time/ |
17390 |
if (!pe) |
17391 |
return -ENOMEM; |
17392 |
return 0; |
17393 |
-diff -urNp linux-2.6.32.38/kernel/time/timer_stats.c linux-2.6.32.38/kernel/time/timer_stats.c |
17394 |
---- linux-2.6.32.38/kernel/time/timer_stats.c 2011-03-27 14:31:47.000000000 -0400 |
17395 |
-+++ linux-2.6.32.38/kernel/time/timer_stats.c 2011-04-17 15:56:46.000000000 -0400 |
17396 |
+diff -urNp linux-2.6.32.39/kernel/time/timer_stats.c linux-2.6.32.39/kernel/time/timer_stats.c |
17397 |
+--- linux-2.6.32.39/kernel/time/timer_stats.c 2011-03-27 14:31:47.000000000 -0400 |
17398 |
++++ linux-2.6.32.39/kernel/time/timer_stats.c 2011-04-17 15:56:46.000000000 -0400 |
17399 |
@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time |
17400 |
|
17401 |
static void print_name_offset(struct seq_file *m, unsigned long addr) |
17402 |
@@ -55831,9 +53764,9 @@ diff -urNp linux-2.6.32.38/kernel/time/timer_stats.c linux-2.6.32.38/kernel/time |
17403 |
if (!pe) |
17404 |
return -ENOMEM; |
17405 |
return 0; |
17406 |
-diff -urNp linux-2.6.32.38/kernel/time.c linux-2.6.32.38/kernel/time.c |
17407 |
---- linux-2.6.32.38/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 |
17408 |
-+++ linux-2.6.32.38/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 |
17409 |
+diff -urNp linux-2.6.32.39/kernel/time.c linux-2.6.32.39/kernel/time.c |
17410 |
+--- linux-2.6.32.39/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 |
17411 |
++++ linux-2.6.32.39/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 |
17412 |
@@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec |
17413 |
return error; |
17414 |
|
17415 |
@@ -55864,9 +53797,9 @@ diff -urNp linux-2.6.32.38/kernel/time.c linux-2.6.32.38/kernel/time.c |
17416 |
{ |
17417 |
#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) |
17418 |
return (USEC_PER_SEC / HZ) * j; |
17419 |
-diff -urNp linux-2.6.32.38/kernel/timer.c linux-2.6.32.38/kernel/timer.c |
17420 |
---- linux-2.6.32.38/kernel/timer.c 2011-03-27 14:31:47.000000000 -0400 |
17421 |
-+++ linux-2.6.32.38/kernel/timer.c 2011-04-17 15:56:46.000000000 -0400 |
17422 |
+diff -urNp linux-2.6.32.39/kernel/timer.c linux-2.6.32.39/kernel/timer.c |
17423 |
+--- linux-2.6.32.39/kernel/timer.c 2011-03-27 14:31:47.000000000 -0400 |
17424 |
++++ linux-2.6.32.39/kernel/timer.c 2011-04-17 15:56:46.000000000 -0400 |
17425 |
@@ -1213,7 +1213,7 @@ void update_process_times(int user_tick) |
17426 |
/* |
17427 |
* This function runs timers and the timer-tq in bottom half context. |
17428 |
@@ -55876,9 +53809,9 @@ diff -urNp linux-2.6.32.38/kernel/timer.c linux-2.6.32.38/kernel/timer.c |
17429 |
{ |
17430 |
struct tvec_base *base = __get_cpu_var(tvec_bases); |
17431 |
|
17432 |
-diff -urNp linux-2.6.32.38/kernel/trace/ftrace.c linux-2.6.32.38/kernel/trace/ftrace.c |
17433 |
---- linux-2.6.32.38/kernel/trace/ftrace.c 2011-03-27 14:31:47.000000000 -0400 |
17434 |
-+++ linux-2.6.32.38/kernel/trace/ftrace.c 2011-04-17 15:56:46.000000000 -0400 |
17435 |
+diff -urNp linux-2.6.32.39/kernel/trace/ftrace.c linux-2.6.32.39/kernel/trace/ftrace.c |
17436 |
+--- linux-2.6.32.39/kernel/trace/ftrace.c 2011-03-27 14:31:47.000000000 -0400 |
17437 |
++++ linux-2.6.32.39/kernel/trace/ftrace.c 2011-04-17 15:56:46.000000000 -0400 |
17438 |
@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, |
17439 |
|
17440 |
ip = rec->ip; |
17441 |
@@ -55900,9 +53833,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/ftrace.c linux-2.6.32.38/kernel/trace/ft |
17442 |
} |
17443 |
|
17444 |
/* |
17445 |
-diff -urNp linux-2.6.32.38/kernel/trace/ring_buffer.c linux-2.6.32.38/kernel/trace/ring_buffer.c |
17446 |
---- linux-2.6.32.38/kernel/trace/ring_buffer.c 2011-03-27 14:31:47.000000000 -0400 |
17447 |
-+++ linux-2.6.32.38/kernel/trace/ring_buffer.c 2011-04-17 15:56:46.000000000 -0400 |
17448 |
+diff -urNp linux-2.6.32.39/kernel/trace/ring_buffer.c linux-2.6.32.39/kernel/trace/ring_buffer.c |
17449 |
+--- linux-2.6.32.39/kernel/trace/ring_buffer.c 2011-03-27 14:31:47.000000000 -0400 |
17450 |
++++ linux-2.6.32.39/kernel/trace/ring_buffer.c 2011-04-17 15:56:46.000000000 -0400 |
17451 |
@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st |
17452 |
* the reader page). But if the next page is a header page, |
17453 |
* its flags will be non zero. |
17454 |
@@ -55912,9 +53845,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/ring_buffer.c linux-2.6.32.38/kernel/tra |
17455 |
rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, |
17456 |
struct buffer_page *page, struct list_head *list) |
17457 |
{ |
17458 |
-diff -urNp linux-2.6.32.38/kernel/trace/trace.c linux-2.6.32.38/kernel/trace/trace.c |
17459 |
---- linux-2.6.32.38/kernel/trace/trace.c 2011-03-27 14:31:47.000000000 -0400 |
17460 |
-+++ linux-2.6.32.38/kernel/trace/trace.c 2011-04-17 15:56:46.000000000 -0400 |
17461 |
+diff -urNp linux-2.6.32.39/kernel/trace/trace.c linux-2.6.32.39/kernel/trace/trace.c |
17462 |
+--- linux-2.6.32.39/kernel/trace/trace.c 2011-03-27 14:31:47.000000000 -0400 |
17463 |
++++ linux-2.6.32.39/kernel/trace/trace.c 2011-04-17 15:56:46.000000000 -0400 |
17464 |
@@ -3816,10 +3816,9 @@ static const struct file_operations trac |
17465 |
}; |
17466 |
#endif |
17467 |
@@ -55939,9 +53872,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace.c linux-2.6.32.38/kernel/trace/tra |
17468 |
static int once; |
17469 |
struct dentry *d_tracer; |
17470 |
|
17471 |
-diff -urNp linux-2.6.32.38/kernel/trace/trace_events.c linux-2.6.32.38/kernel/trace/trace_events.c |
17472 |
---- linux-2.6.32.38/kernel/trace/trace_events.c 2011-03-27 14:31:47.000000000 -0400 |
17473 |
-+++ linux-2.6.32.38/kernel/trace/trace_events.c 2011-04-17 15:56:46.000000000 -0400 |
17474 |
+diff -urNp linux-2.6.32.39/kernel/trace/trace_events.c linux-2.6.32.39/kernel/trace/trace_events.c |
17475 |
+--- linux-2.6.32.39/kernel/trace/trace_events.c 2011-03-27 14:31:47.000000000 -0400 |
17476 |
++++ linux-2.6.32.39/kernel/trace/trace_events.c 2011-04-17 15:56:46.000000000 -0400 |
17477 |
@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list |
17478 |
* Modules must own their file_operations to keep up with |
17479 |
* reference counting. |
17480 |
@@ -55951,9 +53884,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_events.c linux-2.6.32.38/kernel/tr |
17481 |
struct ftrace_module_file_ops { |
17482 |
struct list_head list; |
17483 |
struct module *mod; |
17484 |
-diff -urNp linux-2.6.32.38/kernel/trace/trace_output.c linux-2.6.32.38/kernel/trace/trace_output.c |
17485 |
---- linux-2.6.32.38/kernel/trace/trace_output.c 2011-03-27 14:31:47.000000000 -0400 |
17486 |
-+++ linux-2.6.32.38/kernel/trace/trace_output.c 2011-04-17 15:56:46.000000000 -0400 |
17487 |
+diff -urNp linux-2.6.32.39/kernel/trace/trace_output.c linux-2.6.32.39/kernel/trace/trace_output.c |
17488 |
+--- linux-2.6.32.39/kernel/trace/trace_output.c 2011-03-27 14:31:47.000000000 -0400 |
17489 |
++++ linux-2.6.32.39/kernel/trace/trace_output.c 2011-04-17 15:56:46.000000000 -0400 |
17490 |
@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, |
17491 |
return 0; |
17492 |
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); |
17493 |
@@ -55963,9 +53896,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_output.c linux-2.6.32.38/kernel/tr |
17494 |
if (p) { |
17495 |
s->len = p - s->buffer; |
17496 |
return 1; |
17497 |
-diff -urNp linux-2.6.32.38/kernel/trace/trace_stack.c linux-2.6.32.38/kernel/trace/trace_stack.c |
17498 |
---- linux-2.6.32.38/kernel/trace/trace_stack.c 2011-03-27 14:31:47.000000000 -0400 |
17499 |
-+++ linux-2.6.32.38/kernel/trace/trace_stack.c 2011-04-17 15:56:46.000000000 -0400 |
17500 |
+diff -urNp linux-2.6.32.39/kernel/trace/trace_stack.c linux-2.6.32.39/kernel/trace/trace_stack.c |
17501 |
+--- linux-2.6.32.39/kernel/trace/trace_stack.c 2011-03-27 14:31:47.000000000 -0400 |
17502 |
++++ linux-2.6.32.39/kernel/trace/trace_stack.c 2011-04-17 15:56:46.000000000 -0400 |
17503 |
@@ -50,7 +50,7 @@ static inline void check_stack(void) |
17504 |
return; |
17505 |
|
17506 |
@@ -55975,9 +53908,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_stack.c linux-2.6.32.38/kernel/tra |
17507 |
return; |
17508 |
|
17509 |
local_irq_save(flags); |
17510 |
-diff -urNp linux-2.6.32.38/kernel/trace/trace_workqueue.c linux-2.6.32.38/kernel/trace/trace_workqueue.c |
17511 |
---- linux-2.6.32.38/kernel/trace/trace_workqueue.c 2011-03-27 14:31:47.000000000 -0400 |
17512 |
-+++ linux-2.6.32.38/kernel/trace/trace_workqueue.c 2011-04-17 15:56:46.000000000 -0400 |
17513 |
+diff -urNp linux-2.6.32.39/kernel/trace/trace_workqueue.c linux-2.6.32.39/kernel/trace/trace_workqueue.c |
17514 |
+--- linux-2.6.32.39/kernel/trace/trace_workqueue.c 2011-03-27 14:31:47.000000000 -0400 |
17515 |
++++ linux-2.6.32.39/kernel/trace/trace_workqueue.c 2011-04-17 15:56:46.000000000 -0400 |
17516 |
@@ -21,7 +21,7 @@ struct cpu_workqueue_stats { |
17517 |
int cpu; |
17518 |
pid_t pid; |
17519 |
@@ -56005,9 +53938,9 @@ diff -urNp linux-2.6.32.38/kernel/trace/trace_workqueue.c linux-2.6.32.38/kernel |
17520 |
tsk->comm); |
17521 |
put_task_struct(tsk); |
17522 |
} |
17523 |
-diff -urNp linux-2.6.32.38/kernel/user.c linux-2.6.32.38/kernel/user.c |
17524 |
---- linux-2.6.32.38/kernel/user.c 2011-03-27 14:31:47.000000000 -0400 |
17525 |
-+++ linux-2.6.32.38/kernel/user.c 2011-04-17 15:56:46.000000000 -0400 |
17526 |
+diff -urNp linux-2.6.32.39/kernel/user.c linux-2.6.32.39/kernel/user.c |
17527 |
+--- linux-2.6.32.39/kernel/user.c 2011-03-27 14:31:47.000000000 -0400 |
17528 |
++++ linux-2.6.32.39/kernel/user.c 2011-04-17 15:56:46.000000000 -0400 |
17529 |
@@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use |
17530 |
spin_lock_irq(&uidhash_lock); |
17531 |
up = uid_hash_find(uid, hashent); |
17532 |
@@ -56016,30 +53949,9 @@ diff -urNp linux-2.6.32.38/kernel/user.c linux-2.6.32.38/kernel/user.c |
17533 |
key_put(new->uid_keyring); |
17534 |
key_put(new->session_keyring); |
17535 |
kmem_cache_free(uid_cachep, new); |
17536 |
-diff -urNp linux-2.6.32.38/kernel/utsname_sysctl.c linux-2.6.32.38/kernel/utsname_sysctl.c |
17537 |
---- linux-2.6.32.38/kernel/utsname_sysctl.c 2011-03-27 14:31:47.000000000 -0400 |
17538 |
-+++ linux-2.6.32.38/kernel/utsname_sysctl.c 2011-04-17 15:56:46.000000000 -0400 |
17539 |
-@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] |
17540 |
- .proc_handler = proc_do_uts_string, |
17541 |
- .strategy = sysctl_uts_string, |
17542 |
- }, |
17543 |
-- {} |
17544 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
17545 |
- }; |
17546 |
- |
17547 |
- static struct ctl_table uts_root_table[] = { |
17548 |
-@@ -133,7 +133,7 @@ static struct ctl_table uts_root_table[] |
17549 |
- .mode = 0555, |
17550 |
- .child = uts_kern_table, |
17551 |
- }, |
17552 |
-- {} |
17553 |
-+ { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } |
17554 |
- }; |
17555 |
- |
17556 |
- static int __init utsname_sysctl_init(void) |
17557 |
-diff -urNp linux-2.6.32.38/lib/bug.c linux-2.6.32.38/lib/bug.c |
17558 |
---- linux-2.6.32.38/lib/bug.c 2011-03-27 14:31:47.000000000 -0400 |
17559 |
-+++ linux-2.6.32.38/lib/bug.c 2011-04-17 15:56:46.000000000 -0400 |
17560 |
+diff -urNp linux-2.6.32.39/lib/bug.c linux-2.6.32.39/lib/bug.c |
17561 |
+--- linux-2.6.32.39/lib/bug.c 2011-03-27 14:31:47.000000000 -0400 |
17562 |
++++ linux-2.6.32.39/lib/bug.c 2011-04-17 15:56:46.000000000 -0400 |
17563 |
@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l |
17564 |
return BUG_TRAP_TYPE_NONE; |
17565 |
|
17566 |
@@ -56049,9 +53961,9 @@ diff -urNp linux-2.6.32.38/lib/bug.c linux-2.6.32.38/lib/bug.c |
17567 |
|
17568 |
printk(KERN_EMERG "------------[ cut here ]------------\n"); |
17569 |
|
17570 |
-diff -urNp linux-2.6.32.38/lib/debugobjects.c linux-2.6.32.38/lib/debugobjects.c |
17571 |
---- linux-2.6.32.38/lib/debugobjects.c 2011-03-27 14:31:47.000000000 -0400 |
17572 |
-+++ linux-2.6.32.38/lib/debugobjects.c 2011-04-17 15:56:46.000000000 -0400 |
17573 |
+diff -urNp linux-2.6.32.39/lib/debugobjects.c linux-2.6.32.39/lib/debugobjects.c |
17574 |
+--- linux-2.6.32.39/lib/debugobjects.c 2011-03-27 14:31:47.000000000 -0400 |
17575 |
++++ linux-2.6.32.39/lib/debugobjects.c 2011-04-17 15:56:46.000000000 -0400 |
17576 |
@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi |
17577 |
if (limit > 4) |
17578 |
return; |
17579 |
@@ -56061,9 +53973,9 @@ diff -urNp linux-2.6.32.38/lib/debugobjects.c linux-2.6.32.38/lib/debugobjects.c |
17580 |
if (is_on_stack == onstack) |
17581 |
return; |
17582 |
|
17583 |
-diff -urNp linux-2.6.32.38/lib/dma-debug.c linux-2.6.32.38/lib/dma-debug.c |
17584 |
---- linux-2.6.32.38/lib/dma-debug.c 2011-03-27 14:31:47.000000000 -0400 |
17585 |
-+++ linux-2.6.32.38/lib/dma-debug.c 2011-04-17 15:56:46.000000000 -0400 |
17586 |
+diff -urNp linux-2.6.32.39/lib/dma-debug.c linux-2.6.32.39/lib/dma-debug.c |
17587 |
+--- linux-2.6.32.39/lib/dma-debug.c 2011-03-27 14:31:47.000000000 -0400 |
17588 |
++++ linux-2.6.32.39/lib/dma-debug.c 2011-04-17 15:56:46.000000000 -0400 |
17589 |
@@ -861,7 +861,7 @@ out: |
17590 |
|
17591 |
static void check_for_stack(struct device *dev, void *addr) |
17592 |
@@ -56073,9 +53985,9 @@ diff -urNp linux-2.6.32.38/lib/dma-debug.c linux-2.6.32.38/lib/dma-debug.c |
17593 |
err_printk(dev, NULL, "DMA-API: device driver maps memory from" |
17594 |
"stack [addr=%p]\n", addr); |
17595 |
} |
17596 |
-diff -urNp linux-2.6.32.38/lib/idr.c linux-2.6.32.38/lib/idr.c |
17597 |
---- linux-2.6.32.38/lib/idr.c 2011-03-27 14:31:47.000000000 -0400 |
17598 |
-+++ linux-2.6.32.38/lib/idr.c 2011-04-17 15:56:46.000000000 -0400 |
17599 |
+diff -urNp linux-2.6.32.39/lib/idr.c linux-2.6.32.39/lib/idr.c |
17600 |
+--- linux-2.6.32.39/lib/idr.c 2011-03-27 14:31:47.000000000 -0400 |
17601 |
++++ linux-2.6.32.39/lib/idr.c 2011-04-17 15:56:46.000000000 -0400 |
17602 |
@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in |
17603 |
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; |
17604 |
|
17605 |
@@ -56085,9 +53997,9 @@ diff -urNp linux-2.6.32.38/lib/idr.c linux-2.6.32.38/lib/idr.c |
17606 |
*starting_id = id; |
17607 |
return IDR_NEED_TO_GROW; |
17608 |
} |
17609 |
-diff -urNp linux-2.6.32.38/lib/inflate.c linux-2.6.32.38/lib/inflate.c |
17610 |
---- linux-2.6.32.38/lib/inflate.c 2011-03-27 14:31:47.000000000 -0400 |
17611 |
-+++ linux-2.6.32.38/lib/inflate.c 2011-04-17 15:56:46.000000000 -0400 |
17612 |
+diff -urNp linux-2.6.32.39/lib/inflate.c linux-2.6.32.39/lib/inflate.c |
17613 |
+--- linux-2.6.32.39/lib/inflate.c 2011-03-27 14:31:47.000000000 -0400 |
17614 |
++++ linux-2.6.32.39/lib/inflate.c 2011-04-17 15:56:46.000000000 -0400 |
17615 |
@@ -266,7 +266,7 @@ static void free(void *where) |
17616 |
malloc_ptr = free_mem_ptr; |
17617 |
} |
17618 |
@@ -56097,9 +54009,9 @@ diff -urNp linux-2.6.32.38/lib/inflate.c linux-2.6.32.38/lib/inflate.c |
17619 |
#define free(a) kfree(a) |
17620 |
#endif |
17621 |
|
17622 |
-diff -urNp linux-2.6.32.38/lib/Kconfig.debug linux-2.6.32.38/lib/Kconfig.debug |
17623 |
---- linux-2.6.32.38/lib/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400 |
17624 |
-+++ linux-2.6.32.38/lib/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400 |
17625 |
+diff -urNp linux-2.6.32.39/lib/Kconfig.debug linux-2.6.32.39/lib/Kconfig.debug |
17626 |
+--- linux-2.6.32.39/lib/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400 |
17627 |
++++ linux-2.6.32.39/lib/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400 |
17628 |
@@ -905,7 +905,7 @@ config LATENCYTOP |
17629 |
select STACKTRACE |
17630 |
select SCHEDSTATS |
17631 |
@@ -56109,9 +54021,9 @@ diff -urNp linux-2.6.32.38/lib/Kconfig.debug linux-2.6.32.38/lib/Kconfig.debug |
17632 |
help |
17633 |
Enable this option if you want to use the LatencyTOP tool |
17634 |
to find out which userspace is blocking on what kernel operations. |
17635 |
-diff -urNp linux-2.6.32.38/lib/kobject.c linux-2.6.32.38/lib/kobject.c |
17636 |
---- linux-2.6.32.38/lib/kobject.c 2011-03-27 14:31:47.000000000 -0400 |
17637 |
-+++ linux-2.6.32.38/lib/kobject.c 2011-04-17 15:56:46.000000000 -0400 |
17638 |
+diff -urNp linux-2.6.32.39/lib/kobject.c linux-2.6.32.39/lib/kobject.c |
17639 |
+--- linux-2.6.32.39/lib/kobject.c 2011-03-27 14:31:47.000000000 -0400 |
17640 |
++++ linux-2.6.32.39/lib/kobject.c 2011-04-17 15:56:46.000000000 -0400 |
17641 |
@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko |
17642 |
return ret; |
17643 |
} |
17644 |
@@ -56139,9 +54051,9 @@ diff -urNp linux-2.6.32.38/lib/kobject.c linux-2.6.32.38/lib/kobject.c |
17645 |
struct kobject *parent_kobj) |
17646 |
{ |
17647 |
struct kset *kset; |
17648 |
-diff -urNp linux-2.6.32.38/lib/kobject_uevent.c linux-2.6.32.38/lib/kobject_uevent.c |
17649 |
---- linux-2.6.32.38/lib/kobject_uevent.c 2011-03-27 14:31:47.000000000 -0400 |
17650 |
-+++ linux-2.6.32.38/lib/kobject_uevent.c 2011-04-17 15:56:46.000000000 -0400 |
17651 |
+diff -urNp linux-2.6.32.39/lib/kobject_uevent.c linux-2.6.32.39/lib/kobject_uevent.c |
17652 |
+--- linux-2.6.32.39/lib/kobject_uevent.c 2011-03-27 14:31:47.000000000 -0400 |
17653 |
++++ linux-2.6.32.39/lib/kobject_uevent.c 2011-04-17 15:56:46.000000000 -0400 |
17654 |
@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k |
17655 |
const char *subsystem; |
17656 |
struct kobject *top_kobj; |
17657 |
@@ -56151,9 +54063,9 @@ diff -urNp linux-2.6.32.38/lib/kobject_uevent.c linux-2.6.32.38/lib/kobject_ueve |
17658 |
u64 seq; |
17659 |
int i = 0; |
17660 |
int retval = 0; |
17661 |
-diff -urNp linux-2.6.32.38/lib/kref.c linux-2.6.32.38/lib/kref.c |
17662 |
---- linux-2.6.32.38/lib/kref.c 2011-03-27 14:31:47.000000000 -0400 |
17663 |
-+++ linux-2.6.32.38/lib/kref.c 2011-04-17 15:56:46.000000000 -0400 |
17664 |
+diff -urNp linux-2.6.32.39/lib/kref.c linux-2.6.32.39/lib/kref.c |
17665 |
+--- linux-2.6.32.39/lib/kref.c 2011-03-27 14:31:47.000000000 -0400 |
17666 |
++++ linux-2.6.32.39/lib/kref.c 2011-04-17 15:56:46.000000000 -0400 |
17667 |
@@ -61,7 +61,7 @@ void kref_get(struct kref *kref) |
17668 |
*/ |
17669 |
int kref_put(struct kref *kref, void (*release)(struct kref *kref)) |
17670 |
@@ -56163,9 +54075,9 @@ diff -urNp linux-2.6.32.38/lib/kref.c linux-2.6.32.38/lib/kref.c |
17671 |
WARN_ON(release == (void (*)(struct kref *))kfree); |
17672 |
|
17673 |
if (atomic_dec_and_test(&kref->refcount)) { |
17674 |
-diff -urNp linux-2.6.32.38/lib/parser.c linux-2.6.32.38/lib/parser.c |
17675 |
---- linux-2.6.32.38/lib/parser.c 2011-03-27 14:31:47.000000000 -0400 |
17676 |
-+++ linux-2.6.32.38/lib/parser.c 2011-04-17 15:56:46.000000000 -0400 |
17677 |
+diff -urNp linux-2.6.32.39/lib/parser.c linux-2.6.32.39/lib/parser.c |
17678 |
+--- linux-2.6.32.39/lib/parser.c 2011-03-27 14:31:47.000000000 -0400 |
17679 |
++++ linux-2.6.32.39/lib/parser.c 2011-04-17 15:56:46.000000000 -0400 |
17680 |
@@ -126,7 +126,7 @@ static int match_number(substring_t *s, |
17681 |
char *buf; |
17682 |
int ret; |
17683 |
@@ -56175,9 +54087,9 @@ diff -urNp linux-2.6.32.38/lib/parser.c linux-2.6.32.38/lib/parser.c |
17684 |
if (!buf) |
17685 |
return -ENOMEM; |
17686 |
memcpy(buf, s->from, s->to - s->from); |
17687 |
-diff -urNp linux-2.6.32.38/lib/radix-tree.c linux-2.6.32.38/lib/radix-tree.c |
17688 |
---- linux-2.6.32.38/lib/radix-tree.c 2011-03-27 14:31:47.000000000 -0400 |
17689 |
-+++ linux-2.6.32.38/lib/radix-tree.c 2011-04-17 15:56:46.000000000 -0400 |
17690 |
+diff -urNp linux-2.6.32.39/lib/radix-tree.c linux-2.6.32.39/lib/radix-tree.c |
17691 |
+--- linux-2.6.32.39/lib/radix-tree.c 2011-03-27 14:31:47.000000000 -0400 |
17692 |
++++ linux-2.6.32.39/lib/radix-tree.c 2011-04-17 15:56:46.000000000 -0400 |
17693 |
@@ -81,7 +81,7 @@ struct radix_tree_preload { |
17694 |
int nr; |
17695 |
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; |
17696 |
@@ -56187,9 +54099,9 @@ diff -urNp linux-2.6.32.38/lib/radix-tree.c linux-2.6.32.38/lib/radix-tree.c |
17697 |
|
17698 |
static inline gfp_t root_gfp_mask(struct radix_tree_root *root) |
17699 |
{ |
17700 |
-diff -urNp linux-2.6.32.38/lib/random32.c linux-2.6.32.38/lib/random32.c |
17701 |
---- linux-2.6.32.38/lib/random32.c 2011-03-27 14:31:47.000000000 -0400 |
17702 |
-+++ linux-2.6.32.38/lib/random32.c 2011-04-17 15:56:46.000000000 -0400 |
17703 |
+diff -urNp linux-2.6.32.39/lib/random32.c linux-2.6.32.39/lib/random32.c |
17704 |
+--- linux-2.6.32.39/lib/random32.c 2011-03-27 14:31:47.000000000 -0400 |
17705 |
++++ linux-2.6.32.39/lib/random32.c 2011-04-17 15:56:46.000000000 -0400 |
17706 |
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * |
17707 |
*/ |
17708 |
static inline u32 __seed(u32 x, u32 m) |
17709 |
@@ -56199,9 +54111,9 @@ diff -urNp linux-2.6.32.38/lib/random32.c linux-2.6.32.38/lib/random32.c |
17710 |
} |
17711 |
|
17712 |
/** |
17713 |
-diff -urNp linux-2.6.32.38/lib/vsprintf.c linux-2.6.32.38/lib/vsprintf.c |
17714 |
---- linux-2.6.32.38/lib/vsprintf.c 2011-03-27 14:31:47.000000000 -0400 |
17715 |
-+++ linux-2.6.32.38/lib/vsprintf.c 2011-04-17 15:56:46.000000000 -0400 |
17716 |
+diff -urNp linux-2.6.32.39/lib/vsprintf.c linux-2.6.32.39/lib/vsprintf.c |
17717 |
+--- linux-2.6.32.39/lib/vsprintf.c 2011-03-27 14:31:47.000000000 -0400 |
17718 |
++++ linux-2.6.32.39/lib/vsprintf.c 2011-04-17 15:56:46.000000000 -0400 |
17719 |
@@ -16,6 +16,9 @@ |
17720 |
* - scnprintf and vscnprintf |
17721 |
*/ |
17722 |
@@ -56302,26 +54214,34 @@ diff -urNp linux-2.6.32.38/lib/vsprintf.c linux-2.6.32.38/lib/vsprintf.c |
17723 |
break; |
17724 |
} |
17725 |
|
17726 |
-diff -urNp linux-2.6.32.38/localversion-grsec linux-2.6.32.38/localversion-grsec |
17727 |
---- linux-2.6.32.38/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 |
17728 |
-+++ linux-2.6.32.38/localversion-grsec 2011-04-17 15:56:46.000000000 -0400 |
17729 |
+diff -urNp linux-2.6.32.39/localversion-grsec linux-2.6.32.39/localversion-grsec |
17730 |
+--- linux-2.6.32.39/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 |
17731 |
++++ linux-2.6.32.39/localversion-grsec 2011-04-17 15:56:46.000000000 -0400 |
17732 |
@@ -0,0 +1 @@ |
17733 |
+-grsec |
17734 |
-diff -urNp linux-2.6.32.38/Makefile linux-2.6.32.38/Makefile |
17735 |
---- linux-2.6.32.38/Makefile 2011-04-17 17:00:57.000000000 -0400 |
17736 |
-+++ linux-2.6.32.38/Makefile 2011-04-17 17:05:01.000000000 -0400 |
17737 |
+diff -urNp linux-2.6.32.39/Makefile linux-2.6.32.39/Makefile |
17738 |
+--- linux-2.6.32.39/Makefile 2011-04-22 19:16:29.000000000 -0400 |
17739 |
++++ linux-2.6.32.39/Makefile 2011-04-23 12:56:10.000000000 -0400 |
17740 |
@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" |
17741 |
|
17742 |
HOSTCC = gcc |
17743 |
HOSTCXX = g++ |
17744 |
-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer |
17745 |
-HOSTCXXFLAGS = -O2 |
17746 |
-+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
17747 |
++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
17748 |
+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks |
17749 |
|
17750 |
# Decide whether to build built-in, modular, or both. |
17751 |
# Normally, just do built-in. |
17752 |
-@@ -644,7 +644,7 @@ export mod_strip_cmd |
17753 |
+@@ -342,6 +342,7 @@ LINUXINCLUDE := -Iinclude \ |
17754 |
+ KBUILD_CPPFLAGS := -D__KERNEL__ |
17755 |
+ |
17756 |
+ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ |
17757 |
++ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers \ |
17758 |
+ -fno-strict-aliasing -fno-common \ |
17759 |
+ -Werror-implicit-function-declaration \ |
17760 |
+ -Wno-format-security \ |
17761 |
+@@ -644,7 +645,7 @@ export mod_strip_cmd |
17762 |
|
17763 |
|
17764 |
ifeq ($(KBUILD_EXTMOD),) |
17765 |
@@ -56330,9 +54250,9 @@ diff -urNp linux-2.6.32.38/Makefile linux-2.6.32.38/Makefile |
17766 |
|
17767 |
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
17768 |
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |
17769 |
-diff -urNp linux-2.6.32.38/mm/filemap.c linux-2.6.32.38/mm/filemap.c |
17770 |
---- linux-2.6.32.38/mm/filemap.c 2011-03-27 14:31:47.000000000 -0400 |
17771 |
-+++ linux-2.6.32.38/mm/filemap.c 2011-04-17 15:56:46.000000000 -0400 |
17772 |
+diff -urNp linux-2.6.32.39/mm/filemap.c linux-2.6.32.39/mm/filemap.c |
17773 |
+--- linux-2.6.32.39/mm/filemap.c 2011-03-27 14:31:47.000000000 -0400 |
17774 |
++++ linux-2.6.32.39/mm/filemap.c 2011-04-17 15:56:46.000000000 -0400 |
17775 |
@@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file |
17776 |
struct address_space *mapping = file->f_mapping; |
17777 |
|
17778 |
@@ -56350,9 +54270,9 @@ diff -urNp linux-2.6.32.38/mm/filemap.c linux-2.6.32.38/mm/filemap.c |
17779 |
if (*pos >= limit) { |
17780 |
send_sig(SIGXFSZ, current, 0); |
17781 |
return -EFBIG; |
17782 |
-diff -urNp linux-2.6.32.38/mm/fremap.c linux-2.6.32.38/mm/fremap.c |
17783 |
---- linux-2.6.32.38/mm/fremap.c 2011-03-27 14:31:47.000000000 -0400 |
17784 |
-+++ linux-2.6.32.38/mm/fremap.c 2011-04-17 15:56:46.000000000 -0400 |
17785 |
+diff -urNp linux-2.6.32.39/mm/fremap.c linux-2.6.32.39/mm/fremap.c |
17786 |
+--- linux-2.6.32.39/mm/fremap.c 2011-03-27 14:31:47.000000000 -0400 |
17787 |
++++ linux-2.6.32.39/mm/fremap.c 2011-04-17 15:56:46.000000000 -0400 |
17788 |
@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign |
17789 |
retry: |
17790 |
vma = find_vma(mm, start); |
17791 |
@@ -56374,9 +54294,9 @@ diff -urNp linux-2.6.32.38/mm/fremap.c linux-2.6.32.38/mm/fremap.c |
17792 |
munlock_vma_pages_range(vma, start, start + size); |
17793 |
vma->vm_flags = saved_flags; |
17794 |
} |
17795 |
-diff -urNp linux-2.6.32.38/mm/highmem.c linux-2.6.32.38/mm/highmem.c |
17796 |
---- linux-2.6.32.38/mm/highmem.c 2011-03-27 14:31:47.000000000 -0400 |
17797 |
-+++ linux-2.6.32.38/mm/highmem.c 2011-04-17 15:56:46.000000000 -0400 |
17798 |
+diff -urNp linux-2.6.32.39/mm/highmem.c linux-2.6.32.39/mm/highmem.c |
17799 |
+--- linux-2.6.32.39/mm/highmem.c 2011-03-27 14:31:47.000000000 -0400 |
17800 |
++++ linux-2.6.32.39/mm/highmem.c 2011-04-17 15:56:46.000000000 -0400 |
17801 |
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) |
17802 |
* So no dangers, even with speculative execution. |
17803 |
*/ |
17804 |
@@ -56402,9 +54322,9 @@ diff -urNp linux-2.6.32.38/mm/highmem.c linux-2.6.32.38/mm/highmem.c |
17805 |
pkmap_count[last_pkmap_nr] = 1; |
17806 |
set_page_address(page, (void *)vaddr); |
17807 |
|
17808 |
-diff -urNp linux-2.6.32.38/mm/hugetlb.c linux-2.6.32.38/mm/hugetlb.c |
17809 |
---- linux-2.6.32.38/mm/hugetlb.c 2011-03-27 14:31:47.000000000 -0400 |
17810 |
-+++ linux-2.6.32.38/mm/hugetlb.c 2011-04-17 15:56:46.000000000 -0400 |
17811 |
+diff -urNp linux-2.6.32.39/mm/hugetlb.c linux-2.6.32.39/mm/hugetlb.c |
17812 |
+--- linux-2.6.32.39/mm/hugetlb.c 2011-03-27 14:31:47.000000000 -0400 |
17813 |
++++ linux-2.6.32.39/mm/hugetlb.c 2011-04-17 15:56:46.000000000 -0400 |
17814 |
@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s |
17815 |
return 1; |
17816 |
} |
17817 |
@@ -56484,9 +54404,9 @@ diff -urNp linux-2.6.32.38/mm/hugetlb.c linux-2.6.32.38/mm/hugetlb.c |
17818 |
ptep = huge_pte_alloc(mm, address, huge_page_size(h)); |
17819 |
if (!ptep) |
17820 |
return VM_FAULT_OOM; |
17821 |
-diff -urNp linux-2.6.32.38/mm/Kconfig linux-2.6.32.38/mm/Kconfig |
17822 |
---- linux-2.6.32.38/mm/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
17823 |
-+++ linux-2.6.32.38/mm/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
17824 |
+diff -urNp linux-2.6.32.39/mm/Kconfig linux-2.6.32.39/mm/Kconfig |
17825 |
+--- linux-2.6.32.39/mm/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
17826 |
++++ linux-2.6.32.39/mm/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
17827 |
@@ -228,7 +228,7 @@ config KSM |
17828 |
config DEFAULT_MMAP_MIN_ADDR |
17829 |
int "Low address space to protect from user allocation" |
17830 |
@@ -56496,9 +54416,9 @@ diff -urNp linux-2.6.32.38/mm/Kconfig linux-2.6.32.38/mm/Kconfig |
17831 |
help |
17832 |
This is the portion of low virtual memory which should be protected |
17833 |
from userspace allocation. Keeping a user from writing to low pages |
17834 |
-diff -urNp linux-2.6.32.38/mm/kmemleak.c linux-2.6.32.38/mm/kmemleak.c |
17835 |
---- linux-2.6.32.38/mm/kmemleak.c 2011-03-27 14:31:47.000000000 -0400 |
17836 |
-+++ linux-2.6.32.38/mm/kmemleak.c 2011-04-17 15:56:46.000000000 -0400 |
17837 |
+diff -urNp linux-2.6.32.39/mm/kmemleak.c linux-2.6.32.39/mm/kmemleak.c |
17838 |
+--- linux-2.6.32.39/mm/kmemleak.c 2011-03-27 14:31:47.000000000 -0400 |
17839 |
++++ linux-2.6.32.39/mm/kmemleak.c 2011-04-17 15:56:46.000000000 -0400 |
17840 |
@@ -358,7 +358,7 @@ static void print_unreferenced(struct se |
17841 |
|
17842 |
for (i = 0; i < object->trace_len; i++) { |
17843 |
@@ -56508,9 +54428,9 @@ diff -urNp linux-2.6.32.38/mm/kmemleak.c linux-2.6.32.38/mm/kmemleak.c |
17844 |
} |
17845 |
} |
17846 |
|
17847 |
-diff -urNp linux-2.6.32.38/mm/maccess.c linux-2.6.32.38/mm/maccess.c |
17848 |
---- linux-2.6.32.38/mm/maccess.c 2011-03-27 14:31:47.000000000 -0400 |
17849 |
-+++ linux-2.6.32.38/mm/maccess.c 2011-04-17 15:56:46.000000000 -0400 |
17850 |
+diff -urNp linux-2.6.32.39/mm/maccess.c linux-2.6.32.39/mm/maccess.c |
17851 |
+--- linux-2.6.32.39/mm/maccess.c 2011-03-27 14:31:47.000000000 -0400 |
17852 |
++++ linux-2.6.32.39/mm/maccess.c 2011-04-17 15:56:46.000000000 -0400 |
17853 |
@@ -14,7 +14,7 @@ |
17854 |
* Safely read from address @src to the buffer at @dst. If a kernel fault |
17855 |
* happens, handle that and return -EFAULT. |
17856 |
@@ -56529,9 +54449,9 @@ diff -urNp linux-2.6.32.38/mm/maccess.c linux-2.6.32.38/mm/maccess.c |
17857 |
{ |
17858 |
long ret; |
17859 |
mm_segment_t old_fs = get_fs(); |
17860 |
-diff -urNp linux-2.6.32.38/mm/madvise.c linux-2.6.32.38/mm/madvise.c |
17861 |
---- linux-2.6.32.38/mm/madvise.c 2011-03-27 14:31:47.000000000 -0400 |
17862 |
-+++ linux-2.6.32.38/mm/madvise.c 2011-04-17 15:56:46.000000000 -0400 |
17863 |
+diff -urNp linux-2.6.32.39/mm/madvise.c linux-2.6.32.39/mm/madvise.c |
17864 |
+--- linux-2.6.32.39/mm/madvise.c 2011-03-27 14:31:47.000000000 -0400 |
17865 |
++++ linux-2.6.32.39/mm/madvise.c 2011-04-17 15:56:46.000000000 -0400 |
17866 |
@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a |
17867 |
pgoff_t pgoff; |
17868 |
unsigned long new_flags = vma->vm_flags; |
17869 |
@@ -56608,9 +54528,9 @@ diff -urNp linux-2.6.32.38/mm/madvise.c linux-2.6.32.38/mm/madvise.c |
17870 |
error = 0; |
17871 |
if (end == start) |
17872 |
goto out; |
17873 |
-diff -urNp linux-2.6.32.38/mm/memory.c linux-2.6.32.38/mm/memory.c |
17874 |
---- linux-2.6.32.38/mm/memory.c 2011-03-27 14:31:47.000000000 -0400 |
17875 |
-+++ linux-2.6.32.38/mm/memory.c 2011-04-17 15:56:46.000000000 -0400 |
17876 |
+diff -urNp linux-2.6.32.39/mm/memory.c linux-2.6.32.39/mm/memory.c |
17877 |
+--- linux-2.6.32.39/mm/memory.c 2011-03-27 14:31:47.000000000 -0400 |
17878 |
++++ linux-2.6.32.39/mm/memory.c 2011-04-17 15:56:46.000000000 -0400 |
17879 |
@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct |
17880 |
return; |
17881 |
|
17882 |
@@ -57140,9 +55060,9 @@ diff -urNp linux-2.6.32.38/mm/memory.c linux-2.6.32.38/mm/memory.c |
17883 |
/* |
17884 |
* Make sure the vDSO gets into every core dump. |
17885 |
* Dumping its contents makes post-mortem fully interpretable later |
17886 |
-diff -urNp linux-2.6.32.38/mm/memory-failure.c linux-2.6.32.38/mm/memory-failure.c |
17887 |
---- linux-2.6.32.38/mm/memory-failure.c 2011-03-27 14:31:47.000000000 -0400 |
17888 |
-+++ linux-2.6.32.38/mm/memory-failure.c 2011-04-17 15:56:46.000000000 -0400 |
17889 |
+diff -urNp linux-2.6.32.39/mm/memory-failure.c linux-2.6.32.39/mm/memory-failure.c |
17890 |
+--- linux-2.6.32.39/mm/memory-failure.c 2011-03-27 14:31:47.000000000 -0400 |
17891 |
++++ linux-2.6.32.39/mm/memory-failure.c 2011-04-17 15:56:46.000000000 -0400 |
17892 |
@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r |
17893 |
|
17894 |
int sysctl_memory_failure_recovery __read_mostly = 1; |
17895 |
@@ -57161,9 +55081,9 @@ diff -urNp linux-2.6.32.38/mm/memory-failure.c linux-2.6.32.38/mm/memory-failure |
17896 |
|
17897 |
/* |
17898 |
* We need/can do nothing about count=0 pages. |
17899 |
-diff -urNp linux-2.6.32.38/mm/mempolicy.c linux-2.6.32.38/mm/mempolicy.c |
17900 |
---- linux-2.6.32.38/mm/mempolicy.c 2011-03-27 14:31:47.000000000 -0400 |
17901 |
-+++ linux-2.6.32.38/mm/mempolicy.c 2011-04-17 15:56:46.000000000 -0400 |
17902 |
+diff -urNp linux-2.6.32.39/mm/mempolicy.c linux-2.6.32.39/mm/mempolicy.c |
17903 |
+--- linux-2.6.32.39/mm/mempolicy.c 2011-03-27 14:31:47.000000000 -0400 |
17904 |
++++ linux-2.6.32.39/mm/mempolicy.c 2011-04-17 15:56:46.000000000 -0400 |
17905 |
@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st |
17906 |
struct vm_area_struct *next; |
17907 |
int err; |
17908 |
@@ -57244,9 +55164,9 @@ diff -urNp linux-2.6.32.38/mm/mempolicy.c linux-2.6.32.38/mm/mempolicy.c |
17909 |
} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { |
17910 |
seq_printf(m, " heap"); |
17911 |
} else if (vma->vm_start <= mm->start_stack && |
17912 |
-diff -urNp linux-2.6.32.38/mm/migrate.c linux-2.6.32.38/mm/migrate.c |
17913 |
---- linux-2.6.32.38/mm/migrate.c 2011-03-27 14:31:47.000000000 -0400 |
17914 |
-+++ linux-2.6.32.38/mm/migrate.c 2011-04-17 15:56:46.000000000 -0400 |
17915 |
+diff -urNp linux-2.6.32.39/mm/migrate.c linux-2.6.32.39/mm/migrate.c |
17916 |
+--- linux-2.6.32.39/mm/migrate.c 2011-03-27 14:31:47.000000000 -0400 |
17917 |
++++ linux-2.6.32.39/mm/migrate.c 2011-04-17 15:56:46.000000000 -0400 |
17918 |
@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, |
17919 |
if (!mm) |
17920 |
return -EINVAL; |
17921 |
@@ -57272,9 +55192,9 @@ diff -urNp linux-2.6.32.38/mm/migrate.c linux-2.6.32.38/mm/migrate.c |
17922 |
rcu_read_unlock(); |
17923 |
err = -EPERM; |
17924 |
goto out; |
17925 |
-diff -urNp linux-2.6.32.38/mm/mlock.c linux-2.6.32.38/mm/mlock.c |
17926 |
---- linux-2.6.32.38/mm/mlock.c 2011-03-27 14:31:47.000000000 -0400 |
17927 |
-+++ linux-2.6.32.38/mm/mlock.c 2011-04-17 15:56:46.000000000 -0400 |
17928 |
+diff -urNp linux-2.6.32.39/mm/mlock.c linux-2.6.32.39/mm/mlock.c |
17929 |
+--- linux-2.6.32.39/mm/mlock.c 2011-03-27 14:31:47.000000000 -0400 |
17930 |
++++ linux-2.6.32.39/mm/mlock.c 2011-04-17 15:56:46.000000000 -0400 |
17931 |
@@ -13,6 +13,7 @@ |
17932 |
#include <linux/pagemap.h> |
17933 |
#include <linux/mempolicy.h> |
17934 |
@@ -57385,9 +55305,9 @@ diff -urNp linux-2.6.32.38/mm/mlock.c linux-2.6.32.38/mm/mlock.c |
17935 |
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || |
17936 |
capable(CAP_IPC_LOCK)) |
17937 |
ret = do_mlockall(flags); |
17938 |
-diff -urNp linux-2.6.32.38/mm/mmap.c linux-2.6.32.38/mm/mmap.c |
17939 |
---- linux-2.6.32.38/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
17940 |
-+++ linux-2.6.32.38/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 |
17941 |
+diff -urNp linux-2.6.32.39/mm/mmap.c linux-2.6.32.39/mm/mmap.c |
17942 |
+--- linux-2.6.32.39/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 |
17943 |
++++ linux-2.6.32.39/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 |
17944 |
@@ -45,6 +45,16 @@ |
17945 |
#define arch_rebalance_pgtables(addr, len) (addr) |
17946 |
#endif |
17947 |
@@ -58604,9 +56524,9 @@ diff -urNp linux-2.6.32.38/mm/mmap.c linux-2.6.32.38/mm/mmap.c |
17948 |
vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; |
17949 |
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
17950 |
|
17951 |
-diff -urNp linux-2.6.32.38/mm/mprotect.c linux-2.6.32.38/mm/mprotect.c |
17952 |
---- linux-2.6.32.38/mm/mprotect.c 2011-03-27 14:31:47.000000000 -0400 |
17953 |
-+++ linux-2.6.32.38/mm/mprotect.c 2011-04-17 15:56:46.000000000 -0400 |
17954 |
+diff -urNp linux-2.6.32.39/mm/mprotect.c linux-2.6.32.39/mm/mprotect.c |
17955 |
+--- linux-2.6.32.39/mm/mprotect.c 2011-03-27 14:31:47.000000000 -0400 |
17956 |
++++ linux-2.6.32.39/mm/mprotect.c 2011-04-17 15:56:46.000000000 -0400 |
17957 |
@@ -24,10 +24,16 @@ |
17958 |
#include <linux/mmu_notifier.h> |
17959 |
#include <linux/migrate.h> |
17960 |
@@ -58829,9 +56749,9 @@ diff -urNp linux-2.6.32.38/mm/mprotect.c linux-2.6.32.38/mm/mprotect.c |
17961 |
nstart = tmp; |
17962 |
|
17963 |
if (nstart < prev->vm_end) |
17964 |
-diff -urNp linux-2.6.32.38/mm/mremap.c linux-2.6.32.38/mm/mremap.c |
17965 |
---- linux-2.6.32.38/mm/mremap.c 2011-04-17 17:00:52.000000000 -0400 |
17966 |
-+++ linux-2.6.32.38/mm/mremap.c 2011-04-17 17:03:58.000000000 -0400 |
17967 |
+diff -urNp linux-2.6.32.39/mm/mremap.c linux-2.6.32.39/mm/mremap.c |
17968 |
+--- linux-2.6.32.39/mm/mremap.c 2011-04-17 17:00:52.000000000 -0400 |
17969 |
++++ linux-2.6.32.39/mm/mremap.c 2011-04-17 17:03:58.000000000 -0400 |
17970 |
@@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str |
17971 |
continue; |
17972 |
pte = ptep_clear_flush(vma, old_addr, old_pte); |
17973 |
@@ -58936,9 +56856,9 @@ diff -urNp linux-2.6.32.38/mm/mremap.c linux-2.6.32.38/mm/mremap.c |
17974 |
} |
17975 |
out: |
17976 |
if (ret & ~PAGE_MASK) |
17977 |
-diff -urNp linux-2.6.32.38/mm/nommu.c linux-2.6.32.38/mm/nommu.c |
17978 |
---- linux-2.6.32.38/mm/nommu.c 2011-03-27 14:31:47.000000000 -0400 |
17979 |
-+++ linux-2.6.32.38/mm/nommu.c 2011-04-17 15:56:46.000000000 -0400 |
17980 |
+diff -urNp linux-2.6.32.39/mm/nommu.c linux-2.6.32.39/mm/nommu.c |
17981 |
+--- linux-2.6.32.39/mm/nommu.c 2011-03-27 14:31:47.000000000 -0400 |
17982 |
++++ linux-2.6.32.39/mm/nommu.c 2011-04-17 15:56:46.000000000 -0400 |
17983 |
@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI |
17984 |
int sysctl_overcommit_ratio = 50; /* default is 50% */ |
17985 |
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; |
17986 |
@@ -58963,9 +56883,9 @@ diff -urNp linux-2.6.32.38/mm/nommu.c linux-2.6.32.38/mm/nommu.c |
17987 |
* expand a stack to a given address |
17988 |
* - not supported under NOMMU conditions |
17989 |
*/ |
17990 |
-diff -urNp linux-2.6.32.38/mm/page_alloc.c linux-2.6.32.38/mm/page_alloc.c |
17991 |
---- linux-2.6.32.38/mm/page_alloc.c 2011-03-27 14:31:47.000000000 -0400 |
17992 |
-+++ linux-2.6.32.38/mm/page_alloc.c 2011-04-17 15:56:46.000000000 -0400 |
17993 |
+diff -urNp linux-2.6.32.39/mm/page_alloc.c linux-2.6.32.39/mm/page_alloc.c |
17994 |
+--- linux-2.6.32.39/mm/page_alloc.c 2011-03-27 14:31:47.000000000 -0400 |
17995 |
++++ linux-2.6.32.39/mm/page_alloc.c 2011-04-17 15:56:46.000000000 -0400 |
17996 |
@@ -587,6 +587,10 @@ static void __free_pages_ok(struct page |
17997 |
int bad = 0; |
17998 |
int wasMlocked = __TestClearPageMlocked(page); |
17999 |
@@ -59022,9 +56942,9 @@ diff -urNp linux-2.6.32.38/mm/page_alloc.c linux-2.6.32.38/mm/page_alloc.c |
18000 |
struct zone *zone, unsigned long zonesize) {} |
18001 |
#endif /* CONFIG_SPARSEMEM */ |
18002 |
|
18003 |
-diff -urNp linux-2.6.32.38/mm/percpu.c linux-2.6.32.38/mm/percpu.c |
18004 |
---- linux-2.6.32.38/mm/percpu.c 2011-03-27 14:31:47.000000000 -0400 |
18005 |
-+++ linux-2.6.32.38/mm/percpu.c 2011-04-17 15:56:46.000000000 -0400 |
18006 |
+diff -urNp linux-2.6.32.39/mm/percpu.c linux-2.6.32.39/mm/percpu.c |
18007 |
+--- linux-2.6.32.39/mm/percpu.c 2011-03-27 14:31:47.000000000 -0400 |
18008 |
++++ linux-2.6.32.39/mm/percpu.c 2011-04-17 15:56:46.000000000 -0400 |
18009 |
@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu |
18010 |
static unsigned int pcpu_last_unit_cpu __read_mostly; |
18011 |
|
18012 |
@@ -59034,9 +56954,9 @@ diff -urNp linux-2.6.32.38/mm/percpu.c linux-2.6.32.38/mm/percpu.c |
18013 |
EXPORT_SYMBOL_GPL(pcpu_base_addr); |
18014 |
|
18015 |
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ |
18016 |
-diff -urNp linux-2.6.32.38/mm/rmap.c linux-2.6.32.38/mm/rmap.c |
18017 |
---- linux-2.6.32.38/mm/rmap.c 2011-03-27 14:31:47.000000000 -0400 |
18018 |
-+++ linux-2.6.32.38/mm/rmap.c 2011-04-17 15:56:46.000000000 -0400 |
18019 |
+diff -urNp linux-2.6.32.39/mm/rmap.c linux-2.6.32.39/mm/rmap.c |
18020 |
+--- linux-2.6.32.39/mm/rmap.c 2011-03-27 14:31:47.000000000 -0400 |
18021 |
++++ linux-2.6.32.39/mm/rmap.c 2011-04-17 15:56:46.000000000 -0400 |
18022 |
@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru |
18023 |
/* page_table_lock to protect against threads */ |
18024 |
spin_lock(&mm->page_table_lock); |
18025 |
@@ -59055,9 +56975,9 @@ diff -urNp linux-2.6.32.38/mm/rmap.c linux-2.6.32.38/mm/rmap.c |
18026 |
vma->anon_vma = anon_vma; |
18027 |
list_add_tail(&vma->anon_vma_node, &anon_vma->head); |
18028 |
allocated = NULL; |
18029 |
-diff -urNp linux-2.6.32.38/mm/shmem.c linux-2.6.32.38/mm/shmem.c |
18030 |
---- linux-2.6.32.38/mm/shmem.c 2011-03-27 14:31:47.000000000 -0400 |
18031 |
-+++ linux-2.6.32.38/mm/shmem.c 2011-04-18 22:03:00.000000000 -0400 |
18032 |
+diff -urNp linux-2.6.32.39/mm/shmem.c linux-2.6.32.39/mm/shmem.c |
18033 |
+--- linux-2.6.32.39/mm/shmem.c 2011-03-27 14:31:47.000000000 -0400 |
18034 |
++++ linux-2.6.32.39/mm/shmem.c 2011-04-18 22:03:00.000000000 -0400 |
18035 |
@@ -31,7 +31,7 @@ |
18036 |
#include <linux/swap.h> |
18037 |
#include <linux/ima.h> |
18038 |
@@ -59085,9 +57005,9 @@ diff -urNp linux-2.6.32.38/mm/shmem.c linux-2.6.32.38/mm/shmem.c |
18039 |
/* do it inline */ |
18040 |
memcpy(info, symname, len); |
18041 |
inode->i_op = &shmem_symlink_inline_operations; |
18042 |
-diff -urNp linux-2.6.32.38/mm/slab.c linux-2.6.32.38/mm/slab.c |
18043 |
---- linux-2.6.32.38/mm/slab.c 2011-03-27 14:31:47.000000000 -0400 |
18044 |
-+++ linux-2.6.32.38/mm/slab.c 2011-04-18 22:08:34.000000000 -0400 |
18045 |
+diff -urNp linux-2.6.32.39/mm/slab.c linux-2.6.32.39/mm/slab.c |
18046 |
+--- linux-2.6.32.39/mm/slab.c 2011-03-27 14:31:47.000000000 -0400 |
18047 |
++++ linux-2.6.32.39/mm/slab.c 2011-04-23 12:56:11.000000000 -0400 |
18048 |
@@ -174,7 +174,7 @@ |
18049 |
|
18050 |
/* Legal flag mask for kmem_cache_create(). */ |
18051 |
@@ -59124,24 +57044,6 @@ diff -urNp linux-2.6.32.38/mm/slab.c linux-2.6.32.38/mm/slab.c |
18052 |
{ |
18053 |
u32 offset = (obj - slab->s_mem); |
18054 |
return reciprocal_divide(offset, cache->reciprocal_buffer_size); |
18055 |
-@@ -584,14 +584,14 @@ struct cache_names { |
18056 |
- static struct cache_names __initdata cache_names[] = { |
18057 |
- #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" }, |
18058 |
- #include <linux/kmalloc_sizes.h> |
18059 |
-- {NULL,} |
18060 |
-+ {NULL, NULL} |
18061 |
- #undef CACHE |
18062 |
- }; |
18063 |
- |
18064 |
- static struct arraycache_init initarray_cache __initdata = |
18065 |
-- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; |
18066 |
-+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; |
18067 |
- static struct arraycache_init initarray_generic = |
18068 |
-- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; |
18069 |
-+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; |
18070 |
- |
18071 |
- /* internal cache of cache description objs */ |
18072 |
- static struct kmem_cache cache_cache = { |
18073 |
@@ -1453,7 +1453,7 @@ void __init kmem_cache_init(void) |
18074 |
sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name, |
18075 |
sizes[INDEX_AC].cs_size, |
18076 |
@@ -59238,9 +57140,9 @@ diff -urNp linux-2.6.32.38/mm/slab.c linux-2.6.32.38/mm/slab.c |
18077 |
/** |
18078 |
* ksize - get the actual amount of memory allocated for a given object |
18079 |
* @objp: Pointer to the object |
18080 |
-diff -urNp linux-2.6.32.38/mm/slob.c linux-2.6.32.38/mm/slob.c |
18081 |
---- linux-2.6.32.38/mm/slob.c 2011-03-27 14:31:47.000000000 -0400 |
18082 |
-+++ linux-2.6.32.38/mm/slob.c 2011-04-17 15:56:46.000000000 -0400 |
18083 |
+diff -urNp linux-2.6.32.39/mm/slob.c linux-2.6.32.39/mm/slob.c |
18084 |
+--- linux-2.6.32.39/mm/slob.c 2011-03-27 14:31:47.000000000 -0400 |
18085 |
++++ linux-2.6.32.39/mm/slob.c 2011-04-17 15:56:46.000000000 -0400 |
18086 |
@@ -29,7 +29,7 @@ |
18087 |
* If kmalloc is asked for objects of PAGE_SIZE or larger, it calls |
18088 |
* alloc_pages() directly, allocating compound pages so the page order |
18089 |
@@ -59558,9 +57460,9 @@ diff -urNp linux-2.6.32.38/mm/slob.c linux-2.6.32.38/mm/slob.c |
18090 |
} |
18091 |
|
18092 |
trace_kmem_cache_free(_RET_IP_, b); |
18093 |
-diff -urNp linux-2.6.32.38/mm/slub.c linux-2.6.32.38/mm/slub.c |
18094 |
---- linux-2.6.32.38/mm/slub.c 2011-03-27 14:31:47.000000000 -0400 |
18095 |
-+++ linux-2.6.32.38/mm/slub.c 2011-04-17 15:56:46.000000000 -0400 |
18096 |
+diff -urNp linux-2.6.32.39/mm/slub.c linux-2.6.32.39/mm/slub.c |
18097 |
+--- linux-2.6.32.39/mm/slub.c 2011-03-27 14:31:47.000000000 -0400 |
18098 |
++++ linux-2.6.32.39/mm/slub.c 2011-04-17 15:56:46.000000000 -0400 |
18099 |
@@ -410,7 +410,7 @@ static void print_track(const char *s, s |
18100 |
if (!t->addr) |
18101 |
return; |
18102 |
@@ -59771,9 +57673,9 @@ diff -urNp linux-2.6.32.38/mm/slub.c linux-2.6.32.38/mm/slub.c |
18103 |
return 0; |
18104 |
} |
18105 |
module_init(slab_proc_init); |
18106 |
-diff -urNp linux-2.6.32.38/mm/util.c linux-2.6.32.38/mm/util.c |
18107 |
---- linux-2.6.32.38/mm/util.c 2011-03-27 14:31:47.000000000 -0400 |
18108 |
-+++ linux-2.6.32.38/mm/util.c 2011-04-17 15:56:46.000000000 -0400 |
18109 |
+diff -urNp linux-2.6.32.39/mm/util.c linux-2.6.32.39/mm/util.c |
18110 |
+--- linux-2.6.32.39/mm/util.c 2011-03-27 14:31:47.000000000 -0400 |
18111 |
++++ linux-2.6.32.39/mm/util.c 2011-04-17 15:56:46.000000000 -0400 |
18112 |
@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); |
18113 |
void arch_pick_mmap_layout(struct mm_struct *mm) |
18114 |
{ |
18115 |
@@ -59787,9 +57689,9 @@ diff -urNp linux-2.6.32.38/mm/util.c linux-2.6.32.38/mm/util.c |
18116 |
mm->get_unmapped_area = arch_get_unmapped_area; |
18117 |
mm->unmap_area = arch_unmap_area; |
18118 |
} |
18119 |
-diff -urNp linux-2.6.32.38/mm/vmalloc.c linux-2.6.32.38/mm/vmalloc.c |
18120 |
---- linux-2.6.32.38/mm/vmalloc.c 2011-03-27 14:31:47.000000000 -0400 |
18121 |
-+++ linux-2.6.32.38/mm/vmalloc.c 2011-04-17 15:56:46.000000000 -0400 |
18122 |
+diff -urNp linux-2.6.32.39/mm/vmalloc.c linux-2.6.32.39/mm/vmalloc.c |
18123 |
+--- linux-2.6.32.39/mm/vmalloc.c 2011-03-27 14:31:47.000000000 -0400 |
18124 |
++++ linux-2.6.32.39/mm/vmalloc.c 2011-04-17 15:56:46.000000000 -0400 |
18125 |
@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, |
18126 |
|
18127 |
pte = pte_offset_kernel(pmd, addr); |
18128 |
@@ -60026,9 +57928,9 @@ diff -urNp linux-2.6.32.38/mm/vmalloc.c linux-2.6.32.38/mm/vmalloc.c |
18129 |
if ((PAGE_SIZE-1) & (unsigned long)addr) |
18130 |
return -EINVAL; |
18131 |
|
18132 |
-diff -urNp linux-2.6.32.38/mm/vmstat.c linux-2.6.32.38/mm/vmstat.c |
18133 |
---- linux-2.6.32.38/mm/vmstat.c 2011-03-27 14:31:47.000000000 -0400 |
18134 |
-+++ linux-2.6.32.38/mm/vmstat.c 2011-04-17 15:56:46.000000000 -0400 |
18135 |
+diff -urNp linux-2.6.32.39/mm/vmstat.c linux-2.6.32.39/mm/vmstat.c |
18136 |
+--- linux-2.6.32.39/mm/vmstat.c 2011-03-27 14:31:47.000000000 -0400 |
18137 |
++++ linux-2.6.32.39/mm/vmstat.c 2011-04-17 15:56:46.000000000 -0400 |
18138 |
@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu) |
18139 |
* |
18140 |
* vm_stat contains the global counters |
18141 |
@@ -60081,9 +57983,9 @@ diff -urNp linux-2.6.32.38/mm/vmstat.c linux-2.6.32.38/mm/vmstat.c |
18142 |
#endif |
18143 |
return 0; |
18144 |
} |
18145 |
-diff -urNp linux-2.6.32.38/net/8021q/vlan.c linux-2.6.32.38/net/8021q/vlan.c |
18146 |
---- linux-2.6.32.38/net/8021q/vlan.c 2011-03-27 14:31:47.000000000 -0400 |
18147 |
-+++ linux-2.6.32.38/net/8021q/vlan.c 2011-04-17 15:56:46.000000000 -0400 |
18148 |
+diff -urNp linux-2.6.32.39/net/8021q/vlan.c linux-2.6.32.39/net/8021q/vlan.c |
18149 |
+--- linux-2.6.32.39/net/8021q/vlan.c 2011-03-27 14:31:47.000000000 -0400 |
18150 |
++++ linux-2.6.32.39/net/8021q/vlan.c 2011-04-17 15:56:46.000000000 -0400 |
18151 |
@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net |
18152 |
err = -EPERM; |
18153 |
if (!capable(CAP_NET_ADMIN)) |
18154 |
@@ -60094,9 +57996,9 @@ diff -urNp linux-2.6.32.38/net/8021q/vlan.c linux-2.6.32.38/net/8021q/vlan.c |
18155 |
struct vlan_net *vn; |
18156 |
|
18157 |
vn = net_generic(net, vlan_net_id); |
18158 |
-diff -urNp linux-2.6.32.38/net/atm/atm_misc.c linux-2.6.32.38/net/atm/atm_misc.c |
18159 |
---- linux-2.6.32.38/net/atm/atm_misc.c 2011-03-27 14:31:47.000000000 -0400 |
18160 |
-+++ linux-2.6.32.38/net/atm/atm_misc.c 2011-04-17 15:56:46.000000000 -0400 |
18161 |
+diff -urNp linux-2.6.32.39/net/atm/atm_misc.c linux-2.6.32.39/net/atm/atm_misc.c |
18162 |
+--- linux-2.6.32.39/net/atm/atm_misc.c 2011-03-27 14:31:47.000000000 -0400 |
18163 |
++++ linux-2.6.32.39/net/atm/atm_misc.c 2011-04-17 15:56:46.000000000 -0400 |
18164 |
@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t |
18165 |
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) |
18166 |
return 1; |
18167 |
@@ -60133,9 +58035,9 @@ diff -urNp linux-2.6.32.38/net/atm/atm_misc.c linux-2.6.32.38/net/atm/atm_misc.c |
18168 |
__SONET_ITEMS |
18169 |
#undef __HANDLE_ITEM |
18170 |
} |
18171 |
-diff -urNp linux-2.6.32.38/net/atm/proc.c linux-2.6.32.38/net/atm/proc.c |
18172 |
---- linux-2.6.32.38/net/atm/proc.c 2011-03-27 14:31:47.000000000 -0400 |
18173 |
-+++ linux-2.6.32.38/net/atm/proc.c 2011-04-17 15:56:46.000000000 -0400 |
18174 |
+diff -urNp linux-2.6.32.39/net/atm/proc.c linux-2.6.32.39/net/atm/proc.c |
18175 |
+--- linux-2.6.32.39/net/atm/proc.c 2011-03-27 14:31:47.000000000 -0400 |
18176 |
++++ linux-2.6.32.39/net/atm/proc.c 2011-04-17 15:56:46.000000000 -0400 |
18177 |
@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s |
18178 |
const struct k_atm_aal_stats *stats) |
18179 |
{ |
18180 |
@@ -60174,9 +58076,9 @@ diff -urNp linux-2.6.32.38/net/atm/proc.c linux-2.6.32.38/net/atm/proc.c |
18181 |
else |
18182 |
seq_printf(seq, "%3d %3d %5d ", |
18183 |
vcc->dev->number, vcc->vpi, vcc->vci); |
18184 |
-diff -urNp linux-2.6.32.38/net/atm/resources.c linux-2.6.32.38/net/atm/resources.c |
18185 |
---- linux-2.6.32.38/net/atm/resources.c 2011-03-27 14:31:47.000000000 -0400 |
18186 |
-+++ linux-2.6.32.38/net/atm/resources.c 2011-04-17 15:56:46.000000000 -0400 |
18187 |
+diff -urNp linux-2.6.32.39/net/atm/resources.c linux-2.6.32.39/net/atm/resources.c |
18188 |
+--- linux-2.6.32.39/net/atm/resources.c 2011-03-27 14:31:47.000000000 -0400 |
18189 |
++++ linux-2.6.32.39/net/atm/resources.c 2011-04-17 15:56:46.000000000 -0400 |
18190 |
@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * |
18191 |
static void copy_aal_stats(struct k_atm_aal_stats *from, |
18192 |
struct atm_aal_stats *to) |
18193 |
@@ -60195,18 +58097,9 @@ diff -urNp linux-2.6.32.38/net/atm/resources.c linux-2.6.32.38/net/atm/resources |
18194 |
__AAL_STAT_ITEMS |
18195 |
#undef __HANDLE_ITEM |
18196 |
} |
18197 |
-diff -urNp linux-2.6.32.38/net/ax25/af_ax25.c linux-2.6.32.38/net/ax25/af_ax25.c |
18198 |
---- linux-2.6.32.38/net/ax25/af_ax25.c 2011-04-17 17:00:52.000000000 -0400 |
18199 |
-+++ linux-2.6.32.38/net/ax25/af_ax25.c 2011-04-17 17:03:58.000000000 -0400 |
18200 |
-@@ -1391,7 +1391,7 @@ static int ax25_getname(struct socket *s |
18201 |
- ax25_cb *ax25; |
18202 |
- int err = 0; |
18203 |
- |
18204 |
-- memset(fsa, 0, sizeof(fsa)); |
18205 |
-+ memset(fsa, 0, sizeof(*fsa)); |
18206 |
- lock_sock(sk); |
18207 |
- ax25 = ax25_sk(sk); |
18208 |
- |
18209 |
+diff -urNp linux-2.6.32.39/net/ax25/af_ax25.c linux-2.6.32.39/net/ax25/af_ax25.c |
18210 |
+--- linux-2.6.32.39/net/ax25/af_ax25.c 2011-04-22 19:16:29.000000000 -0400 |
18211 |
++++ linux-2.6.32.39/net/ax25/af_ax25.c 2011-04-17 17:03:58.000000000 -0400 |
18212 |
@@ -1445,6 +1445,7 @@ static int ax25_sendmsg(struct kiocb *io |
18213 |
if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT)) |
18214 |
return -EINVAL; |
18215 |
@@ -60215,9 +58108,9 @@ diff -urNp linux-2.6.32.38/net/ax25/af_ax25.c linux-2.6.32.38/net/ax25/af_ax25.c |
18216 |
lock_sock(sk); |
18217 |
ax25 = ax25_sk(sk); |
18218 |
|
18219 |
-diff -urNp linux-2.6.32.38/net/bridge/br_private.h linux-2.6.32.38/net/bridge/br_private.h |
18220 |
---- linux-2.6.32.38/net/bridge/br_private.h 2011-03-27 14:31:47.000000000 -0400 |
18221 |
-+++ linux-2.6.32.38/net/bridge/br_private.h 2011-04-17 15:56:46.000000000 -0400 |
18222 |
+diff -urNp linux-2.6.32.39/net/bridge/br_private.h linux-2.6.32.39/net/bridge/br_private.h |
18223 |
+--- linux-2.6.32.39/net/bridge/br_private.h 2011-03-27 14:31:47.000000000 -0400 |
18224 |
++++ linux-2.6.32.39/net/bridge/br_private.h 2011-04-17 15:56:46.000000000 -0400 |
18225 |
@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, |
18226 |
|
18227 |
#ifdef CONFIG_SYSFS |
18228 |
@@ -60227,9 +58120,9 @@ diff -urNp linux-2.6.32.38/net/bridge/br_private.h linux-2.6.32.38/net/bridge/br |
18229 |
extern int br_sysfs_addif(struct net_bridge_port *p); |
18230 |
|
18231 |
/* br_sysfs_br.c */ |
18232 |
-diff -urNp linux-2.6.32.38/net/bridge/br_stp_if.c linux-2.6.32.38/net/bridge/br_stp_if.c |
18233 |
---- linux-2.6.32.38/net/bridge/br_stp_if.c 2011-03-27 14:31:47.000000000 -0400 |
18234 |
-+++ linux-2.6.32.38/net/bridge/br_stp_if.c 2011-04-17 15:56:46.000000000 -0400 |
18235 |
+diff -urNp linux-2.6.32.39/net/bridge/br_stp_if.c linux-2.6.32.39/net/bridge/br_stp_if.c |
18236 |
+--- linux-2.6.32.39/net/bridge/br_stp_if.c 2011-03-27 14:31:47.000000000 -0400 |
18237 |
++++ linux-2.6.32.39/net/bridge/br_stp_if.c 2011-04-17 15:56:46.000000000 -0400 |
18238 |
@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg |
18239 |
char *envp[] = { NULL }; |
18240 |
|
18241 |
@@ -60239,9 +58132,9 @@ diff -urNp linux-2.6.32.38/net/bridge/br_stp_if.c linux-2.6.32.38/net/bridge/br_ |
18242 |
printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", |
18243 |
br->dev->name, r); |
18244 |
|
18245 |
-diff -urNp linux-2.6.32.38/net/bridge/br_sysfs_if.c linux-2.6.32.38/net/bridge/br_sysfs_if.c |
18246 |
---- linux-2.6.32.38/net/bridge/br_sysfs_if.c 2011-03-27 14:31:47.000000000 -0400 |
18247 |
-+++ linux-2.6.32.38/net/bridge/br_sysfs_if.c 2011-04-17 15:56:46.000000000 -0400 |
18248 |
+diff -urNp linux-2.6.32.39/net/bridge/br_sysfs_if.c linux-2.6.32.39/net/bridge/br_sysfs_if.c |
18249 |
+--- linux-2.6.32.39/net/bridge/br_sysfs_if.c 2011-03-27 14:31:47.000000000 -0400 |
18250 |
++++ linux-2.6.32.39/net/bridge/br_sysfs_if.c 2011-04-17 15:56:46.000000000 -0400 |
18251 |
@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje |
18252 |
return ret; |
18253 |
} |
18254 |
@@ -60251,9 +58144,9 @@ diff -urNp linux-2.6.32.38/net/bridge/br_sysfs_if.c linux-2.6.32.38/net/bridge/b |
18255 |
.show = brport_show, |
18256 |
.store = brport_store, |
18257 |
}; |
18258 |
-diff -urNp linux-2.6.32.38/net/can/bcm.c linux-2.6.32.38/net/can/bcm.c |
18259 |
---- linux-2.6.32.38/net/can/bcm.c 2011-04-17 17:00:52.000000000 -0400 |
18260 |
-+++ linux-2.6.32.38/net/can/bcm.c 2011-04-17 17:04:18.000000000 -0400 |
18261 |
+diff -urNp linux-2.6.32.39/net/can/bcm.c linux-2.6.32.39/net/can/bcm.c |
18262 |
+--- linux-2.6.32.39/net/can/bcm.c 2011-04-17 17:00:52.000000000 -0400 |
18263 |
++++ linux-2.6.32.39/net/can/bcm.c 2011-04-17 17:04:18.000000000 -0400 |
18264 |
@@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file |
18265 |
struct bcm_sock *bo = bcm_sk(sk); |
18266 |
struct bcm_op *op; |
18267 |
@@ -60270,9 +58163,27 @@ diff -urNp linux-2.6.32.38/net/can/bcm.c linux-2.6.32.38/net/can/bcm.c |
18268 |
seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs); |
18269 |
seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex)); |
18270 |
seq_printf(m, " <<<\n"); |
18271 |
-diff -urNp linux-2.6.32.38/net/core/dev.c linux-2.6.32.38/net/core/dev.c |
18272 |
---- linux-2.6.32.38/net/core/dev.c 2011-04-17 17:00:52.000000000 -0400 |
18273 |
-+++ linux-2.6.32.38/net/core/dev.c 2011-04-17 17:04:18.000000000 -0400 |
18274 |
+diff -urNp linux-2.6.32.39/net/can/raw.c linux-2.6.32.39/net/can/raw.c |
18275 |
+--- linux-2.6.32.39/net/can/raw.c 2011-03-27 14:31:47.000000000 -0400 |
18276 |
++++ linux-2.6.32.39/net/can/raw.c 2011-04-22 19:38:01.000000000 -0400 |
18277 |
+@@ -280,7 +280,13 @@ static int raw_init(struct sock *sk) |
18278 |
+ static int raw_release(struct socket *sock) |
18279 |
+ { |
18280 |
+ struct sock *sk = sock->sk; |
18281 |
+- struct raw_sock *ro = raw_sk(sk); |
18282 |
++ struct raw_sock *ro; |
18283 |
++ |
18284 |
++ |
18285 |
++ if (!sk) |
18286 |
++ return 0; |
18287 |
++ |
18288 |
++ ro = raw_sk(sk); |
18289 |
+ |
18290 |
+ unregister_netdevice_notifier(&ro->notifier); |
18291 |
+ |
18292 |
+diff -urNp linux-2.6.32.39/net/core/dev.c linux-2.6.32.39/net/core/dev.c |
18293 |
+--- linux-2.6.32.39/net/core/dev.c 2011-04-17 17:00:52.000000000 -0400 |
18294 |
++++ linux-2.6.32.39/net/core/dev.c 2011-04-17 17:04:18.000000000 -0400 |
18295 |
@@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha |
18296 |
if (no_module && capable(CAP_NET_ADMIN)) |
18297 |
no_module = request_module("netdev-%s", name); |
18298 |
@@ -60306,9 +58217,9 @@ diff -urNp linux-2.6.32.38/net/core/dev.c linux-2.6.32.38/net/core/dev.c |
18299 |
{ |
18300 |
struct list_head *list = &__get_cpu_var(softnet_data).poll_list; |
18301 |
unsigned long time_limit = jiffies + 2; |
18302 |
-diff -urNp linux-2.6.32.38/net/core/flow.c linux-2.6.32.38/net/core/flow.c |
18303 |
---- linux-2.6.32.38/net/core/flow.c 2011-03-27 14:31:47.000000000 -0400 |
18304 |
-+++ linux-2.6.32.38/net/core/flow.c 2011-04-17 15:56:46.000000000 -0400 |
18305 |
+diff -urNp linux-2.6.32.39/net/core/flow.c linux-2.6.32.39/net/core/flow.c |
18306 |
+--- linux-2.6.32.39/net/core/flow.c 2011-03-27 14:31:47.000000000 -0400 |
18307 |
++++ linux-2.6.32.39/net/core/flow.c 2011-04-17 15:56:46.000000000 -0400 |
18308 |
@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( |
18309 |
|
18310 |
static u32 flow_hash_shift; |
18311 |
@@ -60336,10 +58247,10 @@ diff -urNp linux-2.6.32.38/net/core/flow.c linux-2.6.32.38/net/core/flow.c |
18312 |
|
18313 |
#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) |
18314 |
|
18315 |
-diff -urNp linux-2.6.32.38/net/core/sock.c linux-2.6.32.38/net/core/sock.c |
18316 |
---- linux-2.6.32.38/net/core/sock.c 2011-03-27 14:31:47.000000000 -0400 |
18317 |
-+++ linux-2.6.32.38/net/core/sock.c 2011-04-19 17:30:07.000000000 -0400 |
18318 |
-@@ -864,12 +864,15 @@ int sock_getsockopt(struct socket *sock, |
18319 |
+diff -urNp linux-2.6.32.39/net/core/sock.c linux-2.6.32.39/net/core/sock.c |
18320 |
+--- linux-2.6.32.39/net/core/sock.c 2011-03-27 14:31:47.000000000 -0400 |
18321 |
++++ linux-2.6.32.39/net/core/sock.c 2011-04-23 13:45:37.000000000 -0400 |
18322 |
+@@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock, |
18323 |
break; |
18324 |
|
18325 |
case SO_PEERCRED: |
18326 |
@@ -60352,42 +58263,13 @@ diff -urNp linux-2.6.32.38/net/core/sock.c linux-2.6.32.38/net/core/sock.c |
18327 |
+ if (copy_to_user(optval, &peercred, len)) |
18328 |
return -EFAULT; |
18329 |
goto lenout; |
18330 |
-- |
18331 |
+ } |
18332 |
+ |
18333 |
case SO_PEERNAME: |
18334 |
{ |
18335 |
- char address[128]; |
18336 |
-diff -urNp linux-2.6.32.38/net/dccp/ccids/ccid3.c linux-2.6.32.38/net/dccp/ccids/ccid3.c |
18337 |
---- linux-2.6.32.38/net/dccp/ccids/ccid3.c 2011-03-27 14:31:47.000000000 -0400 |
18338 |
-+++ linux-2.6.32.38/net/dccp/ccids/ccid3.c 2011-04-17 15:56:46.000000000 -0400 |
18339 |
-@@ -41,7 +41,7 @@ |
18340 |
- static int ccid3_debug; |
18341 |
- #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) |
18342 |
- #else |
18343 |
--#define ccid3_pr_debug(format, a...) |
18344 |
-+#define ccid3_pr_debug(format, a...) do {} while (0) |
18345 |
- #endif |
18346 |
- |
18347 |
- /* |
18348 |
-diff -urNp linux-2.6.32.38/net/dccp/dccp.h linux-2.6.32.38/net/dccp/dccp.h |
18349 |
---- linux-2.6.32.38/net/dccp/dccp.h 2011-03-27 14:31:47.000000000 -0400 |
18350 |
-+++ linux-2.6.32.38/net/dccp/dccp.h 2011-04-17 15:56:46.000000000 -0400 |
18351 |
-@@ -44,9 +44,9 @@ extern int dccp_debug; |
18352 |
- #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) |
18353 |
- #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) |
18354 |
- #else |
18355 |
--#define dccp_pr_debug(format, a...) |
18356 |
--#define dccp_pr_debug_cat(format, a...) |
18357 |
--#define dccp_debug(format, a...) |
18358 |
-+#define dccp_pr_debug(format, a...) do {} while (0) |
18359 |
-+#define dccp_pr_debug_cat(format, a...) do {} while (0) |
18360 |
-+#define dccp_debug(format, a...) do {} while (0) |
18361 |
- #endif |
18362 |
- |
18363 |
- extern struct inet_hashinfo dccp_hashinfo; |
18364 |
-diff -urNp linux-2.6.32.38/net/decnet/sysctl_net_decnet.c linux-2.6.32.38/net/decnet/sysctl_net_decnet.c |
18365 |
---- linux-2.6.32.38/net/decnet/sysctl_net_decnet.c 2011-03-27 14:31:47.000000000 -0400 |
18366 |
-+++ linux-2.6.32.38/net/decnet/sysctl_net_decnet.c 2011-04-17 15:56:46.000000000 -0400 |
18367 |
+diff -urNp linux-2.6.32.39/net/decnet/sysctl_net_decnet.c linux-2.6.32.39/net/decnet/sysctl_net_decnet.c |
18368 |
+--- linux-2.6.32.39/net/decnet/sysctl_net_decnet.c 2011-03-27 14:31:47.000000000 -0400 |
18369 |
++++ linux-2.6.32.39/net/decnet/sysctl_net_decnet.c 2011-04-17 15:56:46.000000000 -0400 |
18370 |
@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t |
18371 |
|
18372 |
if (len > *lenp) len = *lenp; |
18373 |
@@ -60406,9 +58288,9 @@ diff -urNp linux-2.6.32.38/net/decnet/sysctl_net_decnet.c linux-2.6.32.38/net/de |
18374 |
return -EFAULT; |
18375 |
|
18376 |
*lenp = len; |
18377 |
-diff -urNp linux-2.6.32.38/net/econet/Kconfig linux-2.6.32.38/net/econet/Kconfig |
18378 |
---- linux-2.6.32.38/net/econet/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
18379 |
-+++ linux-2.6.32.38/net/econet/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
18380 |
+diff -urNp linux-2.6.32.39/net/econet/Kconfig linux-2.6.32.39/net/econet/Kconfig |
18381 |
+--- linux-2.6.32.39/net/econet/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
18382 |
++++ linux-2.6.32.39/net/econet/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
18383 |
@@ -4,7 +4,7 @@ |
18384 |
|
18385 |
config ECONET |
18386 |
@@ -60418,9 +58300,9 @@ diff -urNp linux-2.6.32.38/net/econet/Kconfig linux-2.6.32.38/net/econet/Kconfig |
18387 |
---help--- |
18388 |
Econet is a fairly old and slow networking protocol mainly used by |
18389 |
Acorn computers to access file and print servers. It uses native |
18390 |
-diff -urNp linux-2.6.32.38/net/ipv4/inet_diag.c linux-2.6.32.38/net/ipv4/inet_diag.c |
18391 |
---- linux-2.6.32.38/net/ipv4/inet_diag.c 2011-04-17 17:00:52.000000000 -0400 |
18392 |
-+++ linux-2.6.32.38/net/ipv4/inet_diag.c 2011-04-17 17:04:18.000000000 -0400 |
18393 |
+diff -urNp linux-2.6.32.39/net/ipv4/inet_diag.c linux-2.6.32.39/net/ipv4/inet_diag.c |
18394 |
+--- linux-2.6.32.39/net/ipv4/inet_diag.c 2011-04-17 17:00:52.000000000 -0400 |
18395 |
++++ linux-2.6.32.39/net/ipv4/inet_diag.c 2011-04-17 17:04:18.000000000 -0400 |
18396 |
@@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc |
18397 |
r->idiag_retrans = 0; |
18398 |
|
18399 |
@@ -60481,9 +58363,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/inet_diag.c linux-2.6.32.38/net/ipv4/inet_di |
18400 |
|
18401 |
tmo = req->expires - jiffies; |
18402 |
if (tmo < 0) |
18403 |
-diff -urNp linux-2.6.32.38/net/ipv4/inet_hashtables.c linux-2.6.32.38/net/ipv4/inet_hashtables.c |
18404 |
---- linux-2.6.32.38/net/ipv4/inet_hashtables.c 2011-03-27 14:31:47.000000000 -0400 |
18405 |
-+++ linux-2.6.32.38/net/ipv4/inet_hashtables.c 2011-04-17 15:56:46.000000000 -0400 |
18406 |
+diff -urNp linux-2.6.32.39/net/ipv4/inet_hashtables.c linux-2.6.32.39/net/ipv4/inet_hashtables.c |
18407 |
+--- linux-2.6.32.39/net/ipv4/inet_hashtables.c 2011-03-27 14:31:47.000000000 -0400 |
18408 |
++++ linux-2.6.32.39/net/ipv4/inet_hashtables.c 2011-04-17 15:56:46.000000000 -0400 |
18409 |
@@ -18,11 +18,14 @@ |
18410 |
#include <linux/sched.h> |
18411 |
#include <linux/slab.h> |
18412 |
@@ -60508,9 +58390,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/inet_hashtables.c linux-2.6.32.38/net/ipv4/i |
18413 |
if (tw) { |
18414 |
inet_twsk_deschedule(tw, death_row); |
18415 |
inet_twsk_put(tw); |
18416 |
-diff -urNp linux-2.6.32.38/net/ipv4/inetpeer.c linux-2.6.32.38/net/ipv4/inetpeer.c |
18417 |
---- linux-2.6.32.38/net/ipv4/inetpeer.c 2011-03-27 14:31:47.000000000 -0400 |
18418 |
-+++ linux-2.6.32.38/net/ipv4/inetpeer.c 2011-04-17 15:56:46.000000000 -0400 |
18419 |
+diff -urNp linux-2.6.32.39/net/ipv4/inetpeer.c linux-2.6.32.39/net/ipv4/inetpeer.c |
18420 |
+--- linux-2.6.32.39/net/ipv4/inetpeer.c 2011-03-27 14:31:47.000000000 -0400 |
18421 |
++++ linux-2.6.32.39/net/ipv4/inetpeer.c 2011-04-17 15:56:46.000000000 -0400 |
18422 |
@@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da |
18423 |
return NULL; |
18424 |
n->v4daddr = daddr; |
18425 |
@@ -60520,9 +58402,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/inetpeer.c linux-2.6.32.38/net/ipv4/inetpeer |
18426 |
n->ip_id_count = secure_ip_id(daddr); |
18427 |
n->tcp_ts_stamp = 0; |
18428 |
|
18429 |
-diff -urNp linux-2.6.32.38/net/ipv4/ip_fragment.c linux-2.6.32.38/net/ipv4/ip_fragment.c |
18430 |
---- linux-2.6.32.38/net/ipv4/ip_fragment.c 2011-03-27 14:31:47.000000000 -0400 |
18431 |
-+++ linux-2.6.32.38/net/ipv4/ip_fragment.c 2011-04-17 15:56:46.000000000 -0400 |
18432 |
+diff -urNp linux-2.6.32.39/net/ipv4/ip_fragment.c linux-2.6.32.39/net/ipv4/ip_fragment.c |
18433 |
+--- linux-2.6.32.39/net/ipv4/ip_fragment.c 2011-03-27 14:31:47.000000000 -0400 |
18434 |
++++ linux-2.6.32.39/net/ipv4/ip_fragment.c 2011-04-17 15:56:46.000000000 -0400 |
18435 |
@@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct |
18436 |
return 0; |
18437 |
|
18438 |
@@ -60532,9 +58414,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/ip_fragment.c linux-2.6.32.38/net/ipv4/ip_fr |
18439 |
qp->rid = end; |
18440 |
|
18441 |
rc = qp->q.fragments && (end - start) > max; |
18442 |
-diff -urNp linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c |
18443 |
---- linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:00:52.000000000 -0400 |
18444 |
-+++ linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:04:18.000000000 -0400 |
18445 |
+diff -urNp linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c |
18446 |
+--- linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:00:52.000000000 -0400 |
18447 |
++++ linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:04:18.000000000 -0400 |
18448 |
@@ -934,6 +934,7 @@ static int get_info(struct net *net, voi |
18449 |
private = &tmp; |
18450 |
} |
18451 |
@@ -60543,9 +58425,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/netfilter/arp_tables.c linux-2.6.32.38/net/i |
18452 |
info.valid_hooks = t->valid_hooks; |
18453 |
memcpy(info.hook_entry, private->hook_entry, |
18454 |
sizeof(info.hook_entry)); |
18455 |
-diff -urNp linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c |
18456 |
---- linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:00:52.000000000 -0400 |
18457 |
-+++ linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:04:18.000000000 -0400 |
18458 |
+diff -urNp linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c |
18459 |
+--- linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:00:52.000000000 -0400 |
18460 |
++++ linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:04:18.000000000 -0400 |
18461 |
@@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi |
18462 |
private = &tmp; |
18463 |
} |
18464 |
@@ -60554,9 +58436,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/netfilter/ip_tables.c linux-2.6.32.38/net/ip |
18465 |
info.valid_hooks = t->valid_hooks; |
18466 |
memcpy(info.hook_entry, private->hook_entry, |
18467 |
sizeof(info.hook_entry)); |
18468 |
-diff -urNp linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c |
18469 |
---- linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-27 14:31:47.000000000 -0400 |
18470 |
-+++ linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:56:46.000000000 -0400 |
18471 |
+diff -urNp linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c |
18472 |
+--- linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-27 14:31:47.000000000 -0400 |
18473 |
++++ linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:56:46.000000000 -0400 |
18474 |
@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( |
18475 |
|
18476 |
*len = 0; |
18477 |
@@ -60566,9 +58448,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.3 |
18478 |
if (*octets == NULL) { |
18479 |
if (net_ratelimit()) |
18480 |
printk("OOM in bsalg (%d)\n", __LINE__); |
18481 |
-diff -urNp linux-2.6.32.38/net/ipv4/raw.c linux-2.6.32.38/net/ipv4/raw.c |
18482 |
---- linux-2.6.32.38/net/ipv4/raw.c 2011-03-27 14:31:47.000000000 -0400 |
18483 |
-+++ linux-2.6.32.38/net/ipv4/raw.c 2011-04-17 15:56:46.000000000 -0400 |
18484 |
+diff -urNp linux-2.6.32.39/net/ipv4/raw.c linux-2.6.32.39/net/ipv4/raw.c |
18485 |
+--- linux-2.6.32.39/net/ipv4/raw.c 2011-03-27 14:31:47.000000000 -0400 |
18486 |
++++ linux-2.6.32.39/net/ipv4/raw.c 2011-04-17 15:56:46.000000000 -0400 |
18487 |
@@ -724,15 +724,22 @@ static int raw_init(struct sock *sk) |
18488 |
|
18489 |
static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen) |
18490 |
@@ -60604,9 +58486,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/raw.c linux-2.6.32.38/net/ipv4/raw.c |
18491 |
goto out; |
18492 |
ret = 0; |
18493 |
out: return ret; |
18494 |
-diff -urNp linux-2.6.32.38/net/ipv4/tcp_ipv4.c linux-2.6.32.38/net/ipv4/tcp_ipv4.c |
18495 |
---- linux-2.6.32.38/net/ipv4/tcp_ipv4.c 2011-03-27 14:31:47.000000000 -0400 |
18496 |
-+++ linux-2.6.32.38/net/ipv4/tcp_ipv4.c 2011-04-17 15:56:46.000000000 -0400 |
18497 |
+diff -urNp linux-2.6.32.39/net/ipv4/tcp_ipv4.c linux-2.6.32.39/net/ipv4/tcp_ipv4.c |
18498 |
+--- linux-2.6.32.39/net/ipv4/tcp_ipv4.c 2011-03-27 14:31:47.000000000 -0400 |
18499 |
++++ linux-2.6.32.39/net/ipv4/tcp_ipv4.c 2011-04-17 15:56:46.000000000 -0400 |
18500 |
@@ -84,6 +84,9 @@ |
18501 |
int sysctl_tcp_tw_reuse __read_mostly; |
18502 |
int sysctl_tcp_low_latency __read_mostly; |
18503 |
@@ -60702,9 +58584,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_ipv4.c linux-2.6.32.38/net/ipv4/tcp_ipv4 |
18504 |
} |
18505 |
|
18506 |
#define TMPSZ 150 |
18507 |
-diff -urNp linux-2.6.32.38/net/ipv4/tcp_minisocks.c linux-2.6.32.38/net/ipv4/tcp_minisocks.c |
18508 |
---- linux-2.6.32.38/net/ipv4/tcp_minisocks.c 2011-03-27 14:31:47.000000000 -0400 |
18509 |
-+++ linux-2.6.32.38/net/ipv4/tcp_minisocks.c 2011-04-17 15:56:46.000000000 -0400 |
18510 |
+diff -urNp linux-2.6.32.39/net/ipv4/tcp_minisocks.c linux-2.6.32.39/net/ipv4/tcp_minisocks.c |
18511 |
+--- linux-2.6.32.39/net/ipv4/tcp_minisocks.c 2011-03-27 14:31:47.000000000 -0400 |
18512 |
++++ linux-2.6.32.39/net/ipv4/tcp_minisocks.c 2011-04-17 15:56:46.000000000 -0400 |
18513 |
@@ -26,6 +26,10 @@ |
18514 |
#include <net/inet_common.h> |
18515 |
#include <net/xfrm.h> |
18516 |
@@ -60727,9 +58609,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_minisocks.c linux-2.6.32.38/net/ipv4/tcp |
18517 |
if (!(flg & TCP_FLAG_RST)) |
18518 |
req->rsk_ops->send_reset(sk, skb); |
18519 |
|
18520 |
-diff -urNp linux-2.6.32.38/net/ipv4/tcp_probe.c linux-2.6.32.38/net/ipv4/tcp_probe.c |
18521 |
---- linux-2.6.32.38/net/ipv4/tcp_probe.c 2011-03-27 14:31:47.000000000 -0400 |
18522 |
-+++ linux-2.6.32.38/net/ipv4/tcp_probe.c 2011-04-17 15:56:46.000000000 -0400 |
18523 |
+diff -urNp linux-2.6.32.39/net/ipv4/tcp_probe.c linux-2.6.32.39/net/ipv4/tcp_probe.c |
18524 |
+--- linux-2.6.32.39/net/ipv4/tcp_probe.c 2011-03-27 14:31:47.000000000 -0400 |
18525 |
++++ linux-2.6.32.39/net/ipv4/tcp_probe.c 2011-04-17 15:56:46.000000000 -0400 |
18526 |
@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file |
18527 |
if (cnt + width >= len) |
18528 |
break; |
18529 |
@@ -60739,9 +58621,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_probe.c linux-2.6.32.38/net/ipv4/tcp_pro |
18530 |
return -EFAULT; |
18531 |
cnt += width; |
18532 |
} |
18533 |
-diff -urNp linux-2.6.32.38/net/ipv4/tcp_timer.c linux-2.6.32.38/net/ipv4/tcp_timer.c |
18534 |
---- linux-2.6.32.38/net/ipv4/tcp_timer.c 2011-03-27 14:31:47.000000000 -0400 |
18535 |
-+++ linux-2.6.32.38/net/ipv4/tcp_timer.c 2011-04-17 15:56:46.000000000 -0400 |
18536 |
+diff -urNp linux-2.6.32.39/net/ipv4/tcp_timer.c linux-2.6.32.39/net/ipv4/tcp_timer.c |
18537 |
+--- linux-2.6.32.39/net/ipv4/tcp_timer.c 2011-03-27 14:31:47.000000000 -0400 |
18538 |
++++ linux-2.6.32.39/net/ipv4/tcp_timer.c 2011-04-17 15:56:46.000000000 -0400 |
18539 |
@@ -21,6 +21,10 @@ |
18540 |
#include <linux/module.h> |
18541 |
#include <net/tcp.h> |
18542 |
@@ -60767,9 +58649,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/tcp_timer.c linux-2.6.32.38/net/ipv4/tcp_tim |
18543 |
if (retransmits_timed_out(sk, retry_until)) { |
18544 |
/* Has it gone just too far? */ |
18545 |
tcp_write_err(sk); |
18546 |
-diff -urNp linux-2.6.32.38/net/ipv4/udp.c linux-2.6.32.38/net/ipv4/udp.c |
18547 |
---- linux-2.6.32.38/net/ipv4/udp.c 2011-03-27 14:31:47.000000000 -0400 |
18548 |
-+++ linux-2.6.32.38/net/ipv4/udp.c 2011-04-17 15:56:46.000000000 -0400 |
18549 |
+diff -urNp linux-2.6.32.39/net/ipv4/udp.c linux-2.6.32.39/net/ipv4/udp.c |
18550 |
+--- linux-2.6.32.39/net/ipv4/udp.c 2011-03-27 14:31:47.000000000 -0400 |
18551 |
++++ linux-2.6.32.39/net/ipv4/udp.c 2011-04-17 15:56:46.000000000 -0400 |
18552 |
@@ -86,6 +86,7 @@ |
18553 |
#include <linux/types.h> |
18554 |
#include <linux/fcntl.h> |
18555 |
@@ -60853,21 +58735,9 @@ diff -urNp linux-2.6.32.38/net/ipv4/udp.c linux-2.6.32.38/net/ipv4/udp.c |
18556 |
atomic_read(&sp->sk_drops), len); |
18557 |
} |
18558 |
|
18559 |
-diff -urNp linux-2.6.32.38/net/ipv6/exthdrs.c linux-2.6.32.38/net/ipv6/exthdrs.c |
18560 |
---- linux-2.6.32.38/net/ipv6/exthdrs.c 2011-03-27 14:31:47.000000000 -0400 |
18561 |
-+++ linux-2.6.32.38/net/ipv6/exthdrs.c 2011-04-17 15:56:46.000000000 -0400 |
18562 |
-@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt |
18563 |
- .type = IPV6_TLV_JUMBO, |
18564 |
- .func = ipv6_hop_jumbo, |
18565 |
- }, |
18566 |
-- { -1, } |
18567 |
-+ { -1, NULL } |
18568 |
- }; |
18569 |
- |
18570 |
- int ipv6_parse_hopopts(struct sk_buff *skb) |
18571 |
-diff -urNp linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c |
18572 |
---- linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:00:52.000000000 -0400 |
18573 |
-+++ linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:04:18.000000000 -0400 |
18574 |
+diff -urNp linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c |
18575 |
+--- linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:00:52.000000000 -0400 |
18576 |
++++ linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:04:18.000000000 -0400 |
18577 |
@@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi |
18578 |
private = &tmp; |
18579 |
} |
18580 |
@@ -60876,9 +58746,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.38/net/i |
18581 |
info.valid_hooks = t->valid_hooks; |
18582 |
memcpy(info.hook_entry, private->hook_entry, |
18583 |
sizeof(info.hook_entry)); |
18584 |
-diff -urNp linux-2.6.32.38/net/ipv6/raw.c linux-2.6.32.38/net/ipv6/raw.c |
18585 |
---- linux-2.6.32.38/net/ipv6/raw.c 2011-03-27 14:31:47.000000000 -0400 |
18586 |
-+++ linux-2.6.32.38/net/ipv6/raw.c 2011-04-17 15:56:46.000000000 -0400 |
18587 |
+diff -urNp linux-2.6.32.39/net/ipv6/raw.c linux-2.6.32.39/net/ipv6/raw.c |
18588 |
+--- linux-2.6.32.39/net/ipv6/raw.c 2011-03-27 14:31:47.000000000 -0400 |
18589 |
++++ linux-2.6.32.39/net/ipv6/raw.c 2011-04-17 15:56:46.000000000 -0400 |
18590 |
@@ -600,7 +600,7 @@ out: |
18591 |
return err; |
18592 |
} |
18593 |
@@ -60940,9 +58810,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/raw.c linux-2.6.32.38/net/ipv6/raw.c |
18594 |
} |
18595 |
|
18596 |
static int raw6_seq_show(struct seq_file *seq, void *v) |
18597 |
-diff -urNp linux-2.6.32.38/net/ipv6/tcp_ipv6.c linux-2.6.32.38/net/ipv6/tcp_ipv6.c |
18598 |
---- linux-2.6.32.38/net/ipv6/tcp_ipv6.c 2011-03-27 14:31:47.000000000 -0400 |
18599 |
-+++ linux-2.6.32.38/net/ipv6/tcp_ipv6.c 2011-04-17 15:56:46.000000000 -0400 |
18600 |
+diff -urNp linux-2.6.32.39/net/ipv6/tcp_ipv6.c linux-2.6.32.39/net/ipv6/tcp_ipv6.c |
18601 |
+--- linux-2.6.32.39/net/ipv6/tcp_ipv6.c 2011-03-27 14:31:47.000000000 -0400 |
18602 |
++++ linux-2.6.32.39/net/ipv6/tcp_ipv6.c 2011-04-17 15:56:46.000000000 -0400 |
18603 |
@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 |
18604 |
} |
18605 |
#endif |
18606 |
@@ -61042,9 +58912,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/tcp_ipv6.c linux-2.6.32.38/net/ipv6/tcp_ipv6 |
18607 |
} |
18608 |
|
18609 |
static int tcp6_seq_show(struct seq_file *seq, void *v) |
18610 |
-diff -urNp linux-2.6.32.38/net/ipv6/udp.c linux-2.6.32.38/net/ipv6/udp.c |
18611 |
---- linux-2.6.32.38/net/ipv6/udp.c 2011-03-27 14:31:47.000000000 -0400 |
18612 |
-+++ linux-2.6.32.38/net/ipv6/udp.c 2011-04-17 15:56:46.000000000 -0400 |
18613 |
+diff -urNp linux-2.6.32.39/net/ipv6/udp.c linux-2.6.32.39/net/ipv6/udp.c |
18614 |
+--- linux-2.6.32.39/net/ipv6/udp.c 2011-03-27 14:31:47.000000000 -0400 |
18615 |
++++ linux-2.6.32.39/net/ipv6/udp.c 2011-04-17 15:56:46.000000000 -0400 |
18616 |
@@ -49,6 +49,10 @@ |
18617 |
#include <linux/seq_file.h> |
18618 |
#include "udp_impl.h" |
18619 |
@@ -61080,9 +58950,9 @@ diff -urNp linux-2.6.32.38/net/ipv6/udp.c linux-2.6.32.38/net/ipv6/udp.c |
18620 |
atomic_read(&sp->sk_drops)); |
18621 |
} |
18622 |
|
18623 |
-diff -urNp linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c |
18624 |
---- linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c 2011-03-27 14:31:47.000000000 -0400 |
18625 |
-+++ linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:56:46.000000000 -0400 |
18626 |
+diff -urNp linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c |
18627 |
+--- linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c 2011-03-27 14:31:47.000000000 -0400 |
18628 |
++++ linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:56:46.000000000 -0400 |
18629 |
@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st |
18630 |
add_wait_queue(&self->open_wait, &wait); |
18631 |
|
18632 |
@@ -61205,9 +59075,9 @@ diff -urNp linux-2.6.32.38/net/irda/ircomm/ircomm_tty.c linux-2.6.32.38/net/irda |
18633 |
seq_printf(m, "Max data size: %d\n", self->max_data_size); |
18634 |
seq_printf(m, "Max header size: %d\n", self->max_header_size); |
18635 |
|
18636 |
-diff -urNp linux-2.6.32.38/net/key/af_key.c linux-2.6.32.38/net/key/af_key.c |
18637 |
---- linux-2.6.32.38/net/key/af_key.c 2011-03-27 14:31:47.000000000 -0400 |
18638 |
-+++ linux-2.6.32.38/net/key/af_key.c 2011-04-17 15:56:46.000000000 -0400 |
18639 |
+diff -urNp linux-2.6.32.39/net/key/af_key.c linux-2.6.32.39/net/key/af_key.c |
18640 |
+--- linux-2.6.32.39/net/key/af_key.c 2011-03-27 14:31:47.000000000 -0400 |
18641 |
++++ linux-2.6.32.39/net/key/af_key.c 2011-04-17 15:56:46.000000000 -0400 |
18642 |
@@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil |
18643 |
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); |
18644 |
else |
18645 |
@@ -61220,9 +59090,9 @@ diff -urNp linux-2.6.32.38/net/key/af_key.c linux-2.6.32.38/net/key/af_key.c |
18646 |
atomic_read(&s->sk_refcnt), |
18647 |
sk_rmem_alloc_get(s), |
18648 |
sk_wmem_alloc_get(s), |
18649 |
-diff -urNp linux-2.6.32.38/net/mac80211/cfg.c linux-2.6.32.38/net/mac80211/cfg.c |
18650 |
---- linux-2.6.32.38/net/mac80211/cfg.c 2011-03-27 14:31:47.000000000 -0400 |
18651 |
-+++ linux-2.6.32.38/net/mac80211/cfg.c 2011-04-17 15:56:46.000000000 -0400 |
18652 |
+diff -urNp linux-2.6.32.39/net/mac80211/cfg.c linux-2.6.32.39/net/mac80211/cfg.c |
18653 |
+--- linux-2.6.32.39/net/mac80211/cfg.c 2011-03-27 14:31:47.000000000 -0400 |
18654 |
++++ linux-2.6.32.39/net/mac80211/cfg.c 2011-04-17 15:56:46.000000000 -0400 |
18655 |
@@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(st |
18656 |
return err; |
18657 |
} |
18658 |
@@ -61232,9 +59102,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/cfg.c linux-2.6.32.38/net/mac80211/cfg.c |
18659 |
.add_virtual_intf = ieee80211_add_iface, |
18660 |
.del_virtual_intf = ieee80211_del_iface, |
18661 |
.change_virtual_intf = ieee80211_change_iface, |
18662 |
-diff -urNp linux-2.6.32.38/net/mac80211/cfg.h linux-2.6.32.38/net/mac80211/cfg.h |
18663 |
---- linux-2.6.32.38/net/mac80211/cfg.h 2011-03-27 14:31:47.000000000 -0400 |
18664 |
-+++ linux-2.6.32.38/net/mac80211/cfg.h 2011-04-17 15:56:46.000000000 -0400 |
18665 |
+diff -urNp linux-2.6.32.39/net/mac80211/cfg.h linux-2.6.32.39/net/mac80211/cfg.h |
18666 |
+--- linux-2.6.32.39/net/mac80211/cfg.h 2011-03-27 14:31:47.000000000 -0400 |
18667 |
++++ linux-2.6.32.39/net/mac80211/cfg.h 2011-04-17 15:56:46.000000000 -0400 |
18668 |
@@ -4,6 +4,6 @@ |
18669 |
#ifndef __CFG_H |
18670 |
#define __CFG_H |
18671 |
@@ -61243,9 +59113,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/cfg.h linux-2.6.32.38/net/mac80211/cfg.h |
18672 |
+extern const struct cfg80211_ops mac80211_config_ops; |
18673 |
|
18674 |
#endif /* __CFG_H */ |
18675 |
-diff -urNp linux-2.6.32.38/net/mac80211/debugfs_key.c linux-2.6.32.38/net/mac80211/debugfs_key.c |
18676 |
---- linux-2.6.32.38/net/mac80211/debugfs_key.c 2011-03-27 14:31:47.000000000 -0400 |
18677 |
-+++ linux-2.6.32.38/net/mac80211/debugfs_key.c 2011-04-17 15:56:46.000000000 -0400 |
18678 |
+diff -urNp linux-2.6.32.39/net/mac80211/debugfs_key.c linux-2.6.32.39/net/mac80211/debugfs_key.c |
18679 |
+--- linux-2.6.32.39/net/mac80211/debugfs_key.c 2011-03-27 14:31:47.000000000 -0400 |
18680 |
++++ linux-2.6.32.39/net/mac80211/debugfs_key.c 2011-04-17 15:56:46.000000000 -0400 |
18681 |
@@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file |
18682 |
size_t count, loff_t *ppos) |
18683 |
{ |
18684 |
@@ -61261,9 +59131,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/debugfs_key.c linux-2.6.32.38/net/mac802 |
18685 |
|
18686 |
for (i = 0; i < key->conf.keylen; i++) |
18687 |
p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]); |
18688 |
-diff -urNp linux-2.6.32.38/net/mac80211/ieee80211_i.h linux-2.6.32.38/net/mac80211/ieee80211_i.h |
18689 |
---- linux-2.6.32.38/net/mac80211/ieee80211_i.h 2011-03-27 14:31:47.000000000 -0400 |
18690 |
-+++ linux-2.6.32.38/net/mac80211/ieee80211_i.h 2011-04-17 15:56:46.000000000 -0400 |
18691 |
+diff -urNp linux-2.6.32.39/net/mac80211/ieee80211_i.h linux-2.6.32.39/net/mac80211/ieee80211_i.h |
18692 |
+--- linux-2.6.32.39/net/mac80211/ieee80211_i.h 2011-03-27 14:31:47.000000000 -0400 |
18693 |
++++ linux-2.6.32.39/net/mac80211/ieee80211_i.h 2011-04-17 15:56:46.000000000 -0400 |
18694 |
@@ -25,6 +25,7 @@ |
18695 |
#include <linux/etherdevice.h> |
18696 |
#include <net/cfg80211.h> |
18697 |
@@ -61281,9 +59151,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/ieee80211_i.h linux-2.6.32.38/net/mac802 |
18698 |
int monitors, cooked_mntrs; |
18699 |
/* number of interfaces with corresponding FIF_ flags */ |
18700 |
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; |
18701 |
-diff -urNp linux-2.6.32.38/net/mac80211/iface.c linux-2.6.32.38/net/mac80211/iface.c |
18702 |
---- linux-2.6.32.38/net/mac80211/iface.c 2011-03-27 14:31:47.000000000 -0400 |
18703 |
-+++ linux-2.6.32.38/net/mac80211/iface.c 2011-04-17 15:56:46.000000000 -0400 |
18704 |
+diff -urNp linux-2.6.32.39/net/mac80211/iface.c linux-2.6.32.39/net/mac80211/iface.c |
18705 |
+--- linux-2.6.32.39/net/mac80211/iface.c 2011-03-27 14:31:47.000000000 -0400 |
18706 |
++++ linux-2.6.32.39/net/mac80211/iface.c 2011-04-17 15:56:46.000000000 -0400 |
18707 |
@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev |
18708 |
break; |
18709 |
} |
18710 |
@@ -61338,9 +59208,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/iface.c linux-2.6.32.38/net/mac80211/ifa |
18711 |
ieee80211_clear_tx_pending(local); |
18712 |
ieee80211_stop_device(local); |
18713 |
|
18714 |
-diff -urNp linux-2.6.32.38/net/mac80211/main.c linux-2.6.32.38/net/mac80211/main.c |
18715 |
---- linux-2.6.32.38/net/mac80211/main.c 2011-03-27 14:31:47.000000000 -0400 |
18716 |
-+++ linux-2.6.32.38/net/mac80211/main.c 2011-04-17 15:56:46.000000000 -0400 |
18717 |
+diff -urNp linux-2.6.32.39/net/mac80211/main.c linux-2.6.32.39/net/mac80211/main.c |
18718 |
+--- linux-2.6.32.39/net/mac80211/main.c 2011-03-27 14:31:47.000000000 -0400 |
18719 |
++++ linux-2.6.32.39/net/mac80211/main.c 2011-04-17 15:56:46.000000000 -0400 |
18720 |
@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 |
18721 |
local->hw.conf.power_level = power; |
18722 |
} |
18723 |
@@ -61350,9 +59220,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/main.c linux-2.6.32.38/net/mac80211/main |
18724 |
ret = drv_config(local, changed); |
18725 |
/* |
18726 |
* Goal: |
18727 |
-diff -urNp linux-2.6.32.38/net/mac80211/pm.c linux-2.6.32.38/net/mac80211/pm.c |
18728 |
---- linux-2.6.32.38/net/mac80211/pm.c 2011-03-27 14:31:47.000000000 -0400 |
18729 |
-+++ linux-2.6.32.38/net/mac80211/pm.c 2011-04-17 15:56:46.000000000 -0400 |
18730 |
+diff -urNp linux-2.6.32.39/net/mac80211/pm.c linux-2.6.32.39/net/mac80211/pm.c |
18731 |
+--- linux-2.6.32.39/net/mac80211/pm.c 2011-03-27 14:31:47.000000000 -0400 |
18732 |
++++ linux-2.6.32.39/net/mac80211/pm.c 2011-04-17 15:56:46.000000000 -0400 |
18733 |
@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 |
18734 |
} |
18735 |
|
18736 |
@@ -61362,9 +59232,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/pm.c linux-2.6.32.38/net/mac80211/pm.c |
18737 |
ieee80211_stop_device(local); |
18738 |
|
18739 |
local->suspended = true; |
18740 |
-diff -urNp linux-2.6.32.38/net/mac80211/rate.c linux-2.6.32.38/net/mac80211/rate.c |
18741 |
---- linux-2.6.32.38/net/mac80211/rate.c 2011-03-27 14:31:47.000000000 -0400 |
18742 |
-+++ linux-2.6.32.38/net/mac80211/rate.c 2011-04-17 15:56:46.000000000 -0400 |
18743 |
+diff -urNp linux-2.6.32.39/net/mac80211/rate.c linux-2.6.32.39/net/mac80211/rate.c |
18744 |
+--- linux-2.6.32.39/net/mac80211/rate.c 2011-03-27 14:31:47.000000000 -0400 |
18745 |
++++ linux-2.6.32.39/net/mac80211/rate.c 2011-04-17 15:56:46.000000000 -0400 |
18746 |
@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct |
18747 |
struct rate_control_ref *ref, *old; |
18748 |
|
18749 |
@@ -61374,9 +59244,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/rate.c linux-2.6.32.38/net/mac80211/rate |
18750 |
return -EBUSY; |
18751 |
|
18752 |
ref = rate_control_alloc(name, local); |
18753 |
-diff -urNp linux-2.6.32.38/net/mac80211/tx.c linux-2.6.32.38/net/mac80211/tx.c |
18754 |
---- linux-2.6.32.38/net/mac80211/tx.c 2011-03-27 14:31:47.000000000 -0400 |
18755 |
-+++ linux-2.6.32.38/net/mac80211/tx.c 2011-04-17 15:56:46.000000000 -0400 |
18756 |
+diff -urNp linux-2.6.32.39/net/mac80211/tx.c linux-2.6.32.39/net/mac80211/tx.c |
18757 |
+--- linux-2.6.32.39/net/mac80211/tx.c 2011-03-27 14:31:47.000000000 -0400 |
18758 |
++++ linux-2.6.32.39/net/mac80211/tx.c 2011-04-17 15:56:46.000000000 -0400 |
18759 |
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct |
18760 |
return cpu_to_le16(dur); |
18761 |
} |
18762 |
@@ -61386,9 +59256,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/tx.c linux-2.6.32.38/net/mac80211/tx.c |
18763 |
struct net_device *dev) |
18764 |
{ |
18765 |
return local == wdev_priv(dev->ieee80211_ptr); |
18766 |
-diff -urNp linux-2.6.32.38/net/mac80211/util.c linux-2.6.32.38/net/mac80211/util.c |
18767 |
---- linux-2.6.32.38/net/mac80211/util.c 2011-03-27 14:31:47.000000000 -0400 |
18768 |
-+++ linux-2.6.32.38/net/mac80211/util.c 2011-04-17 15:56:46.000000000 -0400 |
18769 |
+diff -urNp linux-2.6.32.39/net/mac80211/util.c linux-2.6.32.39/net/mac80211/util.c |
18770 |
+--- linux-2.6.32.39/net/mac80211/util.c 2011-03-27 14:31:47.000000000 -0400 |
18771 |
++++ linux-2.6.32.39/net/mac80211/util.c 2011-04-17 15:56:46.000000000 -0400 |
18772 |
@@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_ |
18773 |
local->resuming = true; |
18774 |
|
18775 |
@@ -61398,9 +59268,9 @@ diff -urNp linux-2.6.32.38/net/mac80211/util.c linux-2.6.32.38/net/mac80211/util |
18776 |
/* |
18777 |
* Upon resume hardware can sometimes be goofy due to |
18778 |
* various platform / driver / bus issues, so restarting |
18779 |
-diff -urNp linux-2.6.32.38/net/netfilter/Kconfig linux-2.6.32.38/net/netfilter/Kconfig |
18780 |
---- linux-2.6.32.38/net/netfilter/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
18781 |
-+++ linux-2.6.32.38/net/netfilter/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
18782 |
+diff -urNp linux-2.6.32.39/net/netfilter/Kconfig linux-2.6.32.39/net/netfilter/Kconfig |
18783 |
+--- linux-2.6.32.39/net/netfilter/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
18784 |
++++ linux-2.6.32.39/net/netfilter/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
18785 |
@@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP |
18786 |
|
18787 |
To compile it as a module, choose M here. If unsure, say N. |
18788 |
@@ -61418,9 +59288,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/Kconfig linux-2.6.32.38/net/netfilter/K |
18789 |
config NETFILTER_XT_MATCH_HASHLIMIT |
18790 |
tristate '"hashlimit" match support' |
18791 |
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) |
18792 |
-diff -urNp linux-2.6.32.38/net/netfilter/Makefile linux-2.6.32.38/net/netfilter/Makefile |
18793 |
---- linux-2.6.32.38/net/netfilter/Makefile 2011-03-27 14:31:47.000000000 -0400 |
18794 |
-+++ linux-2.6.32.38/net/netfilter/Makefile 2011-04-17 15:56:46.000000000 -0400 |
18795 |
+diff -urNp linux-2.6.32.39/net/netfilter/Makefile linux-2.6.32.39/net/netfilter/Makefile |
18796 |
+--- linux-2.6.32.39/net/netfilter/Makefile 2011-03-27 14:31:47.000000000 -0400 |
18797 |
++++ linux-2.6.32.39/net/netfilter/Makefile 2011-04-17 15:56:46.000000000 -0400 |
18798 |
@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC |
18799 |
obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o |
18800 |
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o |
18801 |
@@ -61429,9 +59299,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/Makefile linux-2.6.32.38/net/netfilter/ |
18802 |
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o |
18803 |
obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o |
18804 |
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o |
18805 |
-diff -urNp linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c |
18806 |
---- linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c 2011-03-27 14:31:47.000000000 -0400 |
18807 |
-+++ linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:56:46.000000000 -0400 |
18808 |
+diff -urNp linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c |
18809 |
+--- linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c 2011-03-27 14:31:47.000000000 -0400 |
18810 |
++++ linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:56:46.000000000 -0400 |
18811 |
@@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt |
18812 |
static int |
18813 |
ctnetlink_parse_tuple(const struct nlattr * const cda[], |
18814 |
@@ -61441,9 +59311,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.38/ |
18815 |
{ |
18816 |
struct nlattr *tb[CTA_TUPLE_MAX+1]; |
18817 |
int err; |
18818 |
-diff -urNp linux-2.6.32.38/net/netfilter/xt_gradm.c linux-2.6.32.38/net/netfilter/xt_gradm.c |
18819 |
---- linux-2.6.32.38/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 |
18820 |
-+++ linux-2.6.32.38/net/netfilter/xt_gradm.c 2011-04-17 15:56:46.000000000 -0400 |
18821 |
+diff -urNp linux-2.6.32.39/net/netfilter/xt_gradm.c linux-2.6.32.39/net/netfilter/xt_gradm.c |
18822 |
+--- linux-2.6.32.39/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 |
18823 |
++++ linux-2.6.32.39/net/netfilter/xt_gradm.c 2011-04-17 15:56:46.000000000 -0400 |
18824 |
@@ -0,0 +1,51 @@ |
18825 |
+/* |
18826 |
+ * gradm match for netfilter |
18827 |
@@ -61496,9 +59366,9 @@ diff -urNp linux-2.6.32.38/net/netfilter/xt_gradm.c linux-2.6.32.38/net/netfilte |
18828 |
+MODULE_LICENSE("GPL"); |
18829 |
+MODULE_ALIAS("ipt_gradm"); |
18830 |
+MODULE_ALIAS("ip6t_gradm"); |
18831 |
-diff -urNp linux-2.6.32.38/net/netlink/af_netlink.c linux-2.6.32.38/net/netlink/af_netlink.c |
18832 |
---- linux-2.6.32.38/net/netlink/af_netlink.c 2011-03-27 14:31:47.000000000 -0400 |
18833 |
-+++ linux-2.6.32.38/net/netlink/af_netlink.c 2011-04-17 15:56:46.000000000 -0400 |
18834 |
+diff -urNp linux-2.6.32.39/net/netlink/af_netlink.c linux-2.6.32.39/net/netlink/af_netlink.c |
18835 |
+--- linux-2.6.32.39/net/netlink/af_netlink.c 2011-03-27 14:31:47.000000000 -0400 |
18836 |
++++ linux-2.6.32.39/net/netlink/af_netlink.c 2011-04-17 15:56:46.000000000 -0400 |
18837 |
@@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f |
18838 |
struct netlink_sock *nlk = nlk_sk(s); |
18839 |
|
18840 |
@@ -61521,9 +59391,9 @@ diff -urNp linux-2.6.32.38/net/netlink/af_netlink.c linux-2.6.32.38/net/netlink/ |
18841 |
atomic_read(&s->sk_refcnt), |
18842 |
atomic_read(&s->sk_drops) |
18843 |
); |
18844 |
-diff -urNp linux-2.6.32.38/net/netrom/af_netrom.c linux-2.6.32.38/net/netrom/af_netrom.c |
18845 |
---- linux-2.6.32.38/net/netrom/af_netrom.c 2011-03-27 14:31:47.000000000 -0400 |
18846 |
-+++ linux-2.6.32.38/net/netrom/af_netrom.c 2011-04-17 15:56:46.000000000 -0400 |
18847 |
+diff -urNp linux-2.6.32.39/net/netrom/af_netrom.c linux-2.6.32.39/net/netrom/af_netrom.c |
18848 |
+--- linux-2.6.32.39/net/netrom/af_netrom.c 2011-03-27 14:31:47.000000000 -0400 |
18849 |
++++ linux-2.6.32.39/net/netrom/af_netrom.c 2011-04-17 15:56:46.000000000 -0400 |
18850 |
@@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc |
18851 |
struct sock *sk = sock->sk; |
18852 |
struct nr_sock *nr = nr_sk(sk); |
18853 |
@@ -61540,9 +59410,9 @@ diff -urNp linux-2.6.32.38/net/netrom/af_netrom.c linux-2.6.32.38/net/netrom/af_ |
18854 |
sax->fsa_ax25.sax25_call = nr->source_addr; |
18855 |
*uaddr_len = sizeof(struct sockaddr_ax25); |
18856 |
} |
18857 |
-diff -urNp linux-2.6.32.38/net/packet/af_packet.c linux-2.6.32.38/net/packet/af_packet.c |
18858 |
---- linux-2.6.32.38/net/packet/af_packet.c 2011-04-17 17:00:52.000000000 -0400 |
18859 |
-+++ linux-2.6.32.38/net/packet/af_packet.c 2011-04-17 15:56:46.000000000 -0400 |
18860 |
+diff -urNp linux-2.6.32.39/net/packet/af_packet.c linux-2.6.32.39/net/packet/af_packet.c |
18861 |
+--- linux-2.6.32.39/net/packet/af_packet.c 2011-04-17 17:00:52.000000000 -0400 |
18862 |
++++ linux-2.6.32.39/net/packet/af_packet.c 2011-04-17 15:56:46.000000000 -0400 |
18863 |
@@ -2427,7 +2427,11 @@ static int packet_seq_show(struct seq_fi |
18864 |
|
18865 |
seq_printf(seq, |
18866 |
@@ -61555,9 +59425,9 @@ diff -urNp linux-2.6.32.38/net/packet/af_packet.c linux-2.6.32.38/net/packet/af_ |
18867 |
atomic_read(&s->sk_refcnt), |
18868 |
s->sk_type, |
18869 |
ntohs(po->num), |
18870 |
-diff -urNp linux-2.6.32.38/net/phonet/af_phonet.c linux-2.6.32.38/net/phonet/af_phonet.c |
18871 |
---- linux-2.6.32.38/net/phonet/af_phonet.c 2011-03-27 14:31:47.000000000 -0400 |
18872 |
-+++ linux-2.6.32.38/net/phonet/af_phonet.c 2011-04-17 15:56:46.000000000 -0400 |
18873 |
+diff -urNp linux-2.6.32.39/net/phonet/af_phonet.c linux-2.6.32.39/net/phonet/af_phonet.c |
18874 |
+--- linux-2.6.32.39/net/phonet/af_phonet.c 2011-03-27 14:31:47.000000000 -0400 |
18875 |
++++ linux-2.6.32.39/net/phonet/af_phonet.c 2011-04-17 15:56:46.000000000 -0400 |
18876 |
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr |
18877 |
{ |
18878 |
struct phonet_protocol *pp; |
18879 |
@@ -61576,9 +59446,9 @@ diff -urNp linux-2.6.32.38/net/phonet/af_phonet.c linux-2.6.32.38/net/phonet/af_ |
18880 |
return -EINVAL; |
18881 |
|
18882 |
err = proto_register(pp->prot, 1); |
18883 |
-diff -urNp linux-2.6.32.38/net/phonet/socket.c linux-2.6.32.38/net/phonet/socket.c |
18884 |
---- linux-2.6.32.38/net/phonet/socket.c 2011-03-27 14:31:47.000000000 -0400 |
18885 |
-+++ linux-2.6.32.38/net/phonet/socket.c 2011-04-17 15:56:46.000000000 -0400 |
18886 |
+diff -urNp linux-2.6.32.39/net/phonet/socket.c linux-2.6.32.39/net/phonet/socket.c |
18887 |
+--- linux-2.6.32.39/net/phonet/socket.c 2011-03-27 14:31:47.000000000 -0400 |
18888 |
++++ linux-2.6.32.39/net/phonet/socket.c 2011-04-17 15:56:46.000000000 -0400 |
18889 |
@@ -482,7 +482,12 @@ static int pn_sock_seq_show(struct seq_f |
18890 |
sk->sk_state, |
18891 |
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), |
18892 |
@@ -61593,9 +59463,9 @@ diff -urNp linux-2.6.32.38/net/phonet/socket.c linux-2.6.32.38/net/phonet/socket |
18893 |
atomic_read(&sk->sk_drops), &len); |
18894 |
} |
18895 |
seq_printf(seq, "%*s\n", 127 - len, ""); |
18896 |
-diff -urNp linux-2.6.32.38/net/rds/Kconfig linux-2.6.32.38/net/rds/Kconfig |
18897 |
---- linux-2.6.32.38/net/rds/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
18898 |
-+++ linux-2.6.32.38/net/rds/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
18899 |
+diff -urNp linux-2.6.32.39/net/rds/Kconfig linux-2.6.32.39/net/rds/Kconfig |
18900 |
+--- linux-2.6.32.39/net/rds/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
18901 |
++++ linux-2.6.32.39/net/rds/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
18902 |
@@ -1,7 +1,7 @@ |
18903 |
|
18904 |
config RDS |
18905 |
@@ -61605,9 +59475,9 @@ diff -urNp linux-2.6.32.38/net/rds/Kconfig linux-2.6.32.38/net/rds/Kconfig |
18906 |
---help--- |
18907 |
The RDS (Reliable Datagram Sockets) protocol provides reliable, |
18908 |
sequenced delivery of datagrams over Infiniband, iWARP, |
18909 |
-diff -urNp linux-2.6.32.38/net/rxrpc/ar-key.c linux-2.6.32.38/net/rxrpc/ar-key.c |
18910 |
---- linux-2.6.32.38/net/rxrpc/ar-key.c 2011-03-27 14:31:47.000000000 -0400 |
18911 |
-+++ linux-2.6.32.38/net/rxrpc/ar-key.c 2011-04-17 15:56:46.000000000 -0400 |
18912 |
+diff -urNp linux-2.6.32.39/net/rxrpc/ar-key.c linux-2.6.32.39/net/rxrpc/ar-key.c |
18913 |
+--- linux-2.6.32.39/net/rxrpc/ar-key.c 2011-03-27 14:31:47.000000000 -0400 |
18914 |
++++ linux-2.6.32.39/net/rxrpc/ar-key.c 2011-04-17 15:56:46.000000000 -0400 |
18915 |
@@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s |
18916 |
return ret; |
18917 |
|
18918 |
@@ -61635,9 +59505,9 @@ diff -urNp linux-2.6.32.38/net/rxrpc/ar-key.c linux-2.6.32.38/net/rxrpc/ar-key.c |
18919 |
if (!token->kad) |
18920 |
goto error_free; |
18921 |
|
18922 |
-diff -urNp linux-2.6.32.38/net/sctp/proc.c linux-2.6.32.38/net/sctp/proc.c |
18923 |
---- linux-2.6.32.38/net/sctp/proc.c 2011-03-27 14:31:47.000000000 -0400 |
18924 |
-+++ linux-2.6.32.38/net/sctp/proc.c 2011-04-17 15:56:46.000000000 -0400 |
18925 |
+diff -urNp linux-2.6.32.39/net/sctp/proc.c linux-2.6.32.39/net/sctp/proc.c |
18926 |
+--- linux-2.6.32.39/net/sctp/proc.c 2011-03-27 14:31:47.000000000 -0400 |
18927 |
++++ linux-2.6.32.39/net/sctp/proc.c 2011-04-17 15:56:46.000000000 -0400 |
18928 |
@@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_ |
18929 |
sctp_for_each_hentry(epb, node, &head->chain) { |
18930 |
ep = sctp_ep(epb); |
18931 |
@@ -61666,18 +59536,9 @@ diff -urNp linux-2.6.32.38/net/sctp/proc.c linux-2.6.32.38/net/sctp/proc.c |
18932 |
assoc->state, hash, |
18933 |
assoc->assoc_id, |
18934 |
assoc->sndbuf_used, |
18935 |
-diff -urNp linux-2.6.32.38/net/sctp/socket.c linux-2.6.32.38/net/sctp/socket.c |
18936 |
---- linux-2.6.32.38/net/sctp/socket.c 2011-03-27 14:31:47.000000000 -0400 |
18937 |
-+++ linux-2.6.32.38/net/sctp/socket.c 2011-04-17 15:56:46.000000000 -0400 |
18938 |
-@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc |
18939 |
- struct sctp_sndrcvinfo *sinfo; |
18940 |
- struct sctp_initmsg *sinit; |
18941 |
- sctp_assoc_t associd = 0; |
18942 |
-- sctp_cmsgs_t cmsgs = { NULL }; |
18943 |
-+ sctp_cmsgs_t cmsgs = { NULL, NULL }; |
18944 |
- int err; |
18945 |
- sctp_scope_t scope; |
18946 |
- long timeo; |
18947 |
+diff -urNp linux-2.6.32.39/net/sctp/socket.c linux-2.6.32.39/net/sctp/socket.c |
18948 |
+--- linux-2.6.32.39/net/sctp/socket.c 2011-03-27 14:31:47.000000000 -0400 |
18949 |
++++ linux-2.6.32.39/net/sctp/socket.c 2011-04-23 12:56:11.000000000 -0400 |
18950 |
@@ -5802,7 +5802,6 @@ pp_found: |
18951 |
*/ |
18952 |
int reuse = sk->sk_reuse; |
18953 |
@@ -61686,9 +59547,9 @@ diff -urNp linux-2.6.32.38/net/sctp/socket.c linux-2.6.32.38/net/sctp/socket.c |
18954 |
|
18955 |
SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); |
18956 |
if (pp->fastreuse && sk->sk_reuse && |
18957 |
-diff -urNp linux-2.6.32.38/net/socket.c linux-2.6.32.38/net/socket.c |
18958 |
---- linux-2.6.32.38/net/socket.c 2011-03-27 14:31:47.000000000 -0400 |
18959 |
-+++ linux-2.6.32.38/net/socket.c 2011-04-17 15:56:46.000000000 -0400 |
18960 |
+diff -urNp linux-2.6.32.39/net/socket.c linux-2.6.32.39/net/socket.c |
18961 |
+--- linux-2.6.32.39/net/socket.c 2011-03-27 14:31:47.000000000 -0400 |
18962 |
++++ linux-2.6.32.39/net/socket.c 2011-04-17 15:56:46.000000000 -0400 |
18963 |
@@ -87,6 +87,7 @@ |
18964 |
#include <linux/wireless.h> |
18965 |
#include <linux/nsproxy.h> |
18966 |
@@ -61852,9 +59713,9 @@ diff -urNp linux-2.6.32.38/net/socket.c linux-2.6.32.38/net/socket.c |
18967 |
err = |
18968 |
security_socket_connect(sock, (struct sockaddr *)&address, addrlen); |
18969 |
if (err) |
18970 |
-diff -urNp linux-2.6.32.38/net/sunrpc/sched.c linux-2.6.32.38/net/sunrpc/sched.c |
18971 |
---- linux-2.6.32.38/net/sunrpc/sched.c 2011-03-27 14:31:47.000000000 -0400 |
18972 |
-+++ linux-2.6.32.38/net/sunrpc/sched.c 2011-04-17 15:56:46.000000000 -0400 |
18973 |
+diff -urNp linux-2.6.32.39/net/sunrpc/sched.c linux-2.6.32.39/net/sunrpc/sched.c |
18974 |
+--- linux-2.6.32.39/net/sunrpc/sched.c 2011-03-27 14:31:47.000000000 -0400 |
18975 |
++++ linux-2.6.32.39/net/sunrpc/sched.c 2011-04-17 15:56:46.000000000 -0400 |
18976 |
@@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w |
18977 |
#ifdef RPC_DEBUG |
18978 |
static void rpc_task_set_debuginfo(struct rpc_task *task) |
18979 |
@@ -61868,9 +59729,9 @@ diff -urNp linux-2.6.32.38/net/sunrpc/sched.c linux-2.6.32.38/net/sunrpc/sched.c |
18980 |
} |
18981 |
#else |
18982 |
static inline void rpc_task_set_debuginfo(struct rpc_task *task) |
18983 |
-diff -urNp linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c |
18984 |
---- linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-27 14:31:47.000000000 -0400 |
18985 |
-+++ linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:56:46.000000000 -0400 |
18986 |
+diff -urNp linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c |
18987 |
+--- linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-27 14:31:47.000000000 -0400 |
18988 |
++++ linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:56:46.000000000 -0400 |
18989 |
@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta |
18990 |
len -= *ppos; |
18991 |
if (len > *lenp) |
18992 |
@@ -61880,9 +59741,9 @@ diff -urNp linux-2.6.32.38/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.38/net/su |
18993 |
return -EFAULT; |
18994 |
*lenp = len; |
18995 |
*ppos += len; |
18996 |
-diff -urNp linux-2.6.32.38/net/sysctl_net.c linux-2.6.32.38/net/sysctl_net.c |
18997 |
---- linux-2.6.32.38/net/sysctl_net.c 2011-03-27 14:31:47.000000000 -0400 |
18998 |
-+++ linux-2.6.32.38/net/sysctl_net.c 2011-04-17 15:56:46.000000000 -0400 |
18999 |
+diff -urNp linux-2.6.32.39/net/sysctl_net.c linux-2.6.32.39/net/sysctl_net.c |
19000 |
+--- linux-2.6.32.39/net/sysctl_net.c 2011-03-27 14:31:47.000000000 -0400 |
19001 |
++++ linux-2.6.32.39/net/sysctl_net.c 2011-04-17 15:56:46.000000000 -0400 |
19002 |
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct |
19003 |
struct ctl_table *table) |
19004 |
{ |
19005 |
@@ -61892,24 +59753,9 @@ diff -urNp linux-2.6.32.38/net/sysctl_net.c linux-2.6.32.38/net/sysctl_net.c |
19006 |
int mode = (table->mode >> 6) & 7; |
19007 |
return (mode << 6) | (mode << 3) | mode; |
19008 |
} |
19009 |
-diff -urNp linux-2.6.32.38/net/tipc/socket.c linux-2.6.32.38/net/tipc/socket.c |
19010 |
---- linux-2.6.32.38/net/tipc/socket.c 2011-04-17 17:00:52.000000000 -0400 |
19011 |
-+++ linux-2.6.32.38/net/tipc/socket.c 2011-04-17 15:56:46.000000000 -0400 |
19012 |
-@@ -1450,8 +1450,9 @@ static int connect(struct socket *sock, |
19013 |
- } else { |
19014 |
- if (res == 0) |
19015 |
- res = -ETIMEDOUT; |
19016 |
-- else |
19017 |
-- ; /* leave "res" unchanged */ |
19018 |
-+ else { |
19019 |
-+ /* leave "res" unchanged */ |
19020 |
-+ } |
19021 |
- sock->state = SS_DISCONNECTING; |
19022 |
- } |
19023 |
- |
19024 |
-diff -urNp linux-2.6.32.38/net/unix/af_unix.c linux-2.6.32.38/net/unix/af_unix.c |
19025 |
---- linux-2.6.32.38/net/unix/af_unix.c 2011-03-27 14:31:47.000000000 -0400 |
19026 |
-+++ linux-2.6.32.38/net/unix/af_unix.c 2011-04-17 15:56:46.000000000 -0400 |
19027 |
+diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/af_unix.c |
19028 |
+--- linux-2.6.32.39/net/unix/af_unix.c 2011-03-27 14:31:47.000000000 -0400 |
19029 |
++++ linux-2.6.32.39/net/unix/af_unix.c 2011-04-17 15:56:46.000000000 -0400 |
19030 |
@@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru |
19031 |
err = -ECONNREFUSED; |
19032 |
if (!S_ISSOCK(inode->i_mode)) |
19033 |
@@ -61979,9 +59825,9 @@ diff -urNp linux-2.6.32.38/net/unix/af_unix.c linux-2.6.32.38/net/unix/af_unix.c |
19034 |
atomic_read(&s->sk_refcnt), |
19035 |
0, |
19036 |
s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, |
19037 |
-diff -urNp linux-2.6.32.38/net/wireless/wext.c linux-2.6.32.38/net/wireless/wext.c |
19038 |
---- linux-2.6.32.38/net/wireless/wext.c 2011-03-27 14:31:47.000000000 -0400 |
19039 |
-+++ linux-2.6.32.38/net/wireless/wext.c 2011-04-17 15:56:46.000000000 -0400 |
19040 |
+diff -urNp linux-2.6.32.39/net/wireless/wext.c linux-2.6.32.39/net/wireless/wext.c |
19041 |
+--- linux-2.6.32.39/net/wireless/wext.c 2011-03-27 14:31:47.000000000 -0400 |
19042 |
++++ linux-2.6.32.39/net/wireless/wext.c 2011-04-17 15:56:46.000000000 -0400 |
19043 |
@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc |
19044 |
*/ |
19045 |
|
19046 |
@@ -62015,30 +59861,9 @@ diff -urNp linux-2.6.32.38/net/wireless/wext.c linux-2.6.32.38/net/wireless/wext |
19047 |
err = handler(dev, info, (union iwreq_data *) iwp, extra); |
19048 |
|
19049 |
iwp->length += essid_compat; |
19050 |
-diff -urNp linux-2.6.32.38/net/x25/x25_in.c linux-2.6.32.38/net/x25/x25_in.c |
19051 |
---- linux-2.6.32.38/net/x25/x25_in.c 2011-03-27 14:31:47.000000000 -0400 |
19052 |
-+++ linux-2.6.32.38/net/x25/x25_in.c 2011-04-17 15:56:46.000000000 -0400 |
19053 |
-@@ -108,14 +108,13 @@ static int x25_state1_machine(struct soc |
19054 |
- */ |
19055 |
- skb_pull(skb, X25_STD_MIN_LEN); |
19056 |
- |
19057 |
-- len = x25_parse_address_block(skb, &source_addr, |
19058 |
-- &dest_addr); |
19059 |
-+ len = x25_addr_ntoa(skb->data, &source_addr, &dest_addr); |
19060 |
- if (len > 0) |
19061 |
- skb_pull(skb, len); |
19062 |
- |
19063 |
- len = x25_parse_facilities(skb, &x25->facilities, |
19064 |
-- &x25->dte_facilities, |
19065 |
-- &x25->vc_facil_mask); |
19066 |
-+ &x25->dte_facilities, |
19067 |
-+ &x25->vc_facil_mask); |
19068 |
- if (len > 0) |
19069 |
- skb_pull(skb, len); |
19070 |
- else |
19071 |
-diff -urNp linux-2.6.32.38/net/xfrm/xfrm_policy.c linux-2.6.32.38/net/xfrm/xfrm_policy.c |
19072 |
---- linux-2.6.32.38/net/xfrm/xfrm_policy.c 2011-03-27 14:31:47.000000000 -0400 |
19073 |
-+++ linux-2.6.32.38/net/xfrm/xfrm_policy.c 2011-04-17 15:56:46.000000000 -0400 |
19074 |
+diff -urNp linux-2.6.32.39/net/xfrm/xfrm_policy.c linux-2.6.32.39/net/xfrm/xfrm_policy.c |
19075 |
+--- linux-2.6.32.39/net/xfrm/xfrm_policy.c 2011-03-27 14:31:47.000000000 -0400 |
19076 |
++++ linux-2.6.32.39/net/xfrm/xfrm_policy.c 2011-04-17 15:56:46.000000000 -0400 |
19077 |
@@ -1477,7 +1477,7 @@ free_dst: |
19078 |
goto out; |
19079 |
} |
19080 |
@@ -62066,9 +59891,9 @@ diff -urNp linux-2.6.32.38/net/xfrm/xfrm_policy.c linux-2.6.32.38/net/xfrm/xfrm_ |
19081 |
xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) |
19082 |
{ |
19083 |
#ifdef CONFIG_XFRM_SUB_POLICY |
19084 |
-diff -urNp linux-2.6.32.38/samples/kobject/kset-example.c linux-2.6.32.38/samples/kobject/kset-example.c |
19085 |
---- linux-2.6.32.38/samples/kobject/kset-example.c 2011-03-27 14:31:47.000000000 -0400 |
19086 |
-+++ linux-2.6.32.38/samples/kobject/kset-example.c 2011-04-17 15:56:46.000000000 -0400 |
19087 |
+diff -urNp linux-2.6.32.39/samples/kobject/kset-example.c linux-2.6.32.39/samples/kobject/kset-example.c |
19088 |
+--- linux-2.6.32.39/samples/kobject/kset-example.c 2011-03-27 14:31:47.000000000 -0400 |
19089 |
++++ linux-2.6.32.39/samples/kobject/kset-example.c 2011-04-17 15:56:46.000000000 -0400 |
19090 |
@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob |
19091 |
} |
19092 |
|
19093 |
@@ -62078,9 +59903,9 @@ diff -urNp linux-2.6.32.38/samples/kobject/kset-example.c linux-2.6.32.38/sample |
19094 |
.show = foo_attr_show, |
19095 |
.store = foo_attr_store, |
19096 |
}; |
19097 |
-diff -urNp linux-2.6.32.38/scripts/basic/fixdep.c linux-2.6.32.38/scripts/basic/fixdep.c |
19098 |
---- linux-2.6.32.38/scripts/basic/fixdep.c 2011-03-27 14:31:47.000000000 -0400 |
19099 |
-+++ linux-2.6.32.38/scripts/basic/fixdep.c 2011-04-17 15:56:46.000000000 -0400 |
19100 |
+diff -urNp linux-2.6.32.39/scripts/basic/fixdep.c linux-2.6.32.39/scripts/basic/fixdep.c |
19101 |
+--- linux-2.6.32.39/scripts/basic/fixdep.c 2011-03-27 14:31:47.000000000 -0400 |
19102 |
++++ linux-2.6.32.39/scripts/basic/fixdep.c 2011-04-17 15:56:46.000000000 -0400 |
19103 |
@@ -222,9 +222,9 @@ static void use_config(char *m, int slen |
19104 |
|
19105 |
static void parse_config_file(char *map, size_t len) |
19106 |
@@ -62102,27 +59927,9 @@ diff -urNp linux-2.6.32.38/scripts/basic/fixdep.c linux-2.6.32.38/scripts/basic/ |
19107 |
|
19108 |
if (*p != INT_CONF) { |
19109 |
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", |
19110 |
-diff -urNp linux-2.6.32.38/scripts/kallsyms.c linux-2.6.32.38/scripts/kallsyms.c |
19111 |
---- linux-2.6.32.38/scripts/kallsyms.c 2011-03-27 14:31:47.000000000 -0400 |
19112 |
-+++ linux-2.6.32.38/scripts/kallsyms.c 2011-04-17 15:56:46.000000000 -0400 |
19113 |
-@@ -43,10 +43,10 @@ struct text_range { |
19114 |
- |
19115 |
- static unsigned long long _text; |
19116 |
- static struct text_range text_ranges[] = { |
19117 |
-- { "_stext", "_etext" }, |
19118 |
-- { "_sinittext", "_einittext" }, |
19119 |
-- { "_stext_l1", "_etext_l1" }, /* Blackfin on-chip L1 inst SRAM */ |
19120 |
-- { "_stext_l2", "_etext_l2" }, /* Blackfin on-chip L2 SRAM */ |
19121 |
-+ { "_stext", "_etext", 0, 0 }, |
19122 |
-+ { "_sinittext", "_einittext", 0, 0 }, |
19123 |
-+ { "_stext_l1", "_etext_l1", 0, 0 }, /* Blackfin on-chip L1 inst SRAM */ |
19124 |
-+ { "_stext_l2", "_etext_l2", 0, 0 }, /* Blackfin on-chip L2 SRAM */ |
19125 |
- }; |
19126 |
- #define text_range_text (&text_ranges[0]) |
19127 |
- #define text_range_inittext (&text_ranges[1]) |
19128 |
-diff -urNp linux-2.6.32.38/scripts/mod/file2alias.c linux-2.6.32.38/scripts/mod/file2alias.c |
19129 |
---- linux-2.6.32.38/scripts/mod/file2alias.c 2011-03-27 14:31:47.000000000 -0400 |
19130 |
-+++ linux-2.6.32.38/scripts/mod/file2alias.c 2011-04-17 15:56:46.000000000 -0400 |
19131 |
+diff -urNp linux-2.6.32.39/scripts/mod/file2alias.c linux-2.6.32.39/scripts/mod/file2alias.c |
19132 |
+--- linux-2.6.32.39/scripts/mod/file2alias.c 2011-03-27 14:31:47.000000000 -0400 |
19133 |
++++ linux-2.6.32.39/scripts/mod/file2alias.c 2011-04-17 15:56:46.000000000 -0400 |
19134 |
@@ -72,7 +72,7 @@ static void device_id_check(const char * |
19135 |
unsigned long size, unsigned long id_size, |
19136 |
void *symval) |
19137 |
@@ -62177,9 +59984,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/file2alias.c linux-2.6.32.38/scripts/mod/ |
19138 |
|
19139 |
sprintf(alias, "dmi*"); |
19140 |
|
19141 |
-diff -urNp linux-2.6.32.38/scripts/mod/modpost.c linux-2.6.32.38/scripts/mod/modpost.c |
19142 |
---- linux-2.6.32.38/scripts/mod/modpost.c 2011-03-27 14:31:47.000000000 -0400 |
19143 |
-+++ linux-2.6.32.38/scripts/mod/modpost.c 2011-04-17 15:56:46.000000000 -0400 |
19144 |
+diff -urNp linux-2.6.32.39/scripts/mod/modpost.c linux-2.6.32.39/scripts/mod/modpost.c |
19145 |
+--- linux-2.6.32.39/scripts/mod/modpost.c 2011-03-27 14:31:47.000000000 -0400 |
19146 |
++++ linux-2.6.32.39/scripts/mod/modpost.c 2011-04-17 15:56:46.000000000 -0400 |
19147 |
@@ -835,6 +835,7 @@ enum mismatch { |
19148 |
INIT_TO_EXIT, |
19149 |
EXIT_TO_INIT, |
19150 |
@@ -62247,9 +60054,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/modpost.c linux-2.6.32.38/scripts/mod/mod |
19151 |
goto close_write; |
19152 |
|
19153 |
tmp = NOFAIL(malloc(b->pos)); |
19154 |
-diff -urNp linux-2.6.32.38/scripts/mod/modpost.h linux-2.6.32.38/scripts/mod/modpost.h |
19155 |
---- linux-2.6.32.38/scripts/mod/modpost.h 2011-03-27 14:31:47.000000000 -0400 |
19156 |
-+++ linux-2.6.32.38/scripts/mod/modpost.h 2011-04-17 15:56:46.000000000 -0400 |
19157 |
+diff -urNp linux-2.6.32.39/scripts/mod/modpost.h linux-2.6.32.39/scripts/mod/modpost.h |
19158 |
+--- linux-2.6.32.39/scripts/mod/modpost.h 2011-03-27 14:31:47.000000000 -0400 |
19159 |
++++ linux-2.6.32.39/scripts/mod/modpost.h 2011-04-17 15:56:46.000000000 -0400 |
19160 |
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e |
19161 |
|
19162 |
struct buffer { |
19163 |
@@ -62269,9 +60076,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/modpost.h linux-2.6.32.38/scripts/mod/mod |
19164 |
|
19165 |
struct module { |
19166 |
struct module *next; |
19167 |
-diff -urNp linux-2.6.32.38/scripts/mod/sumversion.c linux-2.6.32.38/scripts/mod/sumversion.c |
19168 |
---- linux-2.6.32.38/scripts/mod/sumversion.c 2011-03-27 14:31:47.000000000 -0400 |
19169 |
-+++ linux-2.6.32.38/scripts/mod/sumversion.c 2011-04-17 15:56:46.000000000 -0400 |
19170 |
+diff -urNp linux-2.6.32.39/scripts/mod/sumversion.c linux-2.6.32.39/scripts/mod/sumversion.c |
19171 |
+--- linux-2.6.32.39/scripts/mod/sumversion.c 2011-03-27 14:31:47.000000000 -0400 |
19172 |
++++ linux-2.6.32.39/scripts/mod/sumversion.c 2011-04-17 15:56:46.000000000 -0400 |
19173 |
@@ -455,7 +455,7 @@ static void write_version(const char *fi |
19174 |
goto out; |
19175 |
} |
19176 |
@@ -62281,9 +60088,9 @@ diff -urNp linux-2.6.32.38/scripts/mod/sumversion.c linux-2.6.32.38/scripts/mod/ |
19177 |
warn("writing sum in %s failed: %s\n", |
19178 |
filename, strerror(errno)); |
19179 |
goto out; |
19180 |
-diff -urNp linux-2.6.32.38/scripts/pnmtologo.c linux-2.6.32.38/scripts/pnmtologo.c |
19181 |
---- linux-2.6.32.38/scripts/pnmtologo.c 2011-03-27 14:31:47.000000000 -0400 |
19182 |
-+++ linux-2.6.32.38/scripts/pnmtologo.c 2011-04-17 15:56:46.000000000 -0400 |
19183 |
+diff -urNp linux-2.6.32.39/scripts/pnmtologo.c linux-2.6.32.39/scripts/pnmtologo.c |
19184 |
+--- linux-2.6.32.39/scripts/pnmtologo.c 2011-03-27 14:31:47.000000000 -0400 |
19185 |
++++ linux-2.6.32.39/scripts/pnmtologo.c 2011-04-17 15:56:46.000000000 -0400 |
19186 |
@@ -237,14 +237,14 @@ static void write_header(void) |
19187 |
fprintf(out, " * Linux logo %s\n", logoname); |
19188 |
fputs(" */\n\n", out); |
19189 |
@@ -62310,9 +60117,9 @@ diff -urNp linux-2.6.32.38/scripts/pnmtologo.c linux-2.6.32.38/scripts/pnmtologo |
19190 |
logoname); |
19191 |
write_hex_cnt = 0; |
19192 |
for (i = 0; i < logo_clutsize; i++) { |
19193 |
-diff -urNp linux-2.6.32.38/security/capability.c linux-2.6.32.38/security/capability.c |
19194 |
---- linux-2.6.32.38/security/capability.c 2011-03-27 14:31:47.000000000 -0400 |
19195 |
-+++ linux-2.6.32.38/security/capability.c 2011-04-17 15:56:46.000000000 -0400 |
19196 |
+diff -urNp linux-2.6.32.39/security/capability.c linux-2.6.32.39/security/capability.c |
19197 |
+--- linux-2.6.32.39/security/capability.c 2011-03-27 14:31:47.000000000 -0400 |
19198 |
++++ linux-2.6.32.39/security/capability.c 2011-04-17 15:56:46.000000000 -0400 |
19199 |
@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls |
19200 |
} |
19201 |
#endif /* CONFIG_AUDIT */ |
19202 |
@@ -62322,9 +60129,9 @@ diff -urNp linux-2.6.32.38/security/capability.c linux-2.6.32.38/security/capabi |
19203 |
.name = "default", |
19204 |
}; |
19205 |
|
19206 |
-diff -urNp linux-2.6.32.38/security/commoncap.c linux-2.6.32.38/security/commoncap.c |
19207 |
---- linux-2.6.32.38/security/commoncap.c 2011-03-27 14:31:47.000000000 -0400 |
19208 |
-+++ linux-2.6.32.38/security/commoncap.c 2011-04-17 15:56:46.000000000 -0400 |
19209 |
+diff -urNp linux-2.6.32.39/security/commoncap.c linux-2.6.32.39/security/commoncap.c |
19210 |
+--- linux-2.6.32.39/security/commoncap.c 2011-03-27 14:31:47.000000000 -0400 |
19211 |
++++ linux-2.6.32.39/security/commoncap.c 2011-04-17 15:56:46.000000000 -0400 |
19212 |
@@ -27,7 +27,7 @@ |
19213 |
#include <linux/sched.h> |
19214 |
#include <linux/prctl.h> |
19215 |
@@ -62357,9 +60164,9 @@ diff -urNp linux-2.6.32.38/security/commoncap.c linux-2.6.32.38/security/commonc |
19216 |
if (cred->uid != 0) { |
19217 |
if (bprm->cap_effective) |
19218 |
return 1; |
19219 |
-diff -urNp linux-2.6.32.38/security/integrity/ima/ima_api.c linux-2.6.32.38/security/integrity/ima/ima_api.c |
19220 |
---- linux-2.6.32.38/security/integrity/ima/ima_api.c 2011-03-27 14:31:47.000000000 -0400 |
19221 |
-+++ linux-2.6.32.38/security/integrity/ima/ima_api.c 2011-04-17 15:56:46.000000000 -0400 |
19222 |
+diff -urNp linux-2.6.32.39/security/integrity/ima/ima_api.c linux-2.6.32.39/security/integrity/ima/ima_api.c |
19223 |
+--- linux-2.6.32.39/security/integrity/ima/ima_api.c 2011-03-27 14:31:47.000000000 -0400 |
19224 |
++++ linux-2.6.32.39/security/integrity/ima/ima_api.c 2011-04-17 15:56:46.000000000 -0400 |
19225 |
@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino |
19226 |
int result; |
19227 |
|
19228 |
@@ -62369,9 +60176,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima/ima_api.c linux-2.6.32.38/secu |
19229 |
|
19230 |
entry = kmalloc(sizeof(*entry), GFP_KERNEL); |
19231 |
if (!entry) { |
19232 |
-diff -urNp linux-2.6.32.38/security/integrity/ima/ima_fs.c linux-2.6.32.38/security/integrity/ima/ima_fs.c |
19233 |
---- linux-2.6.32.38/security/integrity/ima/ima_fs.c 2011-03-27 14:31:47.000000000 -0400 |
19234 |
-+++ linux-2.6.32.38/security/integrity/ima/ima_fs.c 2011-04-17 15:56:46.000000000 -0400 |
19235 |
+diff -urNp linux-2.6.32.39/security/integrity/ima/ima_fs.c linux-2.6.32.39/security/integrity/ima/ima_fs.c |
19236 |
+--- linux-2.6.32.39/security/integrity/ima/ima_fs.c 2011-03-27 14:31:47.000000000 -0400 |
19237 |
++++ linux-2.6.32.39/security/integrity/ima/ima_fs.c 2011-04-17 15:56:46.000000000 -0400 |
19238 |
@@ -27,12 +27,12 @@ |
19239 |
static int valid_policy = 1; |
19240 |
#define TMPBUFLEN 12 |
19241 |
@@ -62387,9 +60194,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima/ima_fs.c linux-2.6.32.38/secur |
19242 |
return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); |
19243 |
} |
19244 |
|
19245 |
-diff -urNp linux-2.6.32.38/security/integrity/ima/ima.h linux-2.6.32.38/security/integrity/ima/ima.h |
19246 |
---- linux-2.6.32.38/security/integrity/ima/ima.h 2011-03-27 14:31:47.000000000 -0400 |
19247 |
-+++ linux-2.6.32.38/security/integrity/ima/ima.h 2011-04-17 15:56:46.000000000 -0400 |
19248 |
+diff -urNp linux-2.6.32.39/security/integrity/ima/ima.h linux-2.6.32.39/security/integrity/ima/ima.h |
19249 |
+--- linux-2.6.32.39/security/integrity/ima/ima.h 2011-03-27 14:31:47.000000000 -0400 |
19250 |
++++ linux-2.6.32.39/security/integrity/ima/ima.h 2011-04-17 15:56:46.000000000 -0400 |
19251 |
@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino |
19252 |
extern spinlock_t ima_queue_lock; |
19253 |
|
19254 |
@@ -62401,9 +60208,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima/ima.h linux-2.6.32.38/security |
19255 |
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; |
19256 |
}; |
19257 |
extern struct ima_h_table ima_htable; |
19258 |
-diff -urNp linux-2.6.32.38/security/integrity/ima/ima_queue.c linux-2.6.32.38/security/integrity/ima/ima_queue.c |
19259 |
---- linux-2.6.32.38/security/integrity/ima/ima_queue.c 2011-03-27 14:31:47.000000000 -0400 |
19260 |
-+++ linux-2.6.32.38/security/integrity/ima/ima_queue.c 2011-04-17 15:56:46.000000000 -0400 |
19261 |
+diff -urNp linux-2.6.32.39/security/integrity/ima/ima_queue.c linux-2.6.32.39/security/integrity/ima/ima_queue.c |
19262 |
+--- linux-2.6.32.39/security/integrity/ima/ima_queue.c 2011-03-27 14:31:47.000000000 -0400 |
19263 |
++++ linux-2.6.32.39/security/integrity/ima/ima_queue.c 2011-04-17 15:56:46.000000000 -0400 |
19264 |
@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i |
19265 |
INIT_LIST_HEAD(&qe->later); |
19266 |
list_add_tail_rcu(&qe->later, &ima_measurements); |
19267 |
@@ -62413,9 +60220,9 @@ diff -urNp linux-2.6.32.38/security/integrity/ima/ima_queue.c linux-2.6.32.38/se |
19268 |
key = ima_hash_key(entry->digest); |
19269 |
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); |
19270 |
return 0; |
19271 |
-diff -urNp linux-2.6.32.38/security/Kconfig linux-2.6.32.38/security/Kconfig |
19272 |
---- linux-2.6.32.38/security/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
19273 |
-+++ linux-2.6.32.38/security/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
19274 |
+diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig |
19275 |
+--- linux-2.6.32.39/security/Kconfig 2011-03-27 14:31:47.000000000 -0400 |
19276 |
++++ linux-2.6.32.39/security/Kconfig 2011-04-17 15:56:46.000000000 -0400 |
19277 |
@@ -4,6 +4,532 @@ |
19278 |
|
19279 |
menu "Security options" |
19280 |
@@ -62958,9 +60765,9 @@ diff -urNp linux-2.6.32.38/security/Kconfig linux-2.6.32.38/security/Kconfig |
19281 |
help |
19282 |
This is the portion of low virtual memory which should be protected |
19283 |
from userspace allocation. Keeping a user from writing to low pages |
19284 |
-diff -urNp linux-2.6.32.38/security/keys/keyring.c linux-2.6.32.38/security/keys/keyring.c |
19285 |
---- linux-2.6.32.38/security/keys/keyring.c 2011-03-27 14:31:47.000000000 -0400 |
19286 |
-+++ linux-2.6.32.38/security/keys/keyring.c 2011-04-18 22:03:00.000000000 -0400 |
19287 |
+diff -urNp linux-2.6.32.39/security/keys/keyring.c linux-2.6.32.39/security/keys/keyring.c |
19288 |
+--- linux-2.6.32.39/security/keys/keyring.c 2011-03-27 14:31:47.000000000 -0400 |
19289 |
++++ linux-2.6.32.39/security/keys/keyring.c 2011-04-18 22:03:00.000000000 -0400 |
19290 |
@@ -214,15 +214,15 @@ static long keyring_read(const struct ke |
19291 |
ret = -EFAULT; |
19292 |
|
19293 |
@@ -62980,9 +60787,9 @@ diff -urNp linux-2.6.32.38/security/keys/keyring.c linux-2.6.32.38/security/keys |
19294 |
goto error; |
19295 |
|
19296 |
buflen -= tmp; |
19297 |
-diff -urNp linux-2.6.32.38/security/min_addr.c linux-2.6.32.38/security/min_addr.c |
19298 |
---- linux-2.6.32.38/security/min_addr.c 2011-03-27 14:31:47.000000000 -0400 |
19299 |
-+++ linux-2.6.32.38/security/min_addr.c 2011-04-17 15:56:46.000000000 -0400 |
19300 |
+diff -urNp linux-2.6.32.39/security/min_addr.c linux-2.6.32.39/security/min_addr.c |
19301 |
+--- linux-2.6.32.39/security/min_addr.c 2011-03-27 14:31:47.000000000 -0400 |
19302 |
++++ linux-2.6.32.39/security/min_addr.c 2011-04-17 15:56:46.000000000 -0400 |
19303 |
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG |
19304 |
*/ |
19305 |
static void update_mmap_min_addr(void) |
19306 |
@@ -62999,9 +60806,9 @@ diff -urNp linux-2.6.32.38/security/min_addr.c linux-2.6.32.38/security/min_addr |
19307 |
} |
19308 |
|
19309 |
/* |
19310 |
-diff -urNp linux-2.6.32.38/security/root_plug.c linux-2.6.32.38/security/root_plug.c |
19311 |
---- linux-2.6.32.38/security/root_plug.c 2011-03-27 14:31:47.000000000 -0400 |
19312 |
-+++ linux-2.6.32.38/security/root_plug.c 2011-04-17 15:56:46.000000000 -0400 |
19313 |
+diff -urNp linux-2.6.32.39/security/root_plug.c linux-2.6.32.39/security/root_plug.c |
19314 |
+--- linux-2.6.32.39/security/root_plug.c 2011-03-27 14:31:47.000000000 -0400 |
19315 |
++++ linux-2.6.32.39/security/root_plug.c 2011-04-17 15:56:46.000000000 -0400 |
19316 |
@@ -70,7 +70,7 @@ static int rootplug_bprm_check_security |
19317 |
return 0; |
19318 |
} |
19319 |
@@ -63011,9 +60818,9 @@ diff -urNp linux-2.6.32.38/security/root_plug.c linux-2.6.32.38/security/root_pl |
19320 |
.bprm_check_security = rootplug_bprm_check_security, |
19321 |
}; |
19322 |
|
19323 |
-diff -urNp linux-2.6.32.38/security/security.c linux-2.6.32.38/security/security.c |
19324 |
---- linux-2.6.32.38/security/security.c 2011-03-27 14:31:47.000000000 -0400 |
19325 |
-+++ linux-2.6.32.38/security/security.c 2011-04-17 15:56:46.000000000 -0400 |
19326 |
+diff -urNp linux-2.6.32.39/security/security.c linux-2.6.32.39/security/security.c |
19327 |
+--- linux-2.6.32.39/security/security.c 2011-03-27 14:31:47.000000000 -0400 |
19328 |
++++ linux-2.6.32.39/security/security.c 2011-04-17 15:56:46.000000000 -0400 |
19329 |
@@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI |
19330 |
extern struct security_operations default_security_ops; |
19331 |
extern void security_fixup_ops(struct security_operations *ops); |
19332 |
@@ -63032,9 +60839,9 @@ diff -urNp linux-2.6.32.38/security/security.c linux-2.6.32.38/security/security |
19333 |
{ |
19334 |
if (verify(ops)) { |
19335 |
printk(KERN_DEBUG "%s could not verify " |
19336 |
-diff -urNp linux-2.6.32.38/security/selinux/hooks.c linux-2.6.32.38/security/selinux/hooks.c |
19337 |
---- linux-2.6.32.38/security/selinux/hooks.c 2011-03-27 14:31:47.000000000 -0400 |
19338 |
-+++ linux-2.6.32.38/security/selinux/hooks.c 2011-04-17 15:56:46.000000000 -0400 |
19339 |
+diff -urNp linux-2.6.32.39/security/selinux/hooks.c linux-2.6.32.39/security/selinux/hooks.c |
19340 |
+--- linux-2.6.32.39/security/selinux/hooks.c 2011-03-27 14:31:47.000000000 -0400 |
19341 |
++++ linux-2.6.32.39/security/selinux/hooks.c 2011-04-17 15:56:46.000000000 -0400 |
19342 |
@@ -131,7 +131,7 @@ int selinux_enabled = 1; |
19343 |
* Minimal support for a secondary security module, |
19344 |
* just to allow the use of the capability module. |
19345 |
@@ -63063,9 +60870,9 @@ diff -urNp linux-2.6.32.38/security/selinux/hooks.c linux-2.6.32.38/security/sel |
19346 |
|
19347 |
/* Unregister netfilter hooks. */ |
19348 |
selinux_nf_ip_exit(); |
19349 |
-diff -urNp linux-2.6.32.38/security/smack/smack_lsm.c linux-2.6.32.38/security/smack/smack_lsm.c |
19350 |
---- linux-2.6.32.38/security/smack/smack_lsm.c 2011-03-27 14:31:47.000000000 -0400 |
19351 |
-+++ linux-2.6.32.38/security/smack/smack_lsm.c 2011-04-17 15:56:46.000000000 -0400 |
19352 |
+diff -urNp linux-2.6.32.39/security/smack/smack_lsm.c linux-2.6.32.39/security/smack/smack_lsm.c |
19353 |
+--- linux-2.6.32.39/security/smack/smack_lsm.c 2011-03-27 14:31:47.000000000 -0400 |
19354 |
++++ linux-2.6.32.39/security/smack/smack_lsm.c 2011-04-17 15:56:46.000000000 -0400 |
19355 |
@@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct |
19356 |
return 0; |
19357 |
} |
19358 |
@@ -63075,9 +60882,9 @@ diff -urNp linux-2.6.32.38/security/smack/smack_lsm.c linux-2.6.32.38/security/s |
19359 |
.name = "smack", |
19360 |
|
19361 |
.ptrace_access_check = smack_ptrace_access_check, |
19362 |
-diff -urNp linux-2.6.32.38/security/tomoyo/tomoyo.c linux-2.6.32.38/security/tomoyo/tomoyo.c |
19363 |
---- linux-2.6.32.38/security/tomoyo/tomoyo.c 2011-03-27 14:31:47.000000000 -0400 |
19364 |
-+++ linux-2.6.32.38/security/tomoyo/tomoyo.c 2011-04-17 15:56:46.000000000 -0400 |
19365 |
+diff -urNp linux-2.6.32.39/security/tomoyo/tomoyo.c linux-2.6.32.39/security/tomoyo/tomoyo.c |
19366 |
+--- linux-2.6.32.39/security/tomoyo/tomoyo.c 2011-03-27 14:31:47.000000000 -0400 |
19367 |
++++ linux-2.6.32.39/security/tomoyo/tomoyo.c 2011-04-17 15:56:46.000000000 -0400 |
19368 |
@@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil |
19369 |
* tomoyo_security_ops is a "struct security_operations" which is used for |
19370 |
* registering TOMOYO. |
19371 |
@@ -63087,9 +60894,9 @@ diff -urNp linux-2.6.32.38/security/tomoyo/tomoyo.c linux-2.6.32.38/security/tom |
19372 |
.name = "tomoyo", |
19373 |
.cred_alloc_blank = tomoyo_cred_alloc_blank, |
19374 |
.cred_prepare = tomoyo_cred_prepare, |
19375 |
-diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx.c linux-2.6.32.38/sound/aoa/codecs/onyx.c |
19376 |
---- linux-2.6.32.38/sound/aoa/codecs/onyx.c 2011-03-27 14:31:47.000000000 -0400 |
19377 |
-+++ linux-2.6.32.38/sound/aoa/codecs/onyx.c 2011-04-17 15:56:46.000000000 -0400 |
19378 |
+diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.c linux-2.6.32.39/sound/aoa/codecs/onyx.c |
19379 |
+--- linux-2.6.32.39/sound/aoa/codecs/onyx.c 2011-03-27 14:31:47.000000000 -0400 |
19380 |
++++ linux-2.6.32.39/sound/aoa/codecs/onyx.c 2011-04-17 15:56:46.000000000 -0400 |
19381 |
@@ -53,7 +53,7 @@ struct onyx { |
19382 |
spdif_locked:1, |
19383 |
analog_locked:1, |
19384 |
@@ -63118,9 +60925,9 @@ diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx.c linux-2.6.32.38/sound/aoa/cod |
19385 |
onyx->spdif_locked = onyx->analog_locked = 0; |
19386 |
mutex_unlock(&onyx->mutex); |
19387 |
|
19388 |
-diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx.h linux-2.6.32.38/sound/aoa/codecs/onyx.h |
19389 |
---- linux-2.6.32.38/sound/aoa/codecs/onyx.h 2011-03-27 14:31:47.000000000 -0400 |
19390 |
-+++ linux-2.6.32.38/sound/aoa/codecs/onyx.h 2011-04-17 15:56:46.000000000 -0400 |
19391 |
+diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.h linux-2.6.32.39/sound/aoa/codecs/onyx.h |
19392 |
+--- linux-2.6.32.39/sound/aoa/codecs/onyx.h 2011-03-27 14:31:47.000000000 -0400 |
19393 |
++++ linux-2.6.32.39/sound/aoa/codecs/onyx.h 2011-04-17 15:56:46.000000000 -0400 |
19394 |
@@ -11,6 +11,7 @@ |
19395 |
#include <linux/i2c.h> |
19396 |
#include <asm/pmac_low_i2c.h> |
19397 |
@@ -63129,41 +60936,9 @@ diff -urNp linux-2.6.32.38/sound/aoa/codecs/onyx.h linux-2.6.32.38/sound/aoa/cod |
19398 |
|
19399 |
/* PCM3052 register definitions */ |
19400 |
|
19401 |
-diff -urNp linux-2.6.32.38/sound/core/oss/pcm_oss.c linux-2.6.32.38/sound/core/oss/pcm_oss.c |
19402 |
---- linux-2.6.32.38/sound/core/oss/pcm_oss.c 2011-03-27 14:31:47.000000000 -0400 |
19403 |
-+++ linux-2.6.32.38/sound/core/oss/pcm_oss.c 2011-04-17 15:56:46.000000000 -0400 |
19404 |
-@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct |
19405 |
- } |
19406 |
- } |
19407 |
- #else /* !CONFIG_SND_VERBOSE_PROCFS */ |
19408 |
--#define snd_pcm_oss_proc_init(pcm) |
19409 |
--#define snd_pcm_oss_proc_done(pcm) |
19410 |
-+#define snd_pcm_oss_proc_init(pcm) do {} while (0) |
19411 |
-+#define snd_pcm_oss_proc_done(pcm) do {} while (0) |
19412 |
- #endif /* CONFIG_SND_VERBOSE_PROCFS */ |
19413 |
- |
19414 |
- /* |
19415 |
-diff -urNp linux-2.6.32.38/sound/core/seq/seq_lock.h linux-2.6.32.38/sound/core/seq/seq_lock.h |
19416 |
---- linux-2.6.32.38/sound/core/seq/seq_lock.h 2011-03-27 14:31:47.000000000 -0400 |
19417 |
-+++ linux-2.6.32.38/sound/core/seq/seq_lock.h 2011-04-17 15:56:46.000000000 -0400 |
19418 |
-@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo |
19419 |
- #else /* SMP || CONFIG_SND_DEBUG */ |
19420 |
- |
19421 |
- typedef spinlock_t snd_use_lock_t; /* dummy */ |
19422 |
--#define snd_use_lock_init(lockp) /**/ |
19423 |
--#define snd_use_lock_use(lockp) /**/ |
19424 |
--#define snd_use_lock_free(lockp) /**/ |
19425 |
--#define snd_use_lock_sync(lockp) /**/ |
19426 |
-+#define snd_use_lock_init(lockp) do {} while (0) |
19427 |
-+#define snd_use_lock_use(lockp) do {} while (0) |
19428 |
-+#define snd_use_lock_free(lockp) do {} while (0) |
19429 |
-+#define snd_use_lock_sync(lockp) do {} while (0) |
19430 |
- |
19431 |
- #endif /* SMP || CONFIG_SND_DEBUG */ |
19432 |
- |
19433 |
-diff -urNp linux-2.6.32.38/sound/drivers/mts64.c linux-2.6.32.38/sound/drivers/mts64.c |
19434 |
---- linux-2.6.32.38/sound/drivers/mts64.c 2011-03-27 14:31:47.000000000 -0400 |
19435 |
-+++ linux-2.6.32.38/sound/drivers/mts64.c 2011-04-17 15:56:46.000000000 -0400 |
19436 |
+diff -urNp linux-2.6.32.39/sound/drivers/mts64.c linux-2.6.32.39/sound/drivers/mts64.c |
19437 |
+--- linux-2.6.32.39/sound/drivers/mts64.c 2011-03-27 14:31:47.000000000 -0400 |
19438 |
++++ linux-2.6.32.39/sound/drivers/mts64.c 2011-04-17 15:56:46.000000000 -0400 |
19439 |
@@ -27,6 +27,7 @@ |
19440 |
#include <sound/initval.h> |
19441 |
#include <sound/rawmidi.h> |
19442 |
@@ -63220,9 +60995,9 @@ diff -urNp linux-2.6.32.38/sound/drivers/mts64.c linux-2.6.32.38/sound/drivers/m |
19443 |
|
19444 |
return 0; |
19445 |
} |
19446 |
-diff -urNp linux-2.6.32.38/sound/drivers/portman2x4.c linux-2.6.32.38/sound/drivers/portman2x4.c |
19447 |
---- linux-2.6.32.38/sound/drivers/portman2x4.c 2011-03-27 14:31:47.000000000 -0400 |
19448 |
-+++ linux-2.6.32.38/sound/drivers/portman2x4.c 2011-04-17 15:56:46.000000000 -0400 |
19449 |
+diff -urNp linux-2.6.32.39/sound/drivers/portman2x4.c linux-2.6.32.39/sound/drivers/portman2x4.c |
19450 |
+--- linux-2.6.32.39/sound/drivers/portman2x4.c 2011-03-27 14:31:47.000000000 -0400 |
19451 |
++++ linux-2.6.32.39/sound/drivers/portman2x4.c 2011-04-17 15:56:46.000000000 -0400 |
19452 |
@@ -46,6 +46,7 @@ |
19453 |
#include <sound/initval.h> |
19454 |
#include <sound/rawmidi.h> |
19455 |
@@ -63240,9 +61015,9 @@ diff -urNp linux-2.6.32.38/sound/drivers/portman2x4.c linux-2.6.32.38/sound/driv |
19456 |
int mode[PORTMAN_NUM_INPUT_PORTS]; |
19457 |
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; |
19458 |
}; |
19459 |
-diff -urNp linux-2.6.32.38/sound/oss/sb_audio.c linux-2.6.32.38/sound/oss/sb_audio.c |
19460 |
---- linux-2.6.32.38/sound/oss/sb_audio.c 2011-03-27 14:31:47.000000000 -0400 |
19461 |
-+++ linux-2.6.32.38/sound/oss/sb_audio.c 2011-04-17 15:56:46.000000000 -0400 |
19462 |
+diff -urNp linux-2.6.32.39/sound/oss/sb_audio.c linux-2.6.32.39/sound/oss/sb_audio.c |
19463 |
+--- linux-2.6.32.39/sound/oss/sb_audio.c 2011-03-27 14:31:47.000000000 -0400 |
19464 |
++++ linux-2.6.32.39/sound/oss/sb_audio.c 2011-04-17 15:56:46.000000000 -0400 |
19465 |
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, |
19466 |
buf16 = (signed short *)(localbuf + localoffs); |
19467 |
while (c) |
19468 |
@@ -63252,9 +61027,9 @@ diff -urNp linux-2.6.32.38/sound/oss/sb_audio.c linux-2.6.32.38/sound/oss/sb_aud |
19469 |
if (copy_from_user(lbuf8, |
19470 |
userbuf+useroffs + p, |
19471 |
locallen)) |
19472 |
-diff -urNp linux-2.6.32.38/sound/oss/swarm_cs4297a.c linux-2.6.32.38/sound/oss/swarm_cs4297a.c |
19473 |
---- linux-2.6.32.38/sound/oss/swarm_cs4297a.c 2011-03-27 14:31:47.000000000 -0400 |
19474 |
-+++ linux-2.6.32.38/sound/oss/swarm_cs4297a.c 2011-04-17 15:56:46.000000000 -0400 |
19475 |
+diff -urNp linux-2.6.32.39/sound/oss/swarm_cs4297a.c linux-2.6.32.39/sound/oss/swarm_cs4297a.c |
19476 |
+--- linux-2.6.32.39/sound/oss/swarm_cs4297a.c 2011-03-27 14:31:47.000000000 -0400 |
19477 |
++++ linux-2.6.32.39/sound/oss/swarm_cs4297a.c 2011-04-17 15:56:46.000000000 -0400 |
19478 |
@@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void) |
19479 |
{ |
19480 |
struct cs4297a_state *s; |
19481 |
@@ -63289,9 +61064,9 @@ diff -urNp linux-2.6.32.38/sound/oss/swarm_cs4297a.c linux-2.6.32.38/sound/oss/s |
19482 |
|
19483 |
list_add(&s->list, &cs4297a_devs); |
19484 |
|
19485 |
-diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_codec.c linux-2.6.32.38/sound/pci/ac97/ac97_codec.c |
19486 |
---- linux-2.6.32.38/sound/pci/ac97/ac97_codec.c 2011-03-27 14:31:47.000000000 -0400 |
19487 |
-+++ linux-2.6.32.38/sound/pci/ac97/ac97_codec.c 2011-04-17 15:56:46.000000000 -0400 |
19488 |
+diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_codec.c linux-2.6.32.39/sound/pci/ac97/ac97_codec.c |
19489 |
+--- linux-2.6.32.39/sound/pci/ac97/ac97_codec.c 2011-03-27 14:31:47.000000000 -0400 |
19490 |
++++ linux-2.6.32.39/sound/pci/ac97/ac97_codec.c 2011-04-17 15:56:46.000000000 -0400 |
19491 |
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc |
19492 |
} |
19493 |
|
19494 |
@@ -63301,9 +61076,9 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_codec.c linux-2.6.32.38/sound/pci |
19495 |
|
19496 |
#ifdef CONFIG_SND_AC97_POWER_SAVE |
19497 |
static void do_update_power(struct work_struct *work) |
19498 |
-diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_patch.c linux-2.6.32.38/sound/pci/ac97/ac97_patch.c |
19499 |
---- linux-2.6.32.38/sound/pci/ac97/ac97_patch.c 2011-03-27 14:31:47.000000000 -0400 |
19500 |
-+++ linux-2.6.32.38/sound/pci/ac97/ac97_patch.c 2011-04-17 15:56:46.000000000 -0400 |
19501 |
+diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_patch.c linux-2.6.32.39/sound/pci/ac97/ac97_patch.c |
19502 |
+--- linux-2.6.32.39/sound/pci/ac97/ac97_patch.c 2011-03-27 14:31:47.000000000 -0400 |
19503 |
++++ linux-2.6.32.39/sound/pci/ac97/ac97_patch.c 2011-04-23 12:56:12.000000000 -0400 |
19504 |
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd |
19505 |
return 0; |
19506 |
} |
19507 |
@@ -63412,15 +61187,6 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_patch.c linux-2.6.32.38/sound/pci |
19508 |
.build_spdif = patch_conexant_build_spdif |
19509 |
}; |
19510 |
|
19511 |
-@@ -1501,7 +1501,7 @@ static const struct snd_ac97_res_table a |
19512 |
- { AC97_VIDEO, 0x9f1f }, |
19513 |
- { AC97_AUX, 0x9f1f }, |
19514 |
- { AC97_PCM, 0x9f1f }, |
19515 |
-- { } /* terminator */ |
19516 |
-+ { 0, 0 } /* terminator */ |
19517 |
- }; |
19518 |
- |
19519 |
- static int patch_ad1819(struct snd_ac97 * ac97) |
19520 |
@@ -1575,7 +1575,7 @@ static void patch_ad1881_chained(struct |
19521 |
} |
19522 |
} |
19523 |
@@ -63592,15 +61358,6 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_patch.c linux-2.6.32.38/sound/pci |
19524 |
.build_specific = patch_si3036_specific, |
19525 |
}; |
19526 |
|
19527 |
-@@ -3879,7 +3879,7 @@ static struct snd_ac97_res_table lm4550_ |
19528 |
- { AC97_AUX, 0x1f1f }, |
19529 |
- { AC97_PCM, 0x1f1f }, |
19530 |
- { AC97_REC_GAIN, 0x0f0f }, |
19531 |
-- { } /* terminator */ |
19532 |
-+ { 0, 0 } /* terminator */ |
19533 |
- }; |
19534 |
- |
19535 |
- static int patch_lm4550(struct snd_ac97 *ac97) |
19536 |
@@ -3913,7 +3913,7 @@ static int patch_ucb1400_specific(struct |
19537 |
return 0; |
19538 |
} |
19539 |
@@ -63610,21 +61367,9 @@ diff -urNp linux-2.6.32.38/sound/pci/ac97/ac97_patch.c linux-2.6.32.38/sound/pci |
19540 |
.build_specific = patch_ucb1400_specific, |
19541 |
}; |
19542 |
|
19543 |
-diff -urNp linux-2.6.32.38/sound/pci/ens1370.c linux-2.6.32.38/sound/pci/ens1370.c |
19544 |
---- linux-2.6.32.38/sound/pci/ens1370.c 2011-04-17 17:00:52.000000000 -0400 |
19545 |
-+++ linux-2.6.32.38/sound/pci/ens1370.c 2011-04-17 17:04:47.000000000 -0400 |
19546 |
-@@ -453,7 +453,7 @@ static struct pci_device_id snd_audiopci |
19547 |
- { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ |
19548 |
- { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ |
19549 |
- #endif |
19550 |
-- { 0, } |
19551 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
19552 |
- }; |
19553 |
- |
19554 |
- MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); |
19555 |
-diff -urNp linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c |
19556 |
---- linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c 2011-03-27 14:31:47.000000000 -0400 |
19557 |
-+++ linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c 2011-04-17 15:56:46.000000000 -0400 |
19558 |
+diff -urNp linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c |
19559 |
+--- linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c 2011-03-27 14:31:47.000000000 -0400 |
19560 |
++++ linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c 2011-04-17 15:56:46.000000000 -0400 |
19561 |
@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str |
19562 |
cp_ready); |
19563 |
|
19564 |
@@ -63640,51 +61385,21 @@ diff -urNp linux-2.6.32.38/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.38/sound |
19565 |
} |
19566 |
|
19567 |
|
19568 |
-diff -urNp linux-2.6.32.38/sound/pci/intel8x0.c linux-2.6.32.38/sound/pci/intel8x0.c |
19569 |
---- linux-2.6.32.38/sound/pci/intel8x0.c 2011-03-27 14:31:47.000000000 -0400 |
19570 |
-+++ linux-2.6.32.38/sound/pci/intel8x0.c 2011-04-17 15:56:46.000000000 -0400 |
19571 |
-@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 |
19572 |
- { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
19573 |
- { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ |
19574 |
- { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ |
19575 |
-- { 0, } |
19576 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
19577 |
- }; |
19578 |
- |
19579 |
- MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids); |
19580 |
-@@ -2135,7 +2135,7 @@ static struct ac97_quirk ac97_quirks[] _ |
19581 |
- .type = AC97_TUNE_HP_ONLY |
19582 |
- }, |
19583 |
- #endif |
19584 |
-- { } /* terminator */ |
19585 |
-+ { 0, 0, 0, 0, NULL, 0 } /* terminator */ |
19586 |
- }; |
19587 |
- |
19588 |
- static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, |
19589 |
-diff -urNp linux-2.6.32.38/sound/pci/intel8x0m.c linux-2.6.32.38/sound/pci/intel8x0m.c |
19590 |
---- linux-2.6.32.38/sound/pci/intel8x0m.c 2011-03-27 14:31:47.000000000 -0400 |
19591 |
-+++ linux-2.6.32.38/sound/pci/intel8x0m.c 2011-04-17 15:56:46.000000000 -0400 |
19592 |
-@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 |
19593 |
- { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
19594 |
- { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ |
19595 |
- #endif |
19596 |
-- { 0, } |
19597 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
19598 |
- }; |
19599 |
- |
19600 |
- MODULE_DEVICE_TABLE(pci, snd_intel8x0m_ids); |
19601 |
+diff -urNp linux-2.6.32.39/sound/pci/intel8x0m.c linux-2.6.32.39/sound/pci/intel8x0m.c |
19602 |
+--- linux-2.6.32.39/sound/pci/intel8x0m.c 2011-03-27 14:31:47.000000000 -0400 |
19603 |
++++ linux-2.6.32.39/sound/pci/intel8x0m.c 2011-04-23 12:56:12.000000000 -0400 |
19604 |
@@ -1264,7 +1264,7 @@ static struct shortname_table { |
19605 |
{ 0x5455, "ALi M5455" }, |
19606 |
{ 0x746d, "AMD AMD8111" }, |
19607 |
#endif |
19608 |
- { 0 }, |
19609 |
-+ { 0, NULL }, |
19610 |
++ { 0, }, |
19611 |
}; |
19612 |
|
19613 |
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, |
19614 |
-diff -urNp linux-2.6.32.38/usr/gen_init_cpio.c linux-2.6.32.38/usr/gen_init_cpio.c |
19615 |
---- linux-2.6.32.38/usr/gen_init_cpio.c 2011-03-27 14:31:47.000000000 -0400 |
19616 |
-+++ linux-2.6.32.38/usr/gen_init_cpio.c 2011-04-17 15:56:46.000000000 -0400 |
19617 |
+diff -urNp linux-2.6.32.39/usr/gen_init_cpio.c linux-2.6.32.39/usr/gen_init_cpio.c |
19618 |
+--- linux-2.6.32.39/usr/gen_init_cpio.c 2011-03-27 14:31:47.000000000 -0400 |
19619 |
++++ linux-2.6.32.39/usr/gen_init_cpio.c 2011-04-17 15:56:46.000000000 -0400 |
19620 |
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, |
19621 |
int retval; |
19622 |
int rc = -1; |
19623 |
@@ -63707,9 +61422,9 @@ diff -urNp linux-2.6.32.38/usr/gen_init_cpio.c linux-2.6.32.38/usr/gen_init_cpio |
19624 |
} else |
19625 |
break; |
19626 |
} |
19627 |
-diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c linux-2.6.32.38/virt/kvm/kvm_main.c |
19628 |
---- linux-2.6.32.38/virt/kvm/kvm_main.c 2011-03-27 14:31:47.000000000 -0400 |
19629 |
-+++ linux-2.6.32.38/virt/kvm/kvm_main.c 2011-04-17 15:56:46.000000000 -0400 |
19630 |
+diff -urNp linux-2.6.32.39/virt/kvm/kvm_main.c linux-2.6.32.39/virt/kvm/kvm_main.c |
19631 |
+--- linux-2.6.32.39/virt/kvm/kvm_main.c 2011-03-27 14:31:47.000000000 -0400 |
19632 |
++++ linux-2.6.32.39/virt/kvm/kvm_main.c 2011-04-23 21:41:37.000000000 -0400 |
19633 |
@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode |
19634 |
return 0; |
19635 |
} |
19636 |
@@ -63734,17 +61449,7 @@ diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c linux-2.6.32.38/virt/kvm/kvm_main |
19637 |
static struct file_operations kvm_chardev_ops = { |
19638 |
.unlocked_ioctl = kvm_dev_ioctl, |
19639 |
.compat_ioctl = kvm_dev_ioctl, |
19640 |
-@@ -2440,6 +2443,9 @@ static struct miscdevice kvm_dev = { |
19641 |
- KVM_MINOR, |
19642 |
- "kvm", |
19643 |
- &kvm_chardev_ops, |
19644 |
-+ {NULL, NULL}, |
19645 |
-+ NULL, |
19646 |
-+ NULL |
19647 |
- }; |
19648 |
- |
19649 |
- static void hardware_enable(void *junk) |
19650 |
-@@ -2494,7 +2500,7 @@ asmlinkage void kvm_handle_fault_on_rebo |
19651 |
+@@ -2494,7 +2497,7 @@ asmlinkage void kvm_handle_fault_on_rebo |
19652 |
if (kvm_rebooting) |
19653 |
/* spin while reset goes on */ |
19654 |
while (true) |
19655 |
@@ -63753,7 +61458,7 @@ diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c linux-2.6.32.38/virt/kvm/kvm_main |
19656 |
/* Fault while not rebooting. We want the trace. */ |
19657 |
BUG(); |
19658 |
} |
19659 |
-@@ -2714,7 +2720,7 @@ static void kvm_sched_out(struct preempt |
19660 |
+@@ -2714,7 +2717,7 @@ static void kvm_sched_out(struct preempt |
19661 |
kvm_arch_vcpu_put(vcpu); |
19662 |
} |
19663 |
|
19664 |
@@ -63762,3 +61467,12 @@ diff -urNp linux-2.6.32.38/virt/kvm/kvm_main.c linux-2.6.32.38/virt/kvm/kvm_main |
19665 |
struct module *module) |
19666 |
{ |
19667 |
int r; |
19668 |
+@@ -2767,7 +2770,7 @@ int kvm_init(void *opaque, unsigned int |
19669 |
+ /* A kmem cache lets us meet the alignment requirements of fx_save. */ |
19670 |
+ kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, |
19671 |
+ __alignof__(struct kvm_vcpu), |
19672 |
+- 0, NULL); |
19673 |
++ SLAB_USERCOPY, NULL); |
19674 |
+ if (!kvm_vcpu_cache) { |
19675 |
+ r = -ENOMEM; |
19676 |
+ goto out_free_5; |
19677 |
|
19678 |
diff --git a/2.6.32/4422_grsec-mute-warnings.patch b/2.6.32/4422_grsec-mute-warnings.patch |
19679 |
index 90d934d..e1915d9 100644 |
19680 |
--- a/2.6.32/4422_grsec-mute-warnings.patch |
19681 |
+++ b/2.6.32/4422_grsec-mute-warnings.patch |
19682 |
@@ -1,3 +1,10 @@ |
19683 |
+From: Anthony G. Basile <blueness@g.o> |
19684 |
+Updated patch for 2.6.32.39. |
19685 |
+ |
19686 |
+The credits/description from the original version of this patch remain accurate |
19687 |
+and are included below. |
19688 |
+ |
19689 |
+--- |
19690 |
From: Jory A. Pratt <anarchy@g.o> |
19691 |
Updated patch for kernel 2.6.32 |
19692 |
|
19693 |
@@ -22,14 +29,14 @@ warning flags of vanilla kernel versions. |
19694 |
Acked-by: Christian Heim <phreak@g.o> |
19695 |
--- |
19696 |
|
19697 |
---- a/Makefile 2009-07-29 05:34:01.695857499 +0100 |
19698 |
-+++ b/Makefile 2009-07-29 05:58:15.098857201 +0100 |
19699 |
+--- a/Makefile 2011-04-27 22:52:14.000000000 -0400 |
19700 |
++++ b/Makefile 2011-04-27 23:01:48.000000000 -0400 |
19701 |
@@ -221,7 +221,7 @@ |
19702 |
|
19703 |
HOSTCC = gcc |
19704 |
HOSTCXX = g++ |
19705 |
--HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
19706 |
-+HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
19707 |
+-HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
19708 |
++HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
19709 |
HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks |
19710 |
|
19711 |
# Decide whether to build built-in, modular, or both. |
19712 |
|
19713 |
diff --git a/2.6.38/0000_README b/2.6.38/0000_README |
19714 |
index c24fae2..63831b6 100644 |
19715 |
--- a/2.6.38/0000_README |
19716 |
+++ b/2.6.38/0000_README |
19717 |
@@ -3,7 +3,7 @@ README |
19718 |
|
19719 |
Individual Patch Descriptions: |
19720 |
----------------------------------------------------------------------------- |
19721 |
-Patch: 4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch |
19722 |
+Patch: 4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch |
19723 |
From: http://www.grsecurity.net |
19724 |
Desc: hardened-sources base patch from upstream grsecurity |
19725 |
|
19726 |
|
19727 |
diff --git a/2.6.38/4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch b/2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch |
19728 |
similarity index 84% |
19729 |
rename from 2.6.38/4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch |
19730 |
rename to 2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch |
19731 |
index 15f7d14..10b27e8 100644 |
19732 |
--- a/2.6.38/4420_grsecurity-2.2.2-2.6.38.3-201104191737.patch |
19733 |
+++ b/2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201104232142.patch |
19734 |
@@ -1,6 +1,6 @@ |
19735 |
-diff -urNp linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h |
19736 |
---- linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
19737 |
-+++ linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
19738 |
+diff -urNp linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h |
19739 |
+--- linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
19740 |
++++ linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
19741 |
@@ -3,9 +3,9 @@ |
19742 |
|
19743 |
#include <linux/dma-attrs.h> |
19744 |
@@ -13,9 +13,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.3/ar |
19745 |
{ |
19746 |
return dma_ops; |
19747 |
} |
19748 |
-diff -urNp linux-2.6.38.3/arch/alpha/include/asm/elf.h linux-2.6.38.3/arch/alpha/include/asm/elf.h |
19749 |
---- linux-2.6.38.3/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
19750 |
-+++ linux-2.6.38.3/arch/alpha/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
19751 |
+diff -urNp linux-2.6.38.4/arch/alpha/include/asm/elf.h linux-2.6.38.4/arch/alpha/include/asm/elf.h |
19752 |
+--- linux-2.6.38.4/arch/alpha/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
19753 |
++++ linux-2.6.38.4/arch/alpha/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
19754 |
@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
19755 |
|
19756 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) |
19757 |
@@ -30,9 +30,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/include/asm/elf.h linux-2.6.38.3/arch/alpha |
19758 |
/* $0 is set by ld.so to a pointer to a function which might be |
19759 |
registered using atexit. This provides a mean for the dynamic |
19760 |
linker to call DT_FINI functions for shared libraries that have |
19761 |
-diff -urNp linux-2.6.38.3/arch/alpha/include/asm/pgtable.h linux-2.6.38.3/arch/alpha/include/asm/pgtable.h |
19762 |
---- linux-2.6.38.3/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
19763 |
-+++ linux-2.6.38.3/arch/alpha/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
19764 |
+diff -urNp linux-2.6.38.4/arch/alpha/include/asm/pgtable.h linux-2.6.38.4/arch/alpha/include/asm/pgtable.h |
19765 |
+--- linux-2.6.38.4/arch/alpha/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
19766 |
++++ linux-2.6.38.4/arch/alpha/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
19767 |
@@ -101,6 +101,17 @@ struct vm_area_struct; |
19768 |
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) |
19769 |
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) |
19770 |
@@ -51,9 +51,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/include/asm/pgtable.h linux-2.6.38.3/arch/a |
19771 |
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) |
19772 |
|
19773 |
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) |
19774 |
-diff -urNp linux-2.6.38.3/arch/alpha/kernel/module.c linux-2.6.38.3/arch/alpha/kernel/module.c |
19775 |
---- linux-2.6.38.3/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
19776 |
-+++ linux-2.6.38.3/arch/alpha/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
19777 |
+diff -urNp linux-2.6.38.4/arch/alpha/kernel/module.c linux-2.6.38.4/arch/alpha/kernel/module.c |
19778 |
+--- linux-2.6.38.4/arch/alpha/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
19779 |
++++ linux-2.6.38.4/arch/alpha/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
19780 |
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, |
19781 |
|
19782 |
/* The small sections were sorted to the end of the segment. |
19783 |
@@ -63,9 +63,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/module.c linux-2.6.38.3/arch/alpha/k |
19784 |
got = sechdrs[me->arch.gotsecindex].sh_addr; |
19785 |
|
19786 |
for (i = 0; i < n; i++) { |
19787 |
-diff -urNp linux-2.6.38.3/arch/alpha/kernel/osf_sys.c linux-2.6.38.3/arch/alpha/kernel/osf_sys.c |
19788 |
---- linux-2.6.38.3/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.000000000 -0400 |
19789 |
-+++ linux-2.6.38.3/arch/alpha/kernel/osf_sys.c 2011-04-17 15:57:32.000000000 -0400 |
19790 |
+diff -urNp linux-2.6.38.4/arch/alpha/kernel/osf_sys.c linux-2.6.38.4/arch/alpha/kernel/osf_sys.c |
19791 |
+--- linux-2.6.38.4/arch/alpha/kernel/osf_sys.c 2011-03-14 21:20:32.000000000 -0400 |
19792 |
++++ linux-2.6.38.4/arch/alpha/kernel/osf_sys.c 2011-04-17 15:57:32.000000000 -0400 |
19793 |
@@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long a |
19794 |
/* At this point: (!vma || addr < vma->vm_end). */ |
19795 |
if (limit - len < addr) |
19796 |
@@ -97,9 +97,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/osf_sys.c linux-2.6.38.3/arch/alpha/ |
19797 |
if (addr != (unsigned long) -ENOMEM) |
19798 |
return addr; |
19799 |
|
19800 |
-diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c |
19801 |
---- linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
19802 |
-+++ linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
19803 |
+diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c |
19804 |
+--- linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
19805 |
++++ linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
19806 |
@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev |
19807 |
return 0; |
19808 |
} |
19809 |
@@ -116,9 +116,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci_iommu.c linux-2.6.38.3/arch/alph |
19810 |
-struct dma_map_ops *dma_ops = &alpha_pci_ops; |
19811 |
+const struct dma_map_ops *dma_ops = &alpha_pci_ops; |
19812 |
EXPORT_SYMBOL(dma_ops); |
19813 |
-diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci-noop.c linux-2.6.38.3/arch/alpha/kernel/pci-noop.c |
19814 |
---- linux-2.6.38.3/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.000000000 -0400 |
19815 |
-+++ linux-2.6.38.3/arch/alpha/kernel/pci-noop.c 2011-04-17 15:57:32.000000000 -0400 |
19816 |
+diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci-noop.c linux-2.6.38.4/arch/alpha/kernel/pci-noop.c |
19817 |
+--- linux-2.6.38.4/arch/alpha/kernel/pci-noop.c 2011-03-14 21:20:32.000000000 -0400 |
19818 |
++++ linux-2.6.38.4/arch/alpha/kernel/pci-noop.c 2011-04-17 15:57:32.000000000 -0400 |
19819 |
@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de |
19820 |
return 0; |
19821 |
} |
19822 |
@@ -137,9 +137,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/kernel/pci-noop.c linux-2.6.38.3/arch/alpha |
19823 |
EXPORT_SYMBOL(dma_ops); |
19824 |
|
19825 |
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) |
19826 |
-diff -urNp linux-2.6.38.3/arch/alpha/mm/fault.c linux-2.6.38.3/arch/alpha/mm/fault.c |
19827 |
---- linux-2.6.38.3/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
19828 |
-+++ linux-2.6.38.3/arch/alpha/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
19829 |
+diff -urNp linux-2.6.38.4/arch/alpha/mm/fault.c linux-2.6.38.4/arch/alpha/mm/fault.c |
19830 |
+--- linux-2.6.38.4/arch/alpha/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
19831 |
++++ linux-2.6.38.4/arch/alpha/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
19832 |
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * |
19833 |
__reload_thread(pcb); |
19834 |
} |
19835 |
@@ -296,9 +296,9 @@ diff -urNp linux-2.6.38.3/arch/alpha/mm/fault.c linux-2.6.38.3/arch/alpha/mm/fau |
19836 |
} else if (!cause) { |
19837 |
/* Allow reads even for write-only mappings */ |
19838 |
if (!(vma->vm_flags & (VM_READ | VM_WRITE))) |
19839 |
-diff -urNp linux-2.6.38.3/arch/arm/include/asm/elf.h linux-2.6.38.3/arch/arm/include/asm/elf.h |
19840 |
---- linux-2.6.38.3/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
19841 |
-+++ linux-2.6.38.3/arch/arm/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
19842 |
+diff -urNp linux-2.6.38.4/arch/arm/include/asm/elf.h linux-2.6.38.4/arch/arm/include/asm/elf.h |
19843 |
+--- linux-2.6.38.4/arch/arm/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
19844 |
++++ linux-2.6.38.4/arch/arm/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
19845 |
@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t |
19846 |
the loader. We need to make sure that it is out of the way of the program |
19847 |
that it will "exec", and that there is sufficient room for the brk. */ |
19848 |
@@ -326,9 +326,9 @@ diff -urNp linux-2.6.38.3/arch/arm/include/asm/elf.h linux-2.6.38.3/arch/arm/inc |
19849 |
extern int vectors_user_mapping(void); |
19850 |
#define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping() |
19851 |
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES |
19852 |
-diff -urNp linux-2.6.38.3/arch/arm/include/asm/kmap_types.h linux-2.6.38.3/arch/arm/include/asm/kmap_types.h |
19853 |
---- linux-2.6.38.3/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
19854 |
-+++ linux-2.6.38.3/arch/arm/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
19855 |
+diff -urNp linux-2.6.38.4/arch/arm/include/asm/kmap_types.h linux-2.6.38.4/arch/arm/include/asm/kmap_types.h |
19856 |
+--- linux-2.6.38.4/arch/arm/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
19857 |
++++ linux-2.6.38.4/arch/arm/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
19858 |
@@ -21,6 +21,7 @@ enum km_type { |
19859 |
KM_L1_CACHE, |
19860 |
KM_L2_CACHE, |
19861 |
@@ -337,9 +337,9 @@ diff -urNp linux-2.6.38.3/arch/arm/include/asm/kmap_types.h linux-2.6.38.3/arch/ |
19862 |
KM_TYPE_NR |
19863 |
}; |
19864 |
|
19865 |
-diff -urNp linux-2.6.38.3/arch/arm/include/asm/uaccess.h linux-2.6.38.3/arch/arm/include/asm/uaccess.h |
19866 |
---- linux-2.6.38.3/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
19867 |
-+++ linux-2.6.38.3/arch/arm/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
19868 |
+diff -urNp linux-2.6.38.4/arch/arm/include/asm/uaccess.h linux-2.6.38.4/arch/arm/include/asm/uaccess.h |
19869 |
+--- linux-2.6.38.4/arch/arm/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
19870 |
++++ linux-2.6.38.4/arch/arm/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
19871 |
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn |
19872 |
|
19873 |
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) |
19874 |
@@ -360,9 +360,9 @@ diff -urNp linux-2.6.38.3/arch/arm/include/asm/uaccess.h linux-2.6.38.3/arch/arm |
19875 |
if (access_ok(VERIFY_WRITE, to, n)) |
19876 |
n = __copy_to_user(to, from, n); |
19877 |
return n; |
19878 |
-diff -urNp linux-2.6.38.3/arch/arm/kernel/kgdb.c linux-2.6.38.3/arch/arm/kernel/kgdb.c |
19879 |
---- linux-2.6.38.3/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
19880 |
-+++ linux-2.6.38.3/arch/arm/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
19881 |
+diff -urNp linux-2.6.38.4/arch/arm/kernel/kgdb.c linux-2.6.38.4/arch/arm/kernel/kgdb.c |
19882 |
+--- linux-2.6.38.4/arch/arm/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
19883 |
++++ linux-2.6.38.4/arch/arm/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
19884 |
@@ -246,7 +246,7 @@ void kgdb_arch_exit(void) |
19885 |
* and we handle the normal undef case within the do_undefinstr |
19886 |
* handler. |
19887 |
@@ -372,9 +372,9 @@ diff -urNp linux-2.6.38.3/arch/arm/kernel/kgdb.c linux-2.6.38.3/arch/arm/kernel/ |
19888 |
#ifndef __ARMEB__ |
19889 |
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} |
19890 |
#else /* ! __ARMEB__ */ |
19891 |
-diff -urNp linux-2.6.38.3/arch/arm/kernel/process.c linux-2.6.38.3/arch/arm/kernel/process.c |
19892 |
---- linux-2.6.38.3/arch/arm/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
19893 |
-+++ linux-2.6.38.3/arch/arm/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
19894 |
+diff -urNp linux-2.6.38.4/arch/arm/kernel/process.c linux-2.6.38.4/arch/arm/kernel/process.c |
19895 |
+--- linux-2.6.38.4/arch/arm/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
19896 |
++++ linux-2.6.38.4/arch/arm/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
19897 |
@@ -28,7 +28,6 @@ |
19898 |
#include <linux/tick.h> |
19899 |
#include <linux/utsname.h> |
19900 |
@@ -396,9 +396,9 @@ diff -urNp linux-2.6.38.3/arch/arm/kernel/process.c linux-2.6.38.3/arch/arm/kern |
19901 |
#ifdef CONFIG_MMU |
19902 |
/* |
19903 |
* The vectors page is always readable from user space for the |
19904 |
-diff -urNp linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c |
19905 |
---- linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:32.000000000 -0400 |
19906 |
-+++ linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c 2011-04-17 15:57:32.000000000 -0400 |
19907 |
+diff -urNp linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c |
19908 |
+--- linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c 2011-03-14 21:20:32.000000000 -0400 |
19909 |
++++ linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c 2011-04-17 15:57:32.000000000 -0400 |
19910 |
@@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struc |
19911 |
return count; |
19912 |
} |
19913 |
@@ -408,9 +408,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.3/arch |
19914 |
.read = last_radio_log_read, |
19915 |
.llseek = default_llseek, |
19916 |
}; |
19917 |
-diff -urNp linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c |
19918 |
---- linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32.000000000 -0400 |
19919 |
-+++ linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c 2011-04-17 15:57:32.000000000 -0400 |
19920 |
+diff -urNp linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c |
19921 |
+--- linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c 2011-03-14 21:20:32.000000000 -0400 |
19922 |
++++ linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c 2011-04-17 15:57:32.000000000 -0400 |
19923 |
@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev |
19924 |
return sprintf(buf, "0x%X\n", mbox_value); |
19925 |
} |
19926 |
@@ -420,9 +420,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.3/arch/ |
19927 |
|
19928 |
static int mbox_show(struct seq_file *s, void *data) |
19929 |
{ |
19930 |
-diff -urNp linux-2.6.38.3/arch/arm/mm/fault.c linux-2.6.38.3/arch/arm/mm/fault.c |
19931 |
---- linux-2.6.38.3/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
19932 |
-+++ linux-2.6.38.3/arch/arm/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
19933 |
+diff -urNp linux-2.6.38.4/arch/arm/mm/fault.c linux-2.6.38.4/arch/arm/mm/fault.c |
19934 |
+--- linux-2.6.38.4/arch/arm/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
19935 |
++++ linux-2.6.38.4/arch/arm/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
19936 |
@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk, |
19937 |
} |
19938 |
#endif |
19939 |
@@ -471,9 +471,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mm/fault.c linux-2.6.38.3/arch/arm/mm/fault.c |
19940 |
/* |
19941 |
* First Level Translation Fault Handler |
19942 |
* |
19943 |
-diff -urNp linux-2.6.38.3/arch/arm/mm/mmap.c linux-2.6.38.3/arch/arm/mm/mmap.c |
19944 |
---- linux-2.6.38.3/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
19945 |
-+++ linux-2.6.38.3/arch/arm/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
19946 |
+diff -urNp linux-2.6.38.4/arch/arm/mm/mmap.c linux-2.6.38.4/arch/arm/mm/mmap.c |
19947 |
+--- linux-2.6.38.4/arch/arm/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
19948 |
++++ linux-2.6.38.4/arch/arm/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
19949 |
@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp |
19950 |
if (len > TASK_SIZE) |
19951 |
return -ENOMEM; |
19952 |
@@ -523,9 +523,9 @@ diff -urNp linux-2.6.38.3/arch/arm/mm/mmap.c linux-2.6.38.3/arch/arm/mm/mmap.c |
19953 |
/* |
19954 |
* Remember the place where we stopped the search: |
19955 |
*/ |
19956 |
-diff -urNp linux-2.6.38.3/arch/avr32/include/asm/elf.h linux-2.6.38.3/arch/avr32/include/asm/elf.h |
19957 |
---- linux-2.6.38.3/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
19958 |
-+++ linux-2.6.38.3/arch/avr32/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
19959 |
+diff -urNp linux-2.6.38.4/arch/avr32/include/asm/elf.h linux-2.6.38.4/arch/avr32/include/asm/elf.h |
19960 |
+--- linux-2.6.38.4/arch/avr32/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
19961 |
++++ linux-2.6.38.4/arch/avr32/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
19962 |
@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg |
19963 |
the loader. We need to make sure that it is out of the way of the program |
19964 |
that it will "exec", and that there is sufficient room for the brk. */ |
19965 |
@@ -542,9 +542,9 @@ diff -urNp linux-2.6.38.3/arch/avr32/include/asm/elf.h linux-2.6.38.3/arch/avr32 |
19966 |
|
19967 |
/* This yields a mask that user programs can use to figure out what |
19968 |
instruction set this CPU supports. This could be done in user space, |
19969 |
-diff -urNp linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h |
19970 |
---- linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
19971 |
-+++ linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
19972 |
+diff -urNp linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h |
19973 |
+--- linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
19974 |
++++ linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
19975 |
@@ -22,7 +22,8 @@ D(10) KM_IRQ0, |
19976 |
D(11) KM_IRQ1, |
19977 |
D(12) KM_SOFTIRQ0, |
19978 |
@@ -555,9 +555,9 @@ diff -urNp linux-2.6.38.3/arch/avr32/include/asm/kmap_types.h linux-2.6.38.3/arc |
19979 |
}; |
19980 |
|
19981 |
#undef D |
19982 |
-diff -urNp linux-2.6.38.3/arch/avr32/mm/fault.c linux-2.6.38.3/arch/avr32/mm/fault.c |
19983 |
---- linux-2.6.38.3/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
19984 |
-+++ linux-2.6.38.3/arch/avr32/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
19985 |
+diff -urNp linux-2.6.38.4/arch/avr32/mm/fault.c linux-2.6.38.4/arch/avr32/mm/fault.c |
19986 |
+--- linux-2.6.38.4/arch/avr32/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
19987 |
++++ linux-2.6.38.4/arch/avr32/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
19988 |
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru |
19989 |
|
19990 |
int exception_trace = 1; |
19991 |
@@ -599,9 +599,9 @@ diff -urNp linux-2.6.38.3/arch/avr32/mm/fault.c linux-2.6.38.3/arch/avr32/mm/fau |
19992 |
if (exception_trace && printk_ratelimit()) |
19993 |
printk("%s%s[%d]: segfault at %08lx pc %08lx " |
19994 |
"sp %08lx ecr %lu\n", |
19995 |
-diff -urNp linux-2.6.38.3/arch/blackfin/kernel/kgdb.c linux-2.6.38.3/arch/blackfin/kernel/kgdb.c |
19996 |
---- linux-2.6.38.3/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
19997 |
-+++ linux-2.6.38.3/arch/blackfin/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
19998 |
+diff -urNp linux-2.6.38.4/arch/blackfin/kernel/kgdb.c linux-2.6.38.4/arch/blackfin/kernel/kgdb.c |
19999 |
+--- linux-2.6.38.4/arch/blackfin/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
20000 |
++++ linux-2.6.38.4/arch/blackfin/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
20001 |
@@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vecto |
20002 |
return -1; /* this means that we do not want to exit from the handler */ |
20003 |
} |
20004 |
@@ -611,9 +611,9 @@ diff -urNp linux-2.6.38.3/arch/blackfin/kernel/kgdb.c linux-2.6.38.3/arch/blackf |
20005 |
.gdb_bpt_instr = {0xa1}, |
20006 |
#ifdef CONFIG_SMP |
20007 |
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, |
20008 |
-diff -urNp linux-2.6.38.3/arch/blackfin/mm/maccess.c linux-2.6.38.3/arch/blackfin/mm/maccess.c |
20009 |
---- linux-2.6.38.3/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 |
20010 |
-+++ linux-2.6.38.3/arch/blackfin/mm/maccess.c 2011-04-17 15:57:32.000000000 -0400 |
20011 |
+diff -urNp linux-2.6.38.4/arch/blackfin/mm/maccess.c linux-2.6.38.4/arch/blackfin/mm/maccess.c |
20012 |
+--- linux-2.6.38.4/arch/blackfin/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 |
20013 |
++++ linux-2.6.38.4/arch/blackfin/mm/maccess.c 2011-04-17 15:57:32.000000000 -0400 |
20014 |
@@ -16,7 +16,7 @@ static int validate_memory_access_addres |
20015 |
return bfin_mem_access_type(addr, size); |
20016 |
} |
20017 |
@@ -632,9 +632,9 @@ diff -urNp linux-2.6.38.3/arch/blackfin/mm/maccess.c linux-2.6.38.3/arch/blackfi |
20018 |
{ |
20019 |
unsigned long ldst = (unsigned long)dst; |
20020 |
int mem_type; |
20021 |
-diff -urNp linux-2.6.38.3/arch/frv/include/asm/kmap_types.h linux-2.6.38.3/arch/frv/include/asm/kmap_types.h |
20022 |
---- linux-2.6.38.3/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
20023 |
-+++ linux-2.6.38.3/arch/frv/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
20024 |
+diff -urNp linux-2.6.38.4/arch/frv/include/asm/kmap_types.h linux-2.6.38.4/arch/frv/include/asm/kmap_types.h |
20025 |
+--- linux-2.6.38.4/arch/frv/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
20026 |
++++ linux-2.6.38.4/arch/frv/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
20027 |
@@ -23,6 +23,7 @@ enum km_type { |
20028 |
KM_IRQ1, |
20029 |
KM_SOFTIRQ0, |
20030 |
@@ -643,9 +643,9 @@ diff -urNp linux-2.6.38.3/arch/frv/include/asm/kmap_types.h linux-2.6.38.3/arch/ |
20031 |
KM_TYPE_NR |
20032 |
}; |
20033 |
|
20034 |
-diff -urNp linux-2.6.38.3/arch/frv/mm/elf-fdpic.c linux-2.6.38.3/arch/frv/mm/elf-fdpic.c |
20035 |
---- linux-2.6.38.3/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000 -0400 |
20036 |
-+++ linux-2.6.38.3/arch/frv/mm/elf-fdpic.c 2011-04-17 15:57:32.000000000 -0400 |
20037 |
+diff -urNp linux-2.6.38.4/arch/frv/mm/elf-fdpic.c linux-2.6.38.4/arch/frv/mm/elf-fdpic.c |
20038 |
+--- linux-2.6.38.4/arch/frv/mm/elf-fdpic.c 2011-03-14 21:20:32.000000000 -0400 |
20039 |
++++ linux-2.6.38.4/arch/frv/mm/elf-fdpic.c 2011-04-17 15:57:32.000000000 -0400 |
20040 |
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str |
20041 |
if (addr) { |
20042 |
addr = PAGE_ALIGN(addr); |
20043 |
@@ -674,9 +674,9 @@ diff -urNp linux-2.6.38.3/arch/frv/mm/elf-fdpic.c linux-2.6.38.3/arch/frv/mm/elf |
20044 |
goto success; |
20045 |
addr = vma->vm_end; |
20046 |
} |
20047 |
-diff -urNp linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c |
20048 |
---- linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
20049 |
-+++ linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
20050 |
+diff -urNp linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c |
20051 |
+--- linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
20052 |
++++ linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
20053 |
@@ -17,7 +17,7 @@ |
20054 |
#include <linux/swiotlb.h> |
20055 |
#include <asm/machvec.h> |
20056 |
@@ -695,9 +695,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.3/arch/i |
20057 |
{ |
20058 |
if (use_swiotlb(dev)) |
20059 |
return &swiotlb_dma_ops; |
20060 |
-diff -urNp linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c |
20061 |
---- linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
20062 |
-+++ linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
20063 |
+diff -urNp linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c |
20064 |
+--- linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
20065 |
++++ linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
20066 |
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d |
20067 |
}, |
20068 |
}; |
20069 |
@@ -716,9 +716,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.3/arch/ia |
20070 |
.alloc_coherent = sba_alloc_coherent, |
20071 |
.free_coherent = sba_free_coherent, |
20072 |
.map_page = sba_map_page, |
20073 |
-diff -urNp linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h |
20074 |
---- linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20075 |
-+++ linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20076 |
+diff -urNp linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h |
20077 |
+--- linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20078 |
++++ linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20079 |
@@ -12,7 +12,7 @@ |
20080 |
|
20081 |
#define ARCH_HAS_DMA_GET_REQUIRED_MASK |
20082 |
@@ -762,9 +762,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.3/arc |
20083 |
return ops->dma_supported(dev, mask); |
20084 |
} |
20085 |
|
20086 |
-diff -urNp linux-2.6.38.3/arch/ia64/include/asm/elf.h linux-2.6.38.3/arch/ia64/include/asm/elf.h |
20087 |
---- linux-2.6.38.3/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20088 |
-+++ linux-2.6.38.3/arch/ia64/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20089 |
+diff -urNp linux-2.6.38.4/arch/ia64/include/asm/elf.h linux-2.6.38.4/arch/ia64/include/asm/elf.h |
20090 |
+--- linux-2.6.38.4/arch/ia64/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20091 |
++++ linux-2.6.38.4/arch/ia64/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20092 |
@@ -42,6 +42,13 @@ |
20093 |
*/ |
20094 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) |
20095 |
@@ -779,9 +779,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/elf.h linux-2.6.38.3/arch/ia64/i |
20096 |
#define PT_IA_64_UNWIND 0x70000001 |
20097 |
|
20098 |
/* IA-64 relocations: */ |
20099 |
-diff -urNp linux-2.6.38.3/arch/ia64/include/asm/machvec.h linux-2.6.38.3/arch/ia64/include/asm/machvec.h |
20100 |
---- linux-2.6.38.3/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.000000000 -0400 |
20101 |
-+++ linux-2.6.38.3/arch/ia64/include/asm/machvec.h 2011-04-17 15:57:32.000000000 -0400 |
20102 |
+diff -urNp linux-2.6.38.4/arch/ia64/include/asm/machvec.h linux-2.6.38.4/arch/ia64/include/asm/machvec.h |
20103 |
+--- linux-2.6.38.4/arch/ia64/include/asm/machvec.h 2011-03-14 21:20:32.000000000 -0400 |
20104 |
++++ linux-2.6.38.4/arch/ia64/include/asm/machvec.h 2011-04-17 15:57:32.000000000 -0400 |
20105 |
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event |
20106 |
/* DMA-mapping interface: */ |
20107 |
typedef void ia64_mv_dma_init (void); |
20108 |
@@ -800,9 +800,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/machvec.h linux-2.6.38.3/arch/ia |
20109 |
|
20110 |
/* |
20111 |
* Define default versions so we can extend machvec for new platforms without having |
20112 |
-diff -urNp linux-2.6.38.3/arch/ia64/include/asm/pgtable.h linux-2.6.38.3/arch/ia64/include/asm/pgtable.h |
20113 |
---- linux-2.6.38.3/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
20114 |
-+++ linux-2.6.38.3/arch/ia64/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
20115 |
+diff -urNp linux-2.6.38.4/arch/ia64/include/asm/pgtable.h linux-2.6.38.4/arch/ia64/include/asm/pgtable.h |
20116 |
+--- linux-2.6.38.4/arch/ia64/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
20117 |
++++ linux-2.6.38.4/arch/ia64/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
20118 |
@@ -12,7 +12,7 @@ |
20119 |
* David Mosberger-Tang <davidm@××××××.com> |
20120 |
*/ |
20121 |
@@ -830,9 +830,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/pgtable.h linux-2.6.38.3/arch/ia |
20122 |
#define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) |
20123 |
#define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) |
20124 |
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) |
20125 |
-diff -urNp linux-2.6.38.3/arch/ia64/include/asm/spinlock.h linux-2.6.38.3/arch/ia64/include/asm/spinlock.h |
20126 |
---- linux-2.6.38.3/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400 |
20127 |
-+++ linux-2.6.38.3/arch/ia64/include/asm/spinlock.h 2011-04-17 15:57:32.000000000 -0400 |
20128 |
+diff -urNp linux-2.6.38.4/arch/ia64/include/asm/spinlock.h linux-2.6.38.4/arch/ia64/include/asm/spinlock.h |
20129 |
+--- linux-2.6.38.4/arch/ia64/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400 |
20130 |
++++ linux-2.6.38.4/arch/ia64/include/asm/spinlock.h 2011-04-17 15:57:32.000000000 -0400 |
20131 |
@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi |
20132 |
unsigned short *p = (unsigned short *)&lock->lock + 1, tmp; |
20133 |
|
20134 |
@@ -842,9 +842,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/spinlock.h linux-2.6.38.3/arch/i |
20135 |
} |
20136 |
|
20137 |
static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock) |
20138 |
-diff -urNp linux-2.6.38.3/arch/ia64/include/asm/uaccess.h linux-2.6.38.3/arch/ia64/include/asm/uaccess.h |
20139 |
---- linux-2.6.38.3/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
20140 |
-+++ linux-2.6.38.3/arch/ia64/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
20141 |
+diff -urNp linux-2.6.38.4/arch/ia64/include/asm/uaccess.h linux-2.6.38.4/arch/ia64/include/asm/uaccess.h |
20142 |
+--- linux-2.6.38.4/arch/ia64/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
20143 |
++++ linux-2.6.38.4/arch/ia64/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
20144 |
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ |
20145 |
const void *__cu_from = (from); \ |
20146 |
long __cu_len = (n); \ |
20147 |
@@ -863,9 +863,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/include/asm/uaccess.h linux-2.6.38.3/arch/ia |
20148 |
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ |
20149 |
__cu_len; \ |
20150 |
}) |
20151 |
-diff -urNp linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c |
20152 |
---- linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.000000000 -0400 |
20153 |
-+++ linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:57:32.000000000 -0400 |
20154 |
+diff -urNp linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c |
20155 |
+--- linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c 2011-03-14 21:20:32.000000000 -0400 |
20156 |
++++ linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:57:32.000000000 -0400 |
20157 |
@@ -3,7 +3,7 @@ |
20158 |
/* Set this to 1 if there is a HW IOMMU in the system */ |
20159 |
int iommu_detected __read_mostly; |
20160 |
@@ -884,9 +884,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/dma-mapping.c linux-2.6.38.3/arch/ia6 |
20161 |
{ |
20162 |
return dma_ops; |
20163 |
} |
20164 |
-diff -urNp linux-2.6.38.3/arch/ia64/kernel/module.c linux-2.6.38.3/arch/ia64/kernel/module.c |
20165 |
---- linux-2.6.38.3/arch/ia64/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
20166 |
-+++ linux-2.6.38.3/arch/ia64/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
20167 |
+diff -urNp linux-2.6.38.4/arch/ia64/kernel/module.c linux-2.6.38.4/arch/ia64/kernel/module.c |
20168 |
+--- linux-2.6.38.4/arch/ia64/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
20169 |
++++ linux-2.6.38.4/arch/ia64/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
20170 |
@@ -315,8 +315,7 @@ module_alloc (unsigned long size) |
20171 |
void |
20172 |
module_free (struct module *mod, void *module_region) |
20173 |
@@ -975,9 +975,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/module.c linux-2.6.38.3/arch/ia64/ker |
20174 |
mod->arch.gp = gp; |
20175 |
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); |
20176 |
} |
20177 |
-diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-dma.c linux-2.6.38.3/arch/ia64/kernel/pci-dma.c |
20178 |
---- linux-2.6.38.3/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400 |
20179 |
-+++ linux-2.6.38.3/arch/ia64/kernel/pci-dma.c 2011-04-17 15:57:32.000000000 -0400 |
20180 |
+diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-dma.c linux-2.6.38.4/arch/ia64/kernel/pci-dma.c |
20181 |
+--- linux-2.6.38.4/arch/ia64/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400 |
20182 |
++++ linux-2.6.38.4/arch/ia64/kernel/pci-dma.c 2011-04-17 15:57:32.000000000 -0400 |
20183 |
@@ -43,7 +43,7 @@ struct device fallback_dev = { |
20184 |
.dma_mask = &fallback_dev.coherent_dma_mask, |
20185 |
}; |
20186 |
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-dma.c linux-2.6.38.3/arch/ia64/ke |
20187 |
|
20188 |
static int __init pci_iommu_init(void) |
20189 |
{ |
20190 |
-diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c |
20191 |
---- linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 |
20192 |
-+++ linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:57:32.000000000 -0400 |
20193 |
+diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c |
20194 |
+--- linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 |
20195 |
++++ linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:57:32.000000000 -0400 |
20196 |
@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent |
20197 |
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); |
20198 |
} |
20199 |
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.3/arch/ia6 |
20200 |
.alloc_coherent = ia64_swiotlb_alloc_coherent, |
20201 |
.free_coherent = swiotlb_free_coherent, |
20202 |
.map_page = swiotlb_map_page, |
20203 |
-diff -urNp linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c |
20204 |
---- linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.000000000 -0400 |
20205 |
-+++ linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:57:32.000000000 -0400 |
20206 |
+diff -urNp linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c |
20207 |
+--- linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c 2011-03-14 21:20:32.000000000 -0400 |
20208 |
++++ linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:57:32.000000000 -0400 |
20209 |
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil |
20210 |
if (REGION_NUMBER(addr) == RGN_HPAGE) |
20211 |
addr = 0; |
20212 |
@@ -1034,9 +1034,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/sys_ia64.c linux-2.6.38.3/arch/ia64/k |
20213 |
/* Remember the address where we stopped this search: */ |
20214 |
mm->free_area_cache = addr + len; |
20215 |
return addr; |
20216 |
-diff -urNp linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S |
20217 |
---- linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400 |
20218 |
-+++ linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:57:32.000000000 -0400 |
20219 |
+diff -urNp linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S |
20220 |
+--- linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400 |
20221 |
++++ linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:57:32.000000000 -0400 |
20222 |
@@ -199,7 +199,7 @@ SECTIONS { |
20223 |
/* Per-cpu data: */ |
20224 |
. = ALIGN(PERCPU_PAGE_SIZE); |
20225 |
@@ -1046,9 +1046,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.3/arch/ia6 |
20226 |
/* |
20227 |
* ensure percpu data fits |
20228 |
* into percpu page size |
20229 |
-diff -urNp linux-2.6.38.3/arch/ia64/mm/fault.c linux-2.6.38.3/arch/ia64/mm/fault.c |
20230 |
---- linux-2.6.38.3/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
20231 |
-+++ linux-2.6.38.3/arch/ia64/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
20232 |
+diff -urNp linux-2.6.38.4/arch/ia64/mm/fault.c linux-2.6.38.4/arch/ia64/mm/fault.c |
20233 |
+--- linux-2.6.38.4/arch/ia64/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
20234 |
++++ linux-2.6.38.4/arch/ia64/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
20235 |
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned |
20236 |
return pte_present(pte); |
20237 |
} |
20238 |
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/mm/fault.c linux-2.6.38.3/arch/ia64/mm/fault |
20239 |
/* |
20240 |
* If for any reason at all we couldn't handle the fault, make |
20241 |
* sure we exit gracefully rather than endlessly redo the |
20242 |
-diff -urNp linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c |
20243 |
---- linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 |
20244 |
-+++ linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:57:32.000000000 -0400 |
20245 |
+diff -urNp linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c |
20246 |
+--- linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 |
20247 |
++++ linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:57:32.000000000 -0400 |
20248 |
@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area( |
20249 |
/* At this point: (!vmm || addr < vmm->vm_end). */ |
20250 |
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) |
20251 |
@@ -1110,9 +1110,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/mm/hugetlbpage.c linux-2.6.38.3/arch/ia64/mm |
20252 |
return addr; |
20253 |
addr = ALIGN(vmm->vm_end, HPAGE_SIZE); |
20254 |
} |
20255 |
-diff -urNp linux-2.6.38.3/arch/ia64/mm/init.c linux-2.6.38.3/arch/ia64/mm/init.c |
20256 |
---- linux-2.6.38.3/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -0400 |
20257 |
-+++ linux-2.6.38.3/arch/ia64/mm/init.c 2011-04-17 15:57:32.000000000 -0400 |
20258 |
+diff -urNp linux-2.6.38.4/arch/ia64/mm/init.c linux-2.6.38.4/arch/ia64/mm/init.c |
20259 |
+--- linux-2.6.38.4/arch/ia64/mm/init.c 2011-03-14 21:20:32.000000000 -0400 |
20260 |
++++ linux-2.6.38.4/arch/ia64/mm/init.c 2011-04-17 15:57:32.000000000 -0400 |
20261 |
@@ -122,6 +122,19 @@ ia64_init_addr_space (void) |
20262 |
vma->vm_start = current->thread.rbs_bot & PAGE_MASK; |
20263 |
vma->vm_end = vma->vm_start + PAGE_SIZE; |
20264 |
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/mm/init.c linux-2.6.38.3/arch/ia64/mm/init.c |
20265 |
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
20266 |
down_write(¤t->mm->mmap_sem); |
20267 |
if (insert_vm_struct(current->mm, vma)) { |
20268 |
-diff -urNp linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c |
20269 |
---- linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000000 -0400 |
20270 |
-+++ linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:57:32.000000000 -0400 |
20271 |
+diff -urNp linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c |
20272 |
+--- linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c 2011-03-14 21:20:32.000000000 -0400 |
20273 |
++++ linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:57:32.000000000 -0400 |
20274 |
@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus * |
20275 |
return ret; |
20276 |
} |
20277 |
@@ -1145,9 +1145,9 @@ diff -urNp linux-2.6.38.3/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.3/arch/ia64/sn |
20278 |
.alloc_coherent = sn_dma_alloc_coherent, |
20279 |
.free_coherent = sn_dma_free_coherent, |
20280 |
.map_page = sn_dma_map_page, |
20281 |
-diff -urNp linux-2.6.38.3/arch/m32r/lib/usercopy.c linux-2.6.38.3/arch/m32r/lib/usercopy.c |
20282 |
---- linux-2.6.38.3/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.000000000 -0400 |
20283 |
-+++ linux-2.6.38.3/arch/m32r/lib/usercopy.c 2011-04-17 15:57:32.000000000 -0400 |
20284 |
+diff -urNp linux-2.6.38.4/arch/m32r/lib/usercopy.c linux-2.6.38.4/arch/m32r/lib/usercopy.c |
20285 |
+--- linux-2.6.38.4/arch/m32r/lib/usercopy.c 2011-03-14 21:20:32.000000000 -0400 |
20286 |
++++ linux-2.6.38.4/arch/m32r/lib/usercopy.c 2011-04-17 15:57:32.000000000 -0400 |
20287 |
@@ -14,6 +14,9 @@ |
20288 |
unsigned long |
20289 |
__generic_copy_to_user(void __user *to, const void *from, unsigned long n) |
20290 |
@@ -1168,9 +1168,9 @@ diff -urNp linux-2.6.38.3/arch/m32r/lib/usercopy.c linux-2.6.38.3/arch/m32r/lib/ |
20291 |
prefetchw(to); |
20292 |
if (access_ok(VERIFY_READ, from, n)) |
20293 |
__copy_user_zeroing(to,from,n); |
20294 |
-diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/device.h linux-2.6.38.3/arch/microblaze/include/asm/device.h |
20295 |
---- linux-2.6.38.3/arch/microblaze/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
20296 |
-+++ linux-2.6.38.3/arch/microblaze/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
20297 |
+diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/device.h linux-2.6.38.4/arch/microblaze/include/asm/device.h |
20298 |
+--- linux-2.6.38.4/arch/microblaze/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
20299 |
++++ linux-2.6.38.4/arch/microblaze/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
20300 |
@@ -13,7 +13,7 @@ struct device_node; |
20301 |
|
20302 |
struct dev_archdata { |
20303 |
@@ -1180,9 +1180,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/device.h linux-2.6.38.3/ar |
20304 |
void *dma_data; |
20305 |
}; |
20306 |
|
20307 |
-diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h |
20308 |
---- linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20309 |
-+++ linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20310 |
+diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h |
20311 |
+--- linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20312 |
++++ linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20313 |
@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma |
20314 |
return 0xfffffffful; |
20315 |
} |
20316 |
@@ -1254,9 +1254,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38 |
20317 |
|
20318 |
BUG_ON(!ops); |
20319 |
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); |
20320 |
-diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/pci.h linux-2.6.38.3/arch/microblaze/include/asm/pci.h |
20321 |
---- linux-2.6.38.3/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400 |
20322 |
-+++ linux-2.6.38.3/arch/microblaze/include/asm/pci.h 2011-04-17 15:57:32.000000000 -0400 |
20323 |
+diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/pci.h linux-2.6.38.4/arch/microblaze/include/asm/pci.h |
20324 |
+--- linux-2.6.38.4/arch/microblaze/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400 |
20325 |
++++ linux-2.6.38.4/arch/microblaze/include/asm/pci.h 2011-04-17 15:57:32.000000000 -0400 |
20326 |
@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_ |
20327 |
} |
20328 |
|
20329 |
@@ -1268,9 +1268,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/include/asm/pci.h linux-2.6.38.3/arch/ |
20330 |
#else /* CONFIG_PCI */ |
20331 |
#define set_pci_dma_ops(d) |
20332 |
#define get_pci_dma_ops() NULL |
20333 |
-diff -urNp linux-2.6.38.3/arch/microblaze/kernel/dma.c linux-2.6.38.3/arch/microblaze/kernel/dma.c |
20334 |
---- linux-2.6.38.3/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400 |
20335 |
-+++ linux-2.6.38.3/arch/microblaze/kernel/dma.c 2011-04-17 15:57:32.000000000 -0400 |
20336 |
+diff -urNp linux-2.6.38.4/arch/microblaze/kernel/dma.c linux-2.6.38.4/arch/microblaze/kernel/dma.c |
20337 |
+--- linux-2.6.38.4/arch/microblaze/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400 |
20338 |
++++ linux-2.6.38.4/arch/microblaze/kernel/dma.c 2011-04-17 15:57:32.000000000 -0400 |
20339 |
@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page |
20340 |
__dma_sync_page(dma_address, 0 , size, direction); |
20341 |
} |
20342 |
@@ -1280,9 +1280,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/kernel/dma.c linux-2.6.38.3/arch/micro |
20343 |
.alloc_coherent = dma_direct_alloc_coherent, |
20344 |
.free_coherent = dma_direct_free_coherent, |
20345 |
.map_sg = dma_direct_map_sg, |
20346 |
-diff -urNp linux-2.6.38.3/arch/microblaze/kernel/kgdb.c linux-2.6.38.3/arch/microblaze/kernel/kgdb.c |
20347 |
---- linux-2.6.38.3/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
20348 |
-+++ linux-2.6.38.3/arch/microblaze/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
20349 |
+diff -urNp linux-2.6.38.4/arch/microblaze/kernel/kgdb.c linux-2.6.38.4/arch/microblaze/kernel/kgdb.c |
20350 |
+--- linux-2.6.38.4/arch/microblaze/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
20351 |
++++ linux-2.6.38.4/arch/microblaze/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
20352 |
@@ -141,10 +141,11 @@ void kgdb_arch_exit(void) |
20353 |
/* |
20354 |
* Global data |
20355 |
@@ -1296,9 +1296,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/kernel/kgdb.c linux-2.6.38.3/arch/micr |
20356 |
.gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */ |
20357 |
#endif |
20358 |
}; |
20359 |
-diff -urNp linux-2.6.38.3/arch/microblaze/pci/pci-common.c linux-2.6.38.3/arch/microblaze/pci/pci-common.c |
20360 |
---- linux-2.6.38.3/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.000000000 -0400 |
20361 |
-+++ linux-2.6.38.3/arch/microblaze/pci/pci-common.c 2011-04-17 15:57:32.000000000 -0400 |
20362 |
+diff -urNp linux-2.6.38.4/arch/microblaze/pci/pci-common.c linux-2.6.38.4/arch/microblaze/pci/pci-common.c |
20363 |
+--- linux-2.6.38.4/arch/microblaze/pci/pci-common.c 2011-03-14 21:20:32.000000000 -0400 |
20364 |
++++ linux-2.6.38.4/arch/microblaze/pci/pci-common.c 2011-04-17 15:57:32.000000000 -0400 |
20365 |
@@ -47,14 +47,14 @@ resource_size_t isa_mem_base; |
20366 |
/* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */ |
20367 |
unsigned int pci_flags; |
20368 |
@@ -1317,9 +1317,9 @@ diff -urNp linux-2.6.38.3/arch/microblaze/pci/pci-common.c linux-2.6.38.3/arch/m |
20369 |
{ |
20370 |
return pci_dma_ops; |
20371 |
} |
20372 |
-diff -urNp linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c |
20373 |
---- linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20:32.000000000 -0400 |
20374 |
-+++ linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c 2011-04-17 15:57:32.000000000 -0400 |
20375 |
+diff -urNp linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c |
20376 |
+--- linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c 2011-03-14 21:20:32.000000000 -0400 |
20377 |
++++ linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c 2011-04-17 15:57:32.000000000 -0400 |
20378 |
@@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p |
20379 |
} |
20380 |
|
20381 |
@@ -1338,9 +1338,9 @@ diff -urNp linux-2.6.38.3/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.3/ar |
20382 |
|
20383 |
void __init octeon_pci_dma_init(void) |
20384 |
{ |
20385 |
-diff -urNp linux-2.6.38.3/arch/mips/include/asm/device.h linux-2.6.38.3/arch/mips/include/asm/device.h |
20386 |
---- linux-2.6.38.3/arch/mips/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
20387 |
-+++ linux-2.6.38.3/arch/mips/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
20388 |
+diff -urNp linux-2.6.38.4/arch/mips/include/asm/device.h linux-2.6.38.4/arch/mips/include/asm/device.h |
20389 |
+--- linux-2.6.38.4/arch/mips/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
20390 |
++++ linux-2.6.38.4/arch/mips/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
20391 |
@@ -10,7 +10,7 @@ struct dma_map_ops; |
20392 |
|
20393 |
struct dev_archdata { |
20394 |
@@ -1350,9 +1350,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/device.h linux-2.6.38.3/arch/mip |
20395 |
}; |
20396 |
|
20397 |
struct pdev_archdata { |
20398 |
-diff -urNp linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h |
20399 |
---- linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20400 |
-+++ linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20401 |
+diff -urNp linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h |
20402 |
+--- linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20403 |
++++ linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20404 |
@@ -7,9 +7,9 @@ |
20405 |
|
20406 |
#include <dma-coherence.h> |
20407 |
@@ -1399,9 +1399,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/dma-mapping.h linux-2.6.38.3/arc |
20408 |
|
20409 |
ops->free_coherent(dev, size, vaddr, dma_handle); |
20410 |
|
20411 |
-diff -urNp linux-2.6.38.3/arch/mips/include/asm/elf.h linux-2.6.38.3/arch/mips/include/asm/elf.h |
20412 |
---- linux-2.6.38.3/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20413 |
-+++ linux-2.6.38.3/arch/mips/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20414 |
+diff -urNp linux-2.6.38.4/arch/mips/include/asm/elf.h linux-2.6.38.4/arch/mips/include/asm/elf.h |
20415 |
+--- linux-2.6.38.4/arch/mips/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20416 |
++++ linux-2.6.38.4/arch/mips/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20417 |
@@ -372,13 +372,16 @@ extern const char *__elf_platform; |
20418 |
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) |
20419 |
#endif |
20420 |
@@ -1423,9 +1423,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/elf.h linux-2.6.38.3/arch/mips/i |
20421 |
-#define arch_randomize_brk arch_randomize_brk |
20422 |
- |
20423 |
#endif /* _ASM_ELF_H */ |
20424 |
-diff -urNp linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h |
20425 |
---- linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-14 21:20:32.000000000 -0400 |
20426 |
-+++ linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-04-17 15:57:32.000000000 -0400 |
20427 |
+diff -urNp linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h |
20428 |
+--- linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-03-14 21:20:32.000000000 -0400 |
20429 |
++++ linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h 2011-04-17 15:57:32.000000000 -0400 |
20430 |
@@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de |
20431 |
phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); |
20432 |
|
20433 |
@@ -1435,9 +1435,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/mach-cavium-octeon/dma-coherence |
20434 |
extern char *octeon_swiotlb; |
20435 |
|
20436 |
#endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */ |
20437 |
-diff -urNp linux-2.6.38.3/arch/mips/include/asm/page.h linux-2.6.38.3/arch/mips/include/asm/page.h |
20438 |
---- linux-2.6.38.3/arch/mips/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 |
20439 |
-+++ linux-2.6.38.3/arch/mips/include/asm/page.h 2011-04-17 15:57:32.000000000 -0400 |
20440 |
+diff -urNp linux-2.6.38.4/arch/mips/include/asm/page.h linux-2.6.38.4/arch/mips/include/asm/page.h |
20441 |
+--- linux-2.6.38.4/arch/mips/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 |
20442 |
++++ linux-2.6.38.4/arch/mips/include/asm/page.h 2011-04-17 15:57:32.000000000 -0400 |
20443 |
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa |
20444 |
#ifdef CONFIG_CPU_MIPS32 |
20445 |
typedef struct { unsigned long pte_low, pte_high; } pte_t; |
20446 |
@@ -1447,9 +1447,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/page.h linux-2.6.38.3/arch/mips/ |
20447 |
#else |
20448 |
typedef struct { unsigned long long pte; } pte_t; |
20449 |
#define pte_val(x) ((x).pte) |
20450 |
-diff -urNp linux-2.6.38.3/arch/mips/include/asm/system.h linux-2.6.38.3/arch/mips/include/asm/system.h |
20451 |
---- linux-2.6.38.3/arch/mips/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
20452 |
-+++ linux-2.6.38.3/arch/mips/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
20453 |
+diff -urNp linux-2.6.38.4/arch/mips/include/asm/system.h linux-2.6.38.4/arch/mips/include/asm/system.h |
20454 |
+--- linux-2.6.38.4/arch/mips/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
20455 |
++++ linux-2.6.38.4/arch/mips/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
20456 |
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); |
20457 |
*/ |
20458 |
#define __ARCH_WANT_UNLOCKED_CTXSW |
20459 |
@@ -1458,9 +1458,9 @@ diff -urNp linux-2.6.38.3/arch/mips/include/asm/system.h linux-2.6.38.3/arch/mip |
20460 |
+#define arch_align_stack(x) ((x) & ~0xfUL) |
20461 |
|
20462 |
#endif /* _ASM_SYSTEM_H */ |
20463 |
-diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c |
20464 |
---- linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.000000000 -0400 |
20465 |
-+++ linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:57:32.000000000 -0400 |
20466 |
+diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c |
20467 |
+--- linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c 2011-03-14 21:20:32.000000000 -0400 |
20468 |
++++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:57:32.000000000 -0400 |
20469 |
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
20470 |
#undef ELF_ET_DYN_BASE |
20471 |
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
20472 |
@@ -1475,9 +1475,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.3/arch/m |
20473 |
#include <asm/processor.h> |
20474 |
#include <linux/module.h> |
20475 |
#include <linux/elfcore.h> |
20476 |
-diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c |
20477 |
---- linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.000000000 -0400 |
20478 |
-+++ linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:57:32.000000000 -0400 |
20479 |
+diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c |
20480 |
+--- linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c 2011-03-14 21:20:32.000000000 -0400 |
20481 |
++++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:57:32.000000000 -0400 |
20482 |
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N |
20483 |
#undef ELF_ET_DYN_BASE |
20484 |
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |
20485 |
@@ -1492,9 +1492,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.3/arch/m |
20486 |
#include <asm/processor.h> |
20487 |
|
20488 |
/* |
20489 |
-diff -urNp linux-2.6.38.3/arch/mips/kernel/kgdb.c linux-2.6.38.3/arch/mips/kernel/kgdb.c |
20490 |
---- linux-2.6.38.3/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
20491 |
-+++ linux-2.6.38.3/arch/mips/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
20492 |
+diff -urNp linux-2.6.38.4/arch/mips/kernel/kgdb.c linux-2.6.38.4/arch/mips/kernel/kgdb.c |
20493 |
+--- linux-2.6.38.4/arch/mips/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
20494 |
++++ linux-2.6.38.4/arch/mips/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
20495 |
@@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto |
20496 |
return -1; |
20497 |
} |
20498 |
@@ -1504,9 +1504,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/kgdb.c linux-2.6.38.3/arch/mips/kerne |
20499 |
|
20500 |
/* |
20501 |
* We use kgdb_early_setup so that functions we need to call now don't |
20502 |
-diff -urNp linux-2.6.38.3/arch/mips/kernel/process.c linux-2.6.38.3/arch/mips/kernel/process.c |
20503 |
---- linux-2.6.38.3/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
20504 |
-+++ linux-2.6.38.3/arch/mips/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
20505 |
+diff -urNp linux-2.6.38.4/arch/mips/kernel/process.c linux-2.6.38.4/arch/mips/kernel/process.c |
20506 |
+--- linux-2.6.38.4/arch/mips/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
20507 |
++++ linux-2.6.38.4/arch/mips/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
20508 |
@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru |
20509 |
out: |
20510 |
return pc; |
20511 |
@@ -1523,9 +1523,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/process.c linux-2.6.38.3/arch/mips/ke |
20512 |
- |
20513 |
- return sp & ALMASK; |
20514 |
-} |
20515 |
-diff -urNp linux-2.6.38.3/arch/mips/kernel/syscall.c linux-2.6.38.3/arch/mips/kernel/syscall.c |
20516 |
---- linux-2.6.38.3/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000000 -0400 |
20517 |
-+++ linux-2.6.38.3/arch/mips/kernel/syscall.c 2011-04-17 15:57:32.000000000 -0400 |
20518 |
+diff -urNp linux-2.6.38.4/arch/mips/kernel/syscall.c linux-2.6.38.4/arch/mips/kernel/syscall.c |
20519 |
+--- linux-2.6.38.4/arch/mips/kernel/syscall.c 2011-03-14 21:20:32.000000000 -0400 |
20520 |
++++ linux-2.6.38.4/arch/mips/kernel/syscall.c 2011-04-17 15:57:32.000000000 -0400 |
20521 |
@@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str |
20522 |
do_color_align = 0; |
20523 |
if (filp || (flags & MAP_SHARED)) |
20524 |
@@ -1576,9 +1576,9 @@ diff -urNp linux-2.6.38.3/arch/mips/kernel/syscall.c linux-2.6.38.3/arch/mips/ke |
20525 |
SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, |
20526 |
unsigned long, prot, unsigned long, flags, unsigned long, |
20527 |
fd, off_t, offset) |
20528 |
-diff -urNp linux-2.6.38.3/arch/mips/mm/dma-default.c linux-2.6.38.3/arch/mips/mm/dma-default.c |
20529 |
---- linux-2.6.38.3/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000000 -0400 |
20530 |
-+++ linux-2.6.38.3/arch/mips/mm/dma-default.c 2011-04-17 15:57:32.000000000 -0400 |
20531 |
+diff -urNp linux-2.6.38.4/arch/mips/mm/dma-default.c linux-2.6.38.4/arch/mips/mm/dma-default.c |
20532 |
+--- linux-2.6.38.4/arch/mips/mm/dma-default.c 2011-03-14 21:20:32.000000000 -0400 |
20533 |
++++ linux-2.6.38.4/arch/mips/mm/dma-default.c 2011-04-17 15:57:32.000000000 -0400 |
20534 |
@@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, |
20535 |
|
20536 |
EXPORT_SYMBOL(dma_cache_sync); |
20537 |
@@ -1597,9 +1597,9 @@ diff -urNp linux-2.6.38.3/arch/mips/mm/dma-default.c linux-2.6.38.3/arch/mips/mm |
20538 |
EXPORT_SYMBOL(mips_dma_map_ops); |
20539 |
|
20540 |
#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) |
20541 |
-diff -urNp linux-2.6.38.3/arch/mips/mm/fault.c linux-2.6.38.3/arch/mips/mm/fault.c |
20542 |
---- linux-2.6.38.3/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
20543 |
-+++ linux-2.6.38.3/arch/mips/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
20544 |
+diff -urNp linux-2.6.38.4/arch/mips/mm/fault.c linux-2.6.38.4/arch/mips/mm/fault.c |
20545 |
+--- linux-2.6.38.4/arch/mips/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
20546 |
++++ linux-2.6.38.4/arch/mips/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
20547 |
@@ -28,6 +28,23 @@ |
20548 |
#include <asm/highmem.h> /* For VMALLOC_END */ |
20549 |
#include <linux/kdebug.h> |
20550 |
@@ -1624,9 +1624,9 @@ diff -urNp linux-2.6.38.3/arch/mips/mm/fault.c linux-2.6.38.3/arch/mips/mm/fault |
20551 |
/* |
20552 |
* This routine handles page faults. It determines the address, |
20553 |
* and the problem, and then passes it off to one of the appropriate |
20554 |
-diff -urNp linux-2.6.38.3/arch/parisc/include/asm/elf.h linux-2.6.38.3/arch/parisc/include/asm/elf.h |
20555 |
---- linux-2.6.38.3/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20556 |
-+++ linux-2.6.38.3/arch/parisc/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20557 |
+diff -urNp linux-2.6.38.4/arch/parisc/include/asm/elf.h linux-2.6.38.4/arch/parisc/include/asm/elf.h |
20558 |
+--- linux-2.6.38.4/arch/parisc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20559 |
++++ linux-2.6.38.4/arch/parisc/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20560 |
@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration.. |
20561 |
|
20562 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) |
20563 |
@@ -1641,9 +1641,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/include/asm/elf.h linux-2.6.38.3/arch/pari |
20564 |
/* This yields a mask that user programs can use to figure out what |
20565 |
instruction set this CPU supports. This could be done in user space, |
20566 |
but it's not easy, and we've already done it here. */ |
20567 |
-diff -urNp linux-2.6.38.3/arch/parisc/include/asm/pgtable.h linux-2.6.38.3/arch/parisc/include/asm/pgtable.h |
20568 |
---- linux-2.6.38.3/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
20569 |
-+++ linux-2.6.38.3/arch/parisc/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
20570 |
+diff -urNp linux-2.6.38.4/arch/parisc/include/asm/pgtable.h linux-2.6.38.4/arch/parisc/include/asm/pgtable.h |
20571 |
+--- linux-2.6.38.4/arch/parisc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
20572 |
++++ linux-2.6.38.4/arch/parisc/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
20573 |
@@ -209,6 +209,17 @@ struct vm_area_struct; |
20574 |
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) |
20575 |
#define PAGE_COPY PAGE_EXECREAD |
20576 |
@@ -1662,9 +1662,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/include/asm/pgtable.h linux-2.6.38.3/arch/ |
20577 |
#define PAGE_KERNEL __pgprot(_PAGE_KERNEL) |
20578 |
#define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) |
20579 |
#define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) |
20580 |
-diff -urNp linux-2.6.38.3/arch/parisc/kernel/module.c linux-2.6.38.3/arch/parisc/kernel/module.c |
20581 |
---- linux-2.6.38.3/arch/parisc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
20582 |
-+++ linux-2.6.38.3/arch/parisc/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
20583 |
+diff -urNp linux-2.6.38.4/arch/parisc/kernel/module.c linux-2.6.38.4/arch/parisc/kernel/module.c |
20584 |
+--- linux-2.6.38.4/arch/parisc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
20585 |
++++ linux-2.6.38.4/arch/parisc/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
20586 |
@@ -96,16 +96,38 @@ |
20587 |
|
20588 |
/* three functions to determine where in the module core |
20589 |
@@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/kernel/module.c linux-2.6.38.3/arch/parisc |
20590 |
|
20591 |
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", |
20592 |
me->arch.unwind_section, table, end, gp); |
20593 |
-diff -urNp linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c |
20594 |
---- linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.000000000 -0400 |
20595 |
-+++ linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:57:32.000000000 -0400 |
20596 |
+diff -urNp linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c |
20597 |
+--- linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c 2011-03-14 21:20:32.000000000 -0400 |
20598 |
++++ linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:57:32.000000000 -0400 |
20599 |
@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u |
20600 |
/* At this point: (!vma || addr < vma->vm_end). */ |
20601 |
if (TASK_SIZE - len < addr) |
20602 |
@@ -1795,9 +1795,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/kernel/sys_parisc.c linux-2.6.38.3/arch/pa |
20603 |
|
20604 |
if (filp) { |
20605 |
addr = get_shared_area(filp->f_mapping, addr, len, pgoff); |
20606 |
-diff -urNp linux-2.6.38.3/arch/parisc/kernel/traps.c linux-2.6.38.3/arch/parisc/kernel/traps.c |
20607 |
---- linux-2.6.38.3/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400 |
20608 |
-+++ linux-2.6.38.3/arch/parisc/kernel/traps.c 2011-04-17 15:57:32.000000000 -0400 |
20609 |
+diff -urNp linux-2.6.38.4/arch/parisc/kernel/traps.c linux-2.6.38.4/arch/parisc/kernel/traps.c |
20610 |
+--- linux-2.6.38.4/arch/parisc/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400 |
20611 |
++++ linux-2.6.38.4/arch/parisc/kernel/traps.c 2011-04-17 15:57:32.000000000 -0400 |
20612 |
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod |
20613 |
|
20614 |
down_read(¤t->mm->mmap_sem); |
20615 |
@@ -1809,9 +1809,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/kernel/traps.c linux-2.6.38.3/arch/parisc/ |
20616 |
fault_address = regs->iaoq[0]; |
20617 |
fault_space = regs->iasq[0]; |
20618 |
|
20619 |
-diff -urNp linux-2.6.38.3/arch/parisc/mm/fault.c linux-2.6.38.3/arch/parisc/mm/fault.c |
20620 |
---- linux-2.6.38.3/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
20621 |
-+++ linux-2.6.38.3/arch/parisc/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
20622 |
+diff -urNp linux-2.6.38.4/arch/parisc/mm/fault.c linux-2.6.38.4/arch/parisc/mm/fault.c |
20623 |
+--- linux-2.6.38.4/arch/parisc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
20624 |
++++ linux-2.6.38.4/arch/parisc/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
20625 |
@@ -15,6 +15,7 @@ |
20626 |
#include <linux/sched.h> |
20627 |
#include <linux/interrupt.h> |
20628 |
@@ -1981,9 +1981,9 @@ diff -urNp linux-2.6.38.3/arch/parisc/mm/fault.c linux-2.6.38.3/arch/parisc/mm/f |
20629 |
|
20630 |
/* |
20631 |
* If for any reason at all we couldn't handle the fault, make |
20632 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/device.h linux-2.6.38.3/arch/powerpc/include/asm/device.h |
20633 |
---- linux-2.6.38.3/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
20634 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
20635 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/device.h linux-2.6.38.4/arch/powerpc/include/asm/device.h |
20636 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
20637 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
20638 |
@@ -17,7 +17,7 @@ struct device_node; |
20639 |
*/ |
20640 |
struct dev_archdata { |
20641 |
@@ -1993,9 +1993,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/device.h linux-2.6.38.3/arch/ |
20642 |
|
20643 |
/* |
20644 |
* When an iommu is in use, dma_data is used as a ptr to the base of the |
20645 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h |
20646 |
---- linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20647 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20648 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h |
20649 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
20650 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
20651 |
@@ -66,12 +66,13 @@ static inline unsigned long device_to_ma |
20652 |
/* |
20653 |
* Available generic sets of operations |
20654 |
@@ -2058,9 +2058,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.3/ |
20655 |
|
20656 |
if (dma_ops->mapping_error) |
20657 |
return dma_ops->mapping_error(dev, dma_addr); |
20658 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/elf.h linux-2.6.38.3/arch/powerpc/include/asm/elf.h |
20659 |
---- linux-2.6.38.3/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20660 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20661 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/elf.h linux-2.6.38.4/arch/powerpc/include/asm/elf.h |
20662 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
20663 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
20664 |
@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E |
20665 |
the loader. We need to make sure that it is out of the way of the program |
20666 |
that it will "exec", and that there is sufficient room for the brk. */ |
20667 |
@@ -2093,9 +2093,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/elf.h linux-2.6.38.3/arch/pow |
20668 |
#endif /* __KERNEL__ */ |
20669 |
|
20670 |
/* |
20671 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/iommu.h linux-2.6.38.3/arch/powerpc/include/asm/iommu.h |
20672 |
---- linux-2.6.38.3/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400 |
20673 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/iommu.h 2011-04-17 15:57:32.000000000 -0400 |
20674 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/iommu.h linux-2.6.38.4/arch/powerpc/include/asm/iommu.h |
20675 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400 |
20676 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/iommu.h 2011-04-17 15:57:32.000000000 -0400 |
20677 |
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi |
20678 |
extern void iommu_init_early_dart(void); |
20679 |
extern void iommu_init_early_pasemi(void); |
20680 |
@@ -2106,9 +2106,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/iommu.h linux-2.6.38.3/arch/p |
20681 |
#ifdef CONFIG_PCI |
20682 |
extern void pci_iommu_init(void); |
20683 |
extern void pci_direct_iommu_init(void); |
20684 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h |
20685 |
---- linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
20686 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
20687 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h |
20688 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
20689 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
20690 |
@@ -27,6 +27,7 @@ enum km_type { |
20691 |
KM_PPC_SYNC_PAGE, |
20692 |
KM_PPC_SYNC_ICACHE, |
20693 |
@@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.3/a |
20694 |
KM_TYPE_NR |
20695 |
}; |
20696 |
|
20697 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/page_64.h linux-2.6.38.3/arch/powerpc/include/asm/page_64.h |
20698 |
---- linux-2.6.38.3/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:32.000000000 -0400 |
20699 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/page_64.h 2011-04-17 15:57:32.000000000 -0400 |
20700 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page_64.h linux-2.6.38.4/arch/powerpc/include/asm/page_64.h |
20701 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/page_64.h 2011-03-14 21:20:32.000000000 -0400 |
20702 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/page_64.h 2011-04-17 15:57:32.000000000 -0400 |
20703 |
@@ -172,15 +172,18 @@ do { \ |
20704 |
* stack by default, so in the absense of a PT_GNU_STACK program header |
20705 |
* we turn execute permission off. |
20706 |
@@ -2141,9 +2141,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/page_64.h linux-2.6.38.3/arch |
20707 |
|
20708 |
#include <asm-generic/getorder.h> |
20709 |
|
20710 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/page.h linux-2.6.38.3/arch/powerpc/include/asm/page.h |
20711 |
---- linux-2.6.38.3/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 |
20712 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/page.h 2011-04-17 15:57:32.000000000 -0400 |
20713 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page.h linux-2.6.38.4/arch/powerpc/include/asm/page.h |
20714 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 |
20715 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/page.h 2011-04-17 15:57:32.000000000 -0400 |
20716 |
@@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr; |
20717 |
* and needs to be executable. This means the whole heap ends |
20718 |
* up being executable. |
20719 |
@@ -2166,9 +2166,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/page.h linux-2.6.38.3/arch/po |
20720 |
#ifndef __ASSEMBLY__ |
20721 |
|
20722 |
#undef STRICT_MM_TYPECHECKS |
20723 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pci.h linux-2.6.38.3/arch/powerpc/include/asm/pci.h |
20724 |
---- linux-2.6.38.3/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400 |
20725 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/pci.h 2011-04-17 15:57:32.000000000 -0400 |
20726 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pci.h linux-2.6.38.4/arch/powerpc/include/asm/pci.h |
20727 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/pci.h 2011-03-14 21:20:32.000000000 -0400 |
20728 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/pci.h 2011-04-17 15:57:32.000000000 -0400 |
20729 |
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq |
20730 |
} |
20731 |
|
20732 |
@@ -2180,9 +2180,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pci.h linux-2.6.38.3/arch/pow |
20733 |
#else /* CONFIG_PCI */ |
20734 |
#define set_pci_dma_ops(d) |
20735 |
#define get_pci_dma_ops() NULL |
20736 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h |
20737 |
---- linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
20738 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
20739 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h |
20740 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
20741 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
20742 |
@@ -2,6 +2,7 @@ |
20743 |
#define _ASM_POWERPC_PGTABLE_H |
20744 |
#ifdef __KERNEL__ |
20745 |
@@ -2191,9 +2191,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pgtable.h linux-2.6.38.3/arch |
20746 |
#ifndef __ASSEMBLY__ |
20747 |
#include <asm/processor.h> /* For TASK_SIZE */ |
20748 |
#include <asm/mmu.h> |
20749 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h |
20750 |
---- linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:20:32.000000000 -0400 |
20751 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:57:32.000000000 -0400 |
20752 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h |
20753 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h 2011-03-14 21:20:32.000000000 -0400 |
20754 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:57:32.000000000 -0400 |
20755 |
@@ -21,6 +21,7 @@ |
20756 |
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ |
20757 |
#define _PAGE_USER 0x004 /* usermode access allowed */ |
20758 |
@@ -2202,9 +2202,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.3/a |
20759 |
#define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ |
20760 |
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ |
20761 |
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ |
20762 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/reg.h linux-2.6.38.3/arch/powerpc/include/asm/reg.h |
20763 |
---- linux-2.6.38.3/arch/powerpc/include/asm/reg.h 2011-04-18 17:27:13.000000000 -0400 |
20764 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/reg.h 2011-04-17 15:57:32.000000000 -0400 |
20765 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/reg.h linux-2.6.38.4/arch/powerpc/include/asm/reg.h |
20766 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/reg.h 2011-04-18 17:27:13.000000000 -0400 |
20767 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/reg.h 2011-04-17 15:57:32.000000000 -0400 |
20768 |
@@ -191,6 +191,7 @@ |
20769 |
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ |
20770 |
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ |
20771 |
@@ -2213,9 +2213,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/reg.h linux-2.6.38.3/arch/pow |
20772 |
#define DSISR_PROTFAULT 0x08000000 /* protection fault */ |
20773 |
#define DSISR_ISSTORE 0x02000000 /* access was a store */ |
20774 |
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ |
20775 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h |
20776 |
---- linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:32.000000000 -0400 |
20777 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:57:32.000000000 -0400 |
20778 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h |
20779 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h 2011-03-14 21:20:32.000000000 -0400 |
20780 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:57:32.000000000 -0400 |
20781 |
@@ -13,7 +13,7 @@ |
20782 |
|
20783 |
#include <linux/swiotlb.h> |
20784 |
@@ -2225,9 +2225,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.3/arch |
20785 |
|
20786 |
static inline void dma_mark_clean(void *addr, size_t size) {} |
20787 |
|
20788 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/system.h linux-2.6.38.3/arch/powerpc/include/asm/system.h |
20789 |
---- linux-2.6.38.3/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
20790 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
20791 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/system.h linux-2.6.38.4/arch/powerpc/include/asm/system.h |
20792 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
20793 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
20794 |
@@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi |
20795 |
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) |
20796 |
#endif |
20797 |
@@ -2237,9 +2237,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/system.h linux-2.6.38.3/arch/ |
20798 |
|
20799 |
/* Used in very early kernel initialization. */ |
20800 |
extern unsigned long reloc_offset(void); |
20801 |
-diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h |
20802 |
---- linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
20803 |
-+++ linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
20804 |
+diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h |
20805 |
+--- linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
20806 |
++++ linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
20807 |
@@ -13,6 +13,8 @@ |
20808 |
#define VERIFY_READ 0 |
20809 |
#define VERIFY_WRITE 1 |
20810 |
@@ -2417,9 +2417,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/include/asm/uaccess.h linux-2.6.38.3/arch |
20811 |
extern unsigned long __clear_user(void __user *addr, unsigned long size); |
20812 |
|
20813 |
static inline unsigned long clear_user(void __user *addr, unsigned long size) |
20814 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma.c linux-2.6.38.3/arch/powerpc/kernel/dma.c |
20815 |
---- linux-2.6.38.3/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400 |
20816 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/dma.c 2011-04-17 15:57:32.000000000 -0400 |
20817 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma.c linux-2.6.38.4/arch/powerpc/kernel/dma.c |
20818 |
+--- linux-2.6.38.4/arch/powerpc/kernel/dma.c 2011-03-14 21:20:32.000000000 -0400 |
20819 |
++++ linux-2.6.38.4/arch/powerpc/kernel/dma.c 2011-04-17 15:57:32.000000000 -0400 |
20820 |
@@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl |
20821 |
} |
20822 |
#endif |
20823 |
@@ -2438,9 +2438,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma.c linux-2.6.38.3/arch/powerpc/ |
20824 |
|
20825 |
if (ppc_md.dma_set_mask) |
20826 |
return ppc_md.dma_set_mask(dev, dma_mask); |
20827 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c |
20828 |
---- linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.000000000 -0400 |
20829 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:57:32.000000000 -0400 |
20830 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c |
20831 |
+--- linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c 2011-03-14 21:20:32.000000000 -0400 |
20832 |
++++ linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:57:32.000000000 -0400 |
20833 |
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de |
20834 |
} |
20835 |
|
20836 |
@@ -2459,9 +2459,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.3/arch/po |
20837 |
.alloc_coherent = dma_iommu_alloc_coherent, |
20838 |
.free_coherent = dma_iommu_free_coherent, |
20839 |
.map_sg = dma_iommu_map_sg, |
20840 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c |
20841 |
---- linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 |
20842 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:57:32.000000000 -0400 |
20843 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c |
20844 |
+--- linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 |
20845 |
++++ linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:57:32.000000000 -0400 |
20846 |
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; |
20847 |
* map_page, and unmap_page on highmem, use normal dma_ops |
20848 |
* for everything else. |
20849 |
@@ -2471,9 +2471,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.3/arch/ |
20850 |
.alloc_coherent = dma_direct_alloc_coherent, |
20851 |
.free_coherent = dma_direct_free_coherent, |
20852 |
.map_sg = swiotlb_map_sg_attrs, |
20853 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S |
20854 |
---- linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20:32.000000000 -0400 |
20855 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:57:32.000000000 -0400 |
20856 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S |
20857 |
+--- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S 2011-03-14 21:20:32.000000000 -0400 |
20858 |
++++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:57:32.000000000 -0400 |
20859 |
@@ -495,6 +495,7 @@ storage_fault_common: |
20860 |
std r14,_DAR(r1) |
20861 |
std r15,_DSISR(r1) |
20862 |
@@ -2492,9 +2492,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.3/ar |
20863 |
addi r3,r1,STACK_FRAME_OVERHEAD |
20864 |
ld r4,_DAR(r1) |
20865 |
bl .bad_page_fault |
20866 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S |
20867 |
---- linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20:32.000000000 -0400 |
20868 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:57:32.000000000 -0400 |
20869 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S |
20870 |
+--- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S 2011-03-14 21:20:32.000000000 -0400 |
20871 |
++++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:57:32.000000000 -0400 |
20872 |
@@ -848,10 +848,10 @@ handle_page_fault: |
20873 |
11: ld r4,_DAR(r1) |
20874 |
ld r5,_DSISR(r1) |
20875 |
@@ -2507,9 +2507,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.3/ar |
20876 |
mr r5,r3 |
20877 |
addi r3,r1,STACK_FRAME_OVERHEAD |
20878 |
lwz r4,_DAR(r1) |
20879 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c |
20880 |
---- linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000000000 -0400 |
20881 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:57:32.000000000 -0400 |
20882 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c |
20883 |
+--- linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c 2011-03-14 21:20:32.000000000 -0400 |
20884 |
++++ linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:57:32.000000000 -0400 |
20885 |
@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct |
20886 |
return 1; |
20887 |
} |
20888 |
@@ -2519,9 +2519,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/ibmebus.c linux-2.6.38.3/arch/powe |
20889 |
.alloc_coherent = ibmebus_alloc_coherent, |
20890 |
.free_coherent = ibmebus_free_coherent, |
20891 |
.map_sg = ibmebus_map_sg, |
20892 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/kgdb.c linux-2.6.38.3/arch/powerpc/kernel/kgdb.c |
20893 |
---- linux-2.6.38.3/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
20894 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
20895 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/kgdb.c linux-2.6.38.4/arch/powerpc/kernel/kgdb.c |
20896 |
+--- linux-2.6.38.4/arch/powerpc/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
20897 |
++++ linux-2.6.38.4/arch/powerpc/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
20898 |
@@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto |
20899 |
/* |
20900 |
* Global data |
20901 |
@@ -2531,9 +2531,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/kgdb.c linux-2.6.38.3/arch/powerpc |
20902 |
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, |
20903 |
}; |
20904 |
|
20905 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/module_32.c linux-2.6.38.3/arch/powerpc/kernel/module_32.c |
20906 |
---- linux-2.6.38.3/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.000000000 -0400 |
20907 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/module_32.c 2011-04-17 15:57:32.000000000 -0400 |
20908 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module_32.c linux-2.6.38.4/arch/powerpc/kernel/module_32.c |
20909 |
+--- linux-2.6.38.4/arch/powerpc/kernel/module_32.c 2011-03-14 21:20:32.000000000 -0400 |
20910 |
++++ linux-2.6.38.4/arch/powerpc/kernel/module_32.c 2011-04-17 15:57:32.000000000 -0400 |
20911 |
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr |
20912 |
me->arch.core_plt_section = i; |
20913 |
} |
20914 |
@@ -2563,9 +2563,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/module_32.c linux-2.6.38.3/arch/po |
20915 |
|
20916 |
/* Find this entry, or if that fails, the next avail. entry */ |
20917 |
while (entry->jump[0]) { |
20918 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/module.c linux-2.6.38.3/arch/powerpc/kernel/module.c |
20919 |
---- linux-2.6.38.3/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
20920 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
20921 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module.c linux-2.6.38.4/arch/powerpc/kernel/module.c |
20922 |
+--- linux-2.6.38.4/arch/powerpc/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
20923 |
++++ linux-2.6.38.4/arch/powerpc/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
20924 |
@@ -31,11 +31,24 @@ |
20925 |
|
20926 |
LIST_HEAD(module_bug_list); |
20927 |
@@ -2605,9 +2605,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/module.c linux-2.6.38.3/arch/power |
20928 |
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, |
20929 |
const Elf_Shdr *sechdrs, |
20930 |
const char *name) |
20931 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/pci-common.c linux-2.6.38.3/arch/powerpc/kernel/pci-common.c |
20932 |
---- linux-2.6.38.3/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.000000000 -0400 |
20933 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/pci-common.c 2011-04-17 15:57:32.000000000 -0400 |
20934 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/pci-common.c linux-2.6.38.4/arch/powerpc/kernel/pci-common.c |
20935 |
+--- linux-2.6.38.4/arch/powerpc/kernel/pci-common.c 2011-03-14 21:20:32.000000000 -0400 |
20936 |
++++ linux-2.6.38.4/arch/powerpc/kernel/pci-common.c 2011-04-17 15:57:32.000000000 -0400 |
20937 |
@@ -52,14 +52,14 @@ resource_size_t isa_mem_base; |
20938 |
unsigned int ppc_pci_flags = 0; |
20939 |
|
20940 |
@@ -2626,9 +2626,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/pci-common.c linux-2.6.38.3/arch/p |
20941 |
{ |
20942 |
return pci_dma_ops; |
20943 |
} |
20944 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/process.c linux-2.6.38.3/arch/powerpc/kernel/process.c |
20945 |
---- linux-2.6.38.3/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
20946 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
20947 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/process.c linux-2.6.38.4/arch/powerpc/kernel/process.c |
20948 |
+--- linux-2.6.38.4/arch/powerpc/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
20949 |
++++ linux-2.6.38.4/arch/powerpc/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
20950 |
@@ -655,8 +655,8 @@ void show_regs(struct pt_regs * regs) |
20951 |
* Lookup NIP late so we have the best change of getting the |
20952 |
* above info out without failing |
20953 |
@@ -2721,9 +2721,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/process.c linux-2.6.38.3/arch/powe |
20954 |
- |
20955 |
- return ret; |
20956 |
-} |
20957 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signal_32.c linux-2.6.38.3/arch/powerpc/kernel/signal_32.c |
20958 |
---- linux-2.6.38.3/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.000000000 -0400 |
20959 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/signal_32.c 2011-04-17 15:57:32.000000000 -0400 |
20960 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_32.c linux-2.6.38.4/arch/powerpc/kernel/signal_32.c |
20961 |
+--- linux-2.6.38.4/arch/powerpc/kernel/signal_32.c 2011-03-14 21:20:32.000000000 -0400 |
20962 |
++++ linux-2.6.38.4/arch/powerpc/kernel/signal_32.c 2011-04-17 15:57:32.000000000 -0400 |
20963 |
@@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig |
20964 |
/* Save user registers on the stack */ |
20965 |
frame = &rt_sf->uc.uc_mcontext; |
20966 |
@@ -2733,9 +2733,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signal_32.c linux-2.6.38.3/arch/po |
20967 |
if (save_user_regs(regs, frame, 0, 1)) |
20968 |
goto badframe; |
20969 |
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; |
20970 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signal_64.c linux-2.6.38.3/arch/powerpc/kernel/signal_64.c |
20971 |
---- linux-2.6.38.3/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.000000000 -0400 |
20972 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/signal_64.c 2011-04-17 15:57:32.000000000 -0400 |
20973 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_64.c linux-2.6.38.4/arch/powerpc/kernel/signal_64.c |
20974 |
+--- linux-2.6.38.4/arch/powerpc/kernel/signal_64.c 2011-03-14 21:20:32.000000000 -0400 |
20975 |
++++ linux-2.6.38.4/arch/powerpc/kernel/signal_64.c 2011-04-17 15:57:32.000000000 -0400 |
20976 |
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct |
20977 |
current->thread.fpscr.val = 0; |
20978 |
|
20979 |
@@ -2745,9 +2745,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/signal_64.c linux-2.6.38.3/arch/po |
20980 |
regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; |
20981 |
} else { |
20982 |
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); |
20983 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vdso.c linux-2.6.38.3/arch/powerpc/kernel/vdso.c |
20984 |
---- linux-2.6.38.3/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000000 -0400 |
20985 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/vdso.c 2011-04-17 15:57:32.000000000 -0400 |
20986 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vdso.c linux-2.6.38.4/arch/powerpc/kernel/vdso.c |
20987 |
+--- linux-2.6.38.4/arch/powerpc/kernel/vdso.c 2011-03-14 21:20:32.000000000 -0400 |
20988 |
++++ linux-2.6.38.4/arch/powerpc/kernel/vdso.c 2011-04-17 15:57:32.000000000 -0400 |
20989 |
@@ -36,6 +36,7 @@ |
20990 |
#include <asm/firmware.h> |
20991 |
#include <asm/vdso.h> |
20992 |
@@ -2774,9 +2774,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vdso.c linux-2.6.38.3/arch/powerpc |
20993 |
if (IS_ERR_VALUE(vdso_base)) { |
20994 |
rc = vdso_base; |
20995 |
goto fail_mmapsem; |
20996 |
-diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vio.c linux-2.6.38.3/arch/powerpc/kernel/vio.c |
20997 |
---- linux-2.6.38.3/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.000000000 -0400 |
20998 |
-+++ linux-2.6.38.3/arch/powerpc/kernel/vio.c 2011-04-17 15:57:32.000000000 -0400 |
20999 |
+diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vio.c linux-2.6.38.4/arch/powerpc/kernel/vio.c |
21000 |
+--- linux-2.6.38.4/arch/powerpc/kernel/vio.c 2011-03-14 21:20:32.000000000 -0400 |
21001 |
++++ linux-2.6.38.4/arch/powerpc/kernel/vio.c 2011-04-17 15:57:32.000000000 -0400 |
21002 |
@@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s |
21003 |
return dma_iommu_ops.dma_supported(dev, mask); |
21004 |
} |
21005 |
@@ -2791,9 +2791,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/kernel/vio.c linux-2.6.38.3/arch/powerpc/ |
21006 |
.map_page = vio_dma_iommu_map_page, |
21007 |
.unmap_page = vio_dma_iommu_unmap_page, |
21008 |
.dma_supported = vio_dma_iommu_dma_supported, |
21009 |
-diff -urNp linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c |
21010 |
---- linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400 |
21011 |
-+++ linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:57:32.000000000 -0400 |
21012 |
+diff -urNp linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c |
21013 |
+--- linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400 |
21014 |
++++ linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:57:32.000000000 -0400 |
21015 |
@@ -9,22 +9,6 @@ |
21016 |
#include <linux/module.h> |
21017 |
#include <asm/uaccess.h> |
21018 |
@@ -2825,9 +2825,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/lib/usercopy_64.c linux-2.6.38.3/arch/pow |
21019 |
-EXPORT_SYMBOL(copy_to_user); |
21020 |
EXPORT_SYMBOL(copy_in_user); |
21021 |
|
21022 |
-diff -urNp linux-2.6.38.3/arch/powerpc/mm/fault.c linux-2.6.38.3/arch/powerpc/mm/fault.c |
21023 |
---- linux-2.6.38.3/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
21024 |
-+++ linux-2.6.38.3/arch/powerpc/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
21025 |
+diff -urNp linux-2.6.38.4/arch/powerpc/mm/fault.c linux-2.6.38.4/arch/powerpc/mm/fault.c |
21026 |
+--- linux-2.6.38.4/arch/powerpc/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
21027 |
++++ linux-2.6.38.4/arch/powerpc/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
21028 |
@@ -31,6 +31,10 @@ |
21029 |
#include <linux/kdebug.h> |
21030 |
#include <linux/perf_event.h> |
21031 |
@@ -2932,9 +2932,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/mm/fault.c linux-2.6.38.3/arch/powerpc/mm |
21032 |
_exception(SIGSEGV, regs, code, address); |
21033 |
return 0; |
21034 |
} |
21035 |
-diff -urNp linux-2.6.38.3/arch/powerpc/mm/mmap_64.c linux-2.6.38.3/arch/powerpc/mm/mmap_64.c |
21036 |
---- linux-2.6.38.3/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.000000000 -0400 |
21037 |
-+++ linux-2.6.38.3/arch/powerpc/mm/mmap_64.c 2011-04-17 15:57:32.000000000 -0400 |
21038 |
+diff -urNp linux-2.6.38.4/arch/powerpc/mm/mmap_64.c linux-2.6.38.4/arch/powerpc/mm/mmap_64.c |
21039 |
+--- linux-2.6.38.4/arch/powerpc/mm/mmap_64.c 2011-03-14 21:20:32.000000000 -0400 |
21040 |
++++ linux-2.6.38.4/arch/powerpc/mm/mmap_64.c 2011-04-17 15:57:32.000000000 -0400 |
21041 |
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str |
21042 |
*/ |
21043 |
if (mmap_is_legacy()) { |
21044 |
@@ -2958,9 +2958,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/mm/mmap_64.c linux-2.6.38.3/arch/powerpc/ |
21045 |
mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
21046 |
mm->unmap_area = arch_unmap_area_topdown; |
21047 |
} |
21048 |
-diff -urNp linux-2.6.38.3/arch/powerpc/mm/slice.c linux-2.6.38.3/arch/powerpc/mm/slice.c |
21049 |
---- linux-2.6.38.3/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000 -0400 |
21050 |
-+++ linux-2.6.38.3/arch/powerpc/mm/slice.c 2011-04-17 15:57:32.000000000 -0400 |
21051 |
+diff -urNp linux-2.6.38.4/arch/powerpc/mm/slice.c linux-2.6.38.4/arch/powerpc/mm/slice.c |
21052 |
+--- linux-2.6.38.4/arch/powerpc/mm/slice.c 2011-03-14 21:20:32.000000000 -0400 |
21053 |
++++ linux-2.6.38.4/arch/powerpc/mm/slice.c 2011-04-17 15:57:32.000000000 -0400 |
21054 |
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ |
21055 |
if ((mm->task_size - len) < addr) |
21056 |
return 0; |
21057 |
@@ -3027,9 +3027,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/mm/slice.c linux-2.6.38.3/arch/powerpc/mm |
21058 |
/* If hint, make sure it matches our alignment restrictions */ |
21059 |
if (!fixed && addr) { |
21060 |
addr = _ALIGN_UP(addr, 1ul << pshift); |
21061 |
-diff -urNp linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c |
21062 |
---- linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:32.000000000 -0400 |
21063 |
-+++ linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:57:32.000000000 -0400 |
21064 |
+diff -urNp linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c |
21065 |
+--- linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c 2011-03-14 21:20:32.000000000 -0400 |
21066 |
++++ linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:57:32.000000000 -0400 |
21067 |
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc |
21068 |
|
21069 |
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); |
21070 |
@@ -3039,9 +3039,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.3/arc |
21071 |
.alloc_coherent = dma_fixed_alloc_coherent, |
21072 |
.free_coherent = dma_fixed_free_coherent, |
21073 |
.map_sg = dma_fixed_map_sg, |
21074 |
-diff -urNp linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c |
21075 |
---- linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21:20:32.000000000 -0400 |
21076 |
-+++ linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15:57:32.000000000 -0400 |
21077 |
+diff -urNp linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c |
21078 |
+--- linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c 2011-03-14 21:20:32.000000000 -0400 |
21079 |
++++ linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15:57:32.000000000 -0400 |
21080 |
@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi |
21081 |
return mask >= DMA_BIT_MASK(32); |
21082 |
} |
21083 |
@@ -3060,9 +3060,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.3 |
21084 |
.alloc_coherent = ps3_alloc_coherent, |
21085 |
.free_coherent = ps3_free_coherent, |
21086 |
.map_sg = ps3_ioc0_map_sg, |
21087 |
-diff -urNp linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c |
21088 |
---- linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.000000000 -0400 |
21089 |
-+++ linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-04-17 15:57:32.000000000 -0400 |
21090 |
+diff -urNp linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c |
21091 |
+--- linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-03-14 21:20:32.000000000 -0400 |
21092 |
++++ linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c 2011-04-17 15:57:32.000000000 -0400 |
21093 |
@@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_sta |
21094 |
return 0; |
21095 |
} |
21096 |
@@ -3072,9 +3072,9 @@ diff -urNp linux-2.6.38.3/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.3/arch/p |
21097 |
.valid = cpm_suspend_valid, |
21098 |
.enter = cpm_suspend_enter, |
21099 |
}; |
21100 |
-diff -urNp linux-2.6.38.3/arch/s390/include/asm/elf.h linux-2.6.38.3/arch/s390/include/asm/elf.h |
21101 |
---- linux-2.6.38.3/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
21102 |
-+++ linux-2.6.38.3/arch/s390/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
21103 |
+diff -urNp linux-2.6.38.4/arch/s390/include/asm/elf.h linux-2.6.38.4/arch/s390/include/asm/elf.h |
21104 |
+--- linux-2.6.38.4/arch/s390/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
21105 |
++++ linux-2.6.38.4/arch/s390/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
21106 |
@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled; |
21107 |
the loader. We need to make sure that it is out of the way of the program |
21108 |
that it will "exec", and that there is sufficient room for the brk. */ |
21109 |
@@ -3100,9 +3100,9 @@ diff -urNp linux-2.6.38.3/arch/s390/include/asm/elf.h linux-2.6.38.3/arch/s390/i |
21110 |
-#define arch_randomize_brk arch_randomize_brk |
21111 |
- |
21112 |
#endif |
21113 |
-diff -urNp linux-2.6.38.3/arch/s390/include/asm/system.h linux-2.6.38.3/arch/s390/include/asm/system.h |
21114 |
---- linux-2.6.38.3/arch/s390/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
21115 |
-+++ linux-2.6.38.3/arch/s390/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
21116 |
+diff -urNp linux-2.6.38.4/arch/s390/include/asm/system.h linux-2.6.38.4/arch/s390/include/asm/system.h |
21117 |
+--- linux-2.6.38.4/arch/s390/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
21118 |
++++ linux-2.6.38.4/arch/s390/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
21119 |
@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *co |
21120 |
extern void (*_machine_halt)(void); |
21121 |
extern void (*_machine_power_off)(void); |
21122 |
@@ -3112,9 +3112,9 @@ diff -urNp linux-2.6.38.3/arch/s390/include/asm/system.h linux-2.6.38.3/arch/s39 |
21123 |
|
21124 |
static inline int tprot(unsigned long addr) |
21125 |
{ |
21126 |
-diff -urNp linux-2.6.38.3/arch/s390/include/asm/uaccess.h linux-2.6.38.3/arch/s390/include/asm/uaccess.h |
21127 |
---- linux-2.6.38.3/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
21128 |
-+++ linux-2.6.38.3/arch/s390/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
21129 |
+diff -urNp linux-2.6.38.4/arch/s390/include/asm/uaccess.h linux-2.6.38.4/arch/s390/include/asm/uaccess.h |
21130 |
+--- linux-2.6.38.4/arch/s390/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
21131 |
++++ linux-2.6.38.4/arch/s390/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
21132 |
@@ -234,6 +234,10 @@ static inline unsigned long __must_check |
21133 |
copy_to_user(void __user *to, const void *from, unsigned long n) |
21134 |
{ |
21135 |
@@ -3147,9 +3147,9 @@ diff -urNp linux-2.6.38.3/arch/s390/include/asm/uaccess.h linux-2.6.38.3/arch/s3 |
21136 |
if (unlikely(sz != -1 && sz < n)) { |
21137 |
copy_from_user_overflow(); |
21138 |
return n; |
21139 |
-diff -urNp linux-2.6.38.3/arch/s390/Kconfig linux-2.6.38.3/arch/s390/Kconfig |
21140 |
---- linux-2.6.38.3/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
21141 |
-+++ linux-2.6.38.3/arch/s390/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
21142 |
+diff -urNp linux-2.6.38.4/arch/s390/Kconfig linux-2.6.38.4/arch/s390/Kconfig |
21143 |
+--- linux-2.6.38.4/arch/s390/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
21144 |
++++ linux-2.6.38.4/arch/s390/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
21145 |
@@ -233,11 +233,9 @@ config S390_EXEC_PROTECT |
21146 |
prompt "Data execute protection" |
21147 |
help |
21148 |
@@ -3165,9 +3165,9 @@ diff -urNp linux-2.6.38.3/arch/s390/Kconfig linux-2.6.38.3/arch/s390/Kconfig |
21149 |
|
21150 |
comment "Code generation options" |
21151 |
|
21152 |
-diff -urNp linux-2.6.38.3/arch/s390/kernel/module.c linux-2.6.38.3/arch/s390/kernel/module.c |
21153 |
---- linux-2.6.38.3/arch/s390/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
21154 |
-+++ linux-2.6.38.3/arch/s390/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
21155 |
+diff -urNp linux-2.6.38.4/arch/s390/kernel/module.c linux-2.6.38.4/arch/s390/kernel/module.c |
21156 |
+--- linux-2.6.38.4/arch/s390/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
21157 |
++++ linux-2.6.38.4/arch/s390/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
21158 |
@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, |
21159 |
|
21160 |
/* Increase core size by size of got & plt and set start |
21161 |
@@ -3239,9 +3239,9 @@ diff -urNp linux-2.6.38.3/arch/s390/kernel/module.c linux-2.6.38.3/arch/s390/ker |
21162 |
rela->r_addend - loc; |
21163 |
if (r_type == R_390_GOTPC) |
21164 |
*(unsigned int *) loc = val; |
21165 |
-diff -urNp linux-2.6.38.3/arch/s390/kernel/process.c linux-2.6.38.3/arch/s390/kernel/process.c |
21166 |
---- linux-2.6.38.3/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
21167 |
-+++ linux-2.6.38.3/arch/s390/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
21168 |
+diff -urNp linux-2.6.38.4/arch/s390/kernel/process.c linux-2.6.38.4/arch/s390/kernel/process.c |
21169 |
+--- linux-2.6.38.4/arch/s390/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
21170 |
++++ linux-2.6.38.4/arch/s390/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
21171 |
@@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru |
21172 |
} |
21173 |
return 0; |
21174 |
@@ -3282,9 +3282,9 @@ diff -urNp linux-2.6.38.3/arch/s390/kernel/process.c linux-2.6.38.3/arch/s390/ke |
21175 |
- return base; |
21176 |
- return ret; |
21177 |
-} |
21178 |
-diff -urNp linux-2.6.38.3/arch/s390/kernel/setup.c linux-2.6.38.3/arch/s390/kernel/setup.c |
21179 |
---- linux-2.6.38.3/arch/s390/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400 |
21180 |
-+++ linux-2.6.38.3/arch/s390/kernel/setup.c 2011-04-17 15:57:32.000000000 -0400 |
21181 |
+diff -urNp linux-2.6.38.4/arch/s390/kernel/setup.c linux-2.6.38.4/arch/s390/kernel/setup.c |
21182 |
+--- linux-2.6.38.4/arch/s390/kernel/setup.c 2011-03-14 21:20:32.000000000 -0400 |
21183 |
++++ linux-2.6.38.4/arch/s390/kernel/setup.c 2011-04-17 15:57:32.000000000 -0400 |
21184 |
@@ -281,7 +281,7 @@ static int __init early_parse_mem(char * |
21185 |
} |
21186 |
early_param("mem", early_parse_mem); |
21187 |
@@ -3333,9 +3333,9 @@ diff -urNp linux-2.6.38.3/arch/s390/kernel/setup.c linux-2.6.38.3/arch/s390/kern |
21188 |
static void setup_addressing_mode(void) |
21189 |
{ |
21190 |
if (user_mode == SECONDARY_SPACE_MODE) { |
21191 |
-diff -urNp linux-2.6.38.3/arch/s390/mm/maccess.c linux-2.6.38.3/arch/s390/mm/maccess.c |
21192 |
---- linux-2.6.38.3/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 |
21193 |
-+++ linux-2.6.38.3/arch/s390/mm/maccess.c 2011-04-17 15:57:32.000000000 -0400 |
21194 |
+diff -urNp linux-2.6.38.4/arch/s390/mm/maccess.c linux-2.6.38.4/arch/s390/mm/maccess.c |
21195 |
+--- linux-2.6.38.4/arch/s390/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 |
21196 |
++++ linux-2.6.38.4/arch/s390/mm/maccess.c 2011-04-17 15:57:32.000000000 -0400 |
21197 |
@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void |
21198 |
return rc ? rc : count; |
21199 |
} |
21200 |
@@ -3345,9 +3345,9 @@ diff -urNp linux-2.6.38.3/arch/s390/mm/maccess.c linux-2.6.38.3/arch/s390/mm/mac |
21201 |
{ |
21202 |
long copied = 0; |
21203 |
|
21204 |
-diff -urNp linux-2.6.38.3/arch/s390/mm/mmap.c linux-2.6.38.3/arch/s390/mm/mmap.c |
21205 |
---- linux-2.6.38.3/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
21206 |
-+++ linux-2.6.38.3/arch/s390/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
21207 |
+diff -urNp linux-2.6.38.4/arch/s390/mm/mmap.c linux-2.6.38.4/arch/s390/mm/mmap.c |
21208 |
+--- linux-2.6.38.4/arch/s390/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
21209 |
++++ linux-2.6.38.4/arch/s390/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
21210 |
@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str |
21211 |
*/ |
21212 |
if (mmap_is_legacy()) { |
21213 |
@@ -3394,9 +3394,9 @@ diff -urNp linux-2.6.38.3/arch/s390/mm/mmap.c linux-2.6.38.3/arch/s390/mm/mmap.c |
21214 |
mm->get_unmapped_area = s390_get_unmapped_area_topdown; |
21215 |
mm->unmap_area = arch_unmap_area_topdown; |
21216 |
} |
21217 |
-diff -urNp linux-2.6.38.3/arch/score/include/asm/system.h linux-2.6.38.3/arch/score/include/asm/system.h |
21218 |
---- linux-2.6.38.3/arch/score/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
21219 |
-+++ linux-2.6.38.3/arch/score/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
21220 |
+diff -urNp linux-2.6.38.4/arch/score/include/asm/system.h linux-2.6.38.4/arch/score/include/asm/system.h |
21221 |
+--- linux-2.6.38.4/arch/score/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
21222 |
++++ linux-2.6.38.4/arch/score/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
21223 |
@@ -17,7 +17,7 @@ do { \ |
21224 |
#define finish_arch_switch(prev) do {} while (0) |
21225 |
|
21226 |
@@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.38.3/arch/score/include/asm/system.h linux-2.6.38.3/arch/sc |
21227 |
|
21228 |
#define mb() barrier() |
21229 |
#define rmb() barrier() |
21230 |
-diff -urNp linux-2.6.38.3/arch/score/kernel/process.c linux-2.6.38.3/arch/score/kernel/process.c |
21231 |
---- linux-2.6.38.3/arch/score/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
21232 |
-+++ linux-2.6.38.3/arch/score/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
21233 |
+diff -urNp linux-2.6.38.4/arch/score/kernel/process.c linux-2.6.38.4/arch/score/kernel/process.c |
21234 |
+--- linux-2.6.38.4/arch/score/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
21235 |
++++ linux-2.6.38.4/arch/score/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
21236 |
@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru |
21237 |
|
21238 |
return task_pt_regs(task)->cp0_epc; |
21239 |
@@ -3418,9 +3418,9 @@ diff -urNp linux-2.6.38.3/arch/score/kernel/process.c linux-2.6.38.3/arch/score/ |
21240 |
-{ |
21241 |
- return sp; |
21242 |
-} |
21243 |
-diff -urNp linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h |
21244 |
---- linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
21245 |
-+++ linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
21246 |
+diff -urNp linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h |
21247 |
+--- linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
21248 |
++++ linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
21249 |
@@ -1,10 +1,10 @@ |
21250 |
#ifndef __ASM_SH_DMA_MAPPING_H |
21251 |
#define __ASM_SH_DMA_MAPPING_H |
21252 |
@@ -3479,9 +3479,9 @@ diff -urNp linux-2.6.38.3/arch/sh/include/asm/dma-mapping.h linux-2.6.38.3/arch/ |
21253 |
|
21254 |
if (dma_release_from_coherent(dev, get_order(size), vaddr)) |
21255 |
return; |
21256 |
-diff -urNp linux-2.6.38.3/arch/sh/kernel/dma-nommu.c linux-2.6.38.3/arch/sh/kernel/dma-nommu.c |
21257 |
---- linux-2.6.38.3/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000000 -0400 |
21258 |
-+++ linux-2.6.38.3/arch/sh/kernel/dma-nommu.c 2011-04-17 15:57:32.000000000 -0400 |
21259 |
+diff -urNp linux-2.6.38.4/arch/sh/kernel/dma-nommu.c linux-2.6.38.4/arch/sh/kernel/dma-nommu.c |
21260 |
+--- linux-2.6.38.4/arch/sh/kernel/dma-nommu.c 2011-03-14 21:20:32.000000000 -0400 |
21261 |
++++ linux-2.6.38.4/arch/sh/kernel/dma-nommu.c 2011-04-17 15:57:32.000000000 -0400 |
21262 |
@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device |
21263 |
} |
21264 |
#endif |
21265 |
@@ -3491,9 +3491,9 @@ diff -urNp linux-2.6.38.3/arch/sh/kernel/dma-nommu.c linux-2.6.38.3/arch/sh/kern |
21266 |
.alloc_coherent = dma_generic_alloc_coherent, |
21267 |
.free_coherent = dma_generic_free_coherent, |
21268 |
.map_page = nommu_map_page, |
21269 |
-diff -urNp linux-2.6.38.3/arch/sh/kernel/kgdb.c linux-2.6.38.3/arch/sh/kernel/kgdb.c |
21270 |
---- linux-2.6.38.3/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
21271 |
-+++ linux-2.6.38.3/arch/sh/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
21272 |
+diff -urNp linux-2.6.38.4/arch/sh/kernel/kgdb.c linux-2.6.38.4/arch/sh/kernel/kgdb.c |
21273 |
+--- linux-2.6.38.4/arch/sh/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
21274 |
++++ linux-2.6.38.4/arch/sh/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
21275 |
@@ -319,7 +319,7 @@ void kgdb_arch_exit(void) |
21276 |
unregister_die_notifier(&kgdb_notifier); |
21277 |
} |
21278 |
@@ -3503,9 +3503,9 @@ diff -urNp linux-2.6.38.3/arch/sh/kernel/kgdb.c linux-2.6.38.3/arch/sh/kernel/kg |
21279 |
/* Breakpoint instruction: trapa #0x3c */ |
21280 |
#ifdef CONFIG_CPU_LITTLE_ENDIAN |
21281 |
.gdb_bpt_instr = { 0x3c, 0xc3 }, |
21282 |
-diff -urNp linux-2.6.38.3/arch/sh/mm/consistent.c linux-2.6.38.3/arch/sh/mm/consistent.c |
21283 |
---- linux-2.6.38.3/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000 -0400 |
21284 |
-+++ linux-2.6.38.3/arch/sh/mm/consistent.c 2011-04-17 15:57:32.000000000 -0400 |
21285 |
+diff -urNp linux-2.6.38.4/arch/sh/mm/consistent.c linux-2.6.38.4/arch/sh/mm/consistent.c |
21286 |
+--- linux-2.6.38.4/arch/sh/mm/consistent.c 2011-03-14 21:20:32.000000000 -0400 |
21287 |
++++ linux-2.6.38.4/arch/sh/mm/consistent.c 2011-04-17 15:57:32.000000000 -0400 |
21288 |
@@ -22,7 +22,7 @@ |
21289 |
|
21290 |
#define PREALLOC_DMA_DEBUG_ENTRIES 4096 |
21291 |
@@ -3515,9 +3515,9 @@ diff -urNp linux-2.6.38.3/arch/sh/mm/consistent.c linux-2.6.38.3/arch/sh/mm/cons |
21292 |
EXPORT_SYMBOL(dma_ops); |
21293 |
|
21294 |
static int __init dma_init(void) |
21295 |
-diff -urNp linux-2.6.38.3/arch/sh/mm/mmap.c linux-2.6.38.3/arch/sh/mm/mmap.c |
21296 |
---- linux-2.6.38.3/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
21297 |
-+++ linux-2.6.38.3/arch/sh/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
21298 |
+diff -urNp linux-2.6.38.4/arch/sh/mm/mmap.c linux-2.6.38.4/arch/sh/mm/mmap.c |
21299 |
+--- linux-2.6.38.4/arch/sh/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
21300 |
++++ linux-2.6.38.4/arch/sh/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
21301 |
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str |
21302 |
addr = PAGE_ALIGN(addr); |
21303 |
|
21304 |
@@ -3592,9 +3592,9 @@ diff -urNp linux-2.6.38.3/arch/sh/mm/mmap.c linux-2.6.38.3/arch/sh/mm/mmap.c |
21305 |
|
21306 |
bottomup: |
21307 |
/* |
21308 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h |
21309 |
---- linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:32.000000000 -0400 |
21310 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:57:32.000000000 -0400 |
21311 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h |
21312 |
+--- linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h 2011-03-14 21:20:32.000000000 -0400 |
21313 |
++++ linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h 2011-04-17 15:57:32.000000000 -0400 |
21314 |
@@ -14,18 +14,40 @@ |
21315 |
#define ATOMIC64_INIT(i) { (i) } |
21316 |
|
21317 |
@@ -3754,9 +3754,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/atomic_64.h linux-2.6.38.3/arch |
21318 |
} |
21319 |
|
21320 |
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) |
21321 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h |
21322 |
---- linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
21323 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
21324 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h |
21325 |
+--- linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
21326 |
++++ linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
21327 |
@@ -12,10 +12,10 @@ extern int dma_supported(struct device * |
21328 |
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
21329 |
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
21330 |
@@ -3788,9 +3788,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.3/ar |
21331 |
|
21332 |
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); |
21333 |
ops->free_coherent(dev, size, cpu_addr, dma_handle); |
21334 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/elf_32.h linux-2.6.38.3/arch/sparc/include/asm/elf_32.h |
21335 |
---- linux-2.6.38.3/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.000000000 -0400 |
21336 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/elf_32.h 2011-04-17 15:57:32.000000000 -0400 |
21337 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_32.h linux-2.6.38.4/arch/sparc/include/asm/elf_32.h |
21338 |
+--- linux-2.6.38.4/arch/sparc/include/asm/elf_32.h 2011-03-14 21:20:32.000000000 -0400 |
21339 |
++++ linux-2.6.38.4/arch/sparc/include/asm/elf_32.h 2011-04-17 15:57:32.000000000 -0400 |
21340 |
@@ -114,6 +114,13 @@ typedef struct { |
21341 |
|
21342 |
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) |
21343 |
@@ -3805,9 +3805,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/elf_32.h linux-2.6.38.3/arch/sp |
21344 |
/* This yields a mask that user programs can use to figure out what |
21345 |
instruction set this cpu supports. This can NOT be done in userspace |
21346 |
on Sparc. */ |
21347 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/elf_64.h linux-2.6.38.3/arch/sparc/include/asm/elf_64.h |
21348 |
---- linux-2.6.38.3/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.000000000 -0400 |
21349 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/elf_64.h 2011-04-17 15:57:32.000000000 -0400 |
21350 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_64.h linux-2.6.38.4/arch/sparc/include/asm/elf_64.h |
21351 |
+--- linux-2.6.38.4/arch/sparc/include/asm/elf_64.h 2011-03-14 21:20:32.000000000 -0400 |
21352 |
++++ linux-2.6.38.4/arch/sparc/include/asm/elf_64.h 2011-04-17 15:57:32.000000000 -0400 |
21353 |
@@ -162,6 +162,12 @@ typedef struct { |
21354 |
#define ELF_ET_DYN_BASE 0x0000010000000000UL |
21355 |
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL |
21356 |
@@ -3821,9 +3821,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/elf_64.h linux-2.6.38.3/arch/sp |
21357 |
|
21358 |
/* This yields a mask that user programs can use to figure out what |
21359 |
instruction set this cpu supports. */ |
21360 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h |
21361 |
---- linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400 |
21362 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:57:32.000000000 -0400 |
21363 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h |
21364 |
+--- linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400 |
21365 |
++++ linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:57:32.000000000 -0400 |
21366 |
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) |
21367 |
BTFIXUPDEF_INT(page_none) |
21368 |
BTFIXUPDEF_INT(page_copy) |
21369 |
@@ -3855,9 +3855,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.3/arc |
21370 |
extern unsigned long page_kernel; |
21371 |
|
21372 |
#ifdef MODULE |
21373 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h |
21374 |
---- linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32.000000000 -0400 |
21375 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:57:32.000000000 -0400 |
21376 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h |
21377 |
+--- linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h 2011-03-14 21:20:32.000000000 -0400 |
21378 |
++++ linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:57:32.000000000 -0400 |
21379 |
@@ -115,6 +115,13 @@ |
21380 |
SRMMU_EXEC | SRMMU_REF) |
21381 |
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ |
21382 |
@@ -3872,9 +3872,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.3/arch/ |
21383 |
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ |
21384 |
SRMMU_DIRTY | SRMMU_REF) |
21385 |
|
21386 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h |
21387 |
---- linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20:32.000000000 -0400 |
21388 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:57:32.000000000 -0400 |
21389 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h |
21390 |
+--- linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h 2011-03-14 21:20:32.000000000 -0400 |
21391 |
++++ linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h 2011-04-17 15:57:32.000000000 -0400 |
21392 |
@@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r |
21393 |
__asm__ __volatile__ ( |
21394 |
"1: ldsw [%2], %0\n" |
21395 |
@@ -3926,9 +3926,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.3/ar |
21396 |
" cas [%2], %0, %1\n" |
21397 |
" cmp %0, %1\n" |
21398 |
" bne,pn %%xcc, 1b\n" |
21399 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h |
21400 |
---- linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400 |
21401 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:57:32.000000000 -0400 |
21402 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h |
21403 |
+--- linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400 |
21404 |
++++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:57:32.000000000 -0400 |
21405 |
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ |
21406 |
|
21407 |
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) |
21408 |
@@ -3980,9 +3980,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.3/arc |
21409 |
return __copy_user((__force void __user *) to, from, n); |
21410 |
} |
21411 |
|
21412 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h |
21413 |
---- linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400 |
21414 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:57:32.000000000 -0400 |
21415 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h |
21416 |
+--- linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400 |
21417 |
++++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:57:32.000000000 -0400 |
21418 |
@@ -10,6 +10,7 @@ |
21419 |
#include <linux/compiler.h> |
21420 |
#include <linux/string.h> |
21421 |
@@ -4025,9 +4025,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.3/arc |
21422 |
if (unlikely(ret)) |
21423 |
ret = copy_to_user_fixup(to, from, size); |
21424 |
return ret; |
21425 |
-diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess.h linux-2.6.38.3/arch/sparc/include/asm/uaccess.h |
21426 |
---- linux-2.6.38.3/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
21427 |
-+++ linux-2.6.38.3/arch/sparc/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
21428 |
+diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess.h linux-2.6.38.4/arch/sparc/include/asm/uaccess.h |
21429 |
+--- linux-2.6.38.4/arch/sparc/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
21430 |
++++ linux-2.6.38.4/arch/sparc/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
21431 |
@@ -1,5 +1,13 @@ |
21432 |
#ifndef ___ASM_SPARC_UACCESS_H |
21433 |
#define ___ASM_SPARC_UACCESS_H |
21434 |
@@ -4042,10 +4042,10 @@ diff -urNp linux-2.6.38.3/arch/sparc/include/asm/uaccess.h linux-2.6.38.3/arch/s |
21435 |
#if defined(__sparc__) && defined(__arch64__) |
21436 |
#include <asm/uaccess_64.h> |
21437 |
#else |
21438 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/iommu.c linux-2.6.38.3/arch/sparc/kernel/iommu.c |
21439 |
---- linux-2.6.38.3/arch/sparc/kernel/iommu.c 2011-03-14 21:20:32.000000000 -0400 |
21440 |
-+++ linux-2.6.38.3/arch/sparc/kernel/iommu.c 2011-04-17 15:57:32.000000000 -0400 |
21441 |
-@@ -827,7 +827,7 @@ static void dma_4u_sync_sg_for_cpu(struc |
21442 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/iommu.c linux-2.6.38.4/arch/sparc/kernel/iommu.c |
21443 |
+--- linux-2.6.38.4/arch/sparc/kernel/iommu.c 2011-04-22 19:20:59.000000000 -0400 |
21444 |
++++ linux-2.6.38.4/arch/sparc/kernel/iommu.c 2011-04-22 19:21:10.000000000 -0400 |
21445 |
+@@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc |
21446 |
spin_unlock_irqrestore(&iommu->lock, flags); |
21447 |
} |
21448 |
|
21449 |
@@ -4054,7 +4054,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/iommu.c linux-2.6.38.3/arch/sparc/ke |
21450 |
.alloc_coherent = dma_4u_alloc_coherent, |
21451 |
.free_coherent = dma_4u_free_coherent, |
21452 |
.map_page = dma_4u_map_page, |
21453 |
-@@ -838,7 +838,7 @@ static struct dma_map_ops sun4u_dma_ops |
21454 |
+@@ -835,7 +835,7 @@ static struct dma_map_ops sun4u_dma_ops |
21455 |
.sync_sg_for_cpu = dma_4u_sync_sg_for_cpu, |
21456 |
}; |
21457 |
|
21458 |
@@ -4063,9 +4063,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/iommu.c linux-2.6.38.3/arch/sparc/ke |
21459 |
EXPORT_SYMBOL(dma_ops); |
21460 |
|
21461 |
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); |
21462 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/ioport.c linux-2.6.38.3/arch/sparc/kernel/ioport.c |
21463 |
---- linux-2.6.38.3/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400 |
21464 |
-+++ linux-2.6.38.3/arch/sparc/kernel/ioport.c 2011-04-17 15:57:32.000000000 -0400 |
21465 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/ioport.c linux-2.6.38.4/arch/sparc/kernel/ioport.c |
21466 |
+--- linux-2.6.38.4/arch/sparc/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400 |
21467 |
++++ linux-2.6.38.4/arch/sparc/kernel/ioport.c 2011-04-17 15:57:32.000000000 -0400 |
21468 |
@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru |
21469 |
BUG(); |
21470 |
} |
21471 |
@@ -4093,9 +4093,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/ioport.c linux-2.6.38.3/arch/sparc/k |
21472 |
.alloc_coherent = pci32_alloc_coherent, |
21473 |
.free_coherent = pci32_free_coherent, |
21474 |
.map_page = pci32_map_page, |
21475 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c |
21476 |
---- linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.000000000 -0400 |
21477 |
-+++ linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:57:32.000000000 -0400 |
21478 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c |
21479 |
+--- linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c 2011-03-14 21:20:32.000000000 -0400 |
21480 |
++++ linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:57:32.000000000 -0400 |
21481 |
@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re |
21482 |
regs->npc = regs->pc + 4; |
21483 |
} |
21484 |
@@ -4105,9 +4105,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_32.c linux-2.6.38.3/arch/sparc/ |
21485 |
/* Breakpoint instruction: ta 0x7d */ |
21486 |
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, |
21487 |
}; |
21488 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c |
21489 |
---- linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.000000000 -0400 |
21490 |
-+++ linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:57:32.000000000 -0400 |
21491 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c |
21492 |
+--- linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c 2011-03-14 21:20:32.000000000 -0400 |
21493 |
++++ linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:57:32.000000000 -0400 |
21494 |
@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re |
21495 |
regs->tnpc = regs->tpc + 4; |
21496 |
} |
21497 |
@@ -4117,9 +4117,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/kgdb_64.c linux-2.6.38.3/arch/sparc/ |
21498 |
/* Breakpoint instruction: ta 0x72 */ |
21499 |
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, |
21500 |
}; |
21501 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/Makefile linux-2.6.38.3/arch/sparc/kernel/Makefile |
21502 |
---- linux-2.6.38.3/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000000 -0400 |
21503 |
-+++ linux-2.6.38.3/arch/sparc/kernel/Makefile 2011-04-17 15:57:32.000000000 -0400 |
21504 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/Makefile linux-2.6.38.4/arch/sparc/kernel/Makefile |
21505 |
+--- linux-2.6.38.4/arch/sparc/kernel/Makefile 2011-03-14 21:20:32.000000000 -0400 |
21506 |
++++ linux-2.6.38.4/arch/sparc/kernel/Makefile 2011-04-17 15:57:32.000000000 -0400 |
21507 |
@@ -3,7 +3,7 @@ |
21508 |
# |
21509 |
|
21510 |
@@ -4129,9 +4129,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/Makefile linux-2.6.38.3/arch/sparc/k |
21511 |
|
21512 |
extra-y := head_$(BITS).o |
21513 |
extra-y += init_task.o |
21514 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c |
21515 |
---- linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c 2011-03-14 21:20:32.000000000 -0400 |
21516 |
-+++ linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:57:32.000000000 -0400 |
21517 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c |
21518 |
+--- linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c 2011-04-22 19:20:59.000000000 -0400 |
21519 |
++++ linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c 2011-04-22 19:21:10.000000000 -0400 |
21520 |
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic |
21521 |
spin_unlock_irqrestore(&iommu->lock, flags); |
21522 |
} |
21523 |
@@ -4141,9 +4141,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.3/arch/spar |
21524 |
.alloc_coherent = dma_4v_alloc_coherent, |
21525 |
.free_coherent = dma_4v_free_coherent, |
21526 |
.map_page = dma_4v_map_page, |
21527 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/process_32.c linux-2.6.38.3/arch/sparc/kernel/process_32.c |
21528 |
---- linux-2.6.38.3/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400 |
21529 |
-+++ linux-2.6.38.3/arch/sparc/kernel/process_32.c 2011-04-17 15:57:32.000000000 -0400 |
21530 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_32.c linux-2.6.38.4/arch/sparc/kernel/process_32.c |
21531 |
+--- linux-2.6.38.4/arch/sparc/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400 |
21532 |
++++ linux-2.6.38.4/arch/sparc/kernel/process_32.c 2011-04-17 15:57:32.000000000 -0400 |
21533 |
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) |
21534 |
rw->ins[4], rw->ins[5], |
21535 |
rw->ins[6], |
21536 |
@@ -4179,9 +4179,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/process_32.c linux-2.6.38.3/arch/spa |
21537 |
fp = rw->ins[6]; |
21538 |
} while (++count < 16); |
21539 |
printk("\n"); |
21540 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/process_64.c linux-2.6.38.3/arch/sparc/kernel/process_64.c |
21541 |
---- linux-2.6.38.3/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400 |
21542 |
-+++ linux-2.6.38.3/arch/sparc/kernel/process_64.c 2011-04-17 15:57:32.000000000 -0400 |
21543 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_64.c linux-2.6.38.4/arch/sparc/kernel/process_64.c |
21544 |
+--- linux-2.6.38.4/arch/sparc/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400 |
21545 |
++++ linux-2.6.38.4/arch/sparc/kernel/process_64.c 2011-04-17 15:57:32.000000000 -0400 |
21546 |
@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg |
21547 |
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", |
21548 |
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); |
21549 |
@@ -4217,9 +4217,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/process_64.c linux-2.6.38.3/arch/spa |
21550 |
(void *) gp->tpc, |
21551 |
(void *) gp->o7, |
21552 |
(void *) gp->i7, |
21553 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c |
21554 |
---- linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.000000000 -0400 |
21555 |
-+++ linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:57:32.000000000 -0400 |
21556 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c |
21557 |
+--- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c 2011-03-14 21:20:32.000000000 -0400 |
21558 |
++++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:57:32.000000000 -0400 |
21559 |
@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str |
21560 |
if (ARCH_SUN4C && len > 0x20000000) |
21561 |
return -ENOMEM; |
21562 |
@@ -4238,9 +4238,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.3/arch/s |
21563 |
return addr; |
21564 |
addr = vmm->vm_end; |
21565 |
if (flags & MAP_SHARED) |
21566 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c |
21567 |
---- linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.000000000 -0400 |
21568 |
-+++ linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:57:32.000000000 -0400 |
21569 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c |
21570 |
+--- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c 2011-03-14 21:20:32.000000000 -0400 |
21571 |
++++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:57:32.000000000 -0400 |
21572 |
@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str |
21573 |
/* We do not accept a shared mapping if it would violate |
21574 |
* cache aliasing constraints. |
21575 |
@@ -4388,9 +4388,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.3/arch/s |
21576 |
mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
21577 |
mm->unmap_area = arch_unmap_area_topdown; |
21578 |
} |
21579 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_32.c linux-2.6.38.3/arch/sparc/kernel/traps_32.c |
21580 |
---- linux-2.6.38.3/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.000000000 -0400 |
21581 |
-+++ linux-2.6.38.3/arch/sparc/kernel/traps_32.c 2011-04-17 15:57:32.000000000 -0400 |
21582 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_32.c linux-2.6.38.4/arch/sparc/kernel/traps_32.c |
21583 |
+--- linux-2.6.38.4/arch/sparc/kernel/traps_32.c 2011-03-14 21:20:32.000000000 -0400 |
21584 |
++++ linux-2.6.38.4/arch/sparc/kernel/traps_32.c 2011-04-17 15:57:32.000000000 -0400 |
21585 |
@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_ |
21586 |
count++ < 30 && |
21587 |
(((unsigned long) rw) >= PAGE_OFFSET) && |
21588 |
@@ -4400,9 +4400,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_32.c linux-2.6.38.3/arch/sparc |
21589 |
(void *) rw->ins[7]); |
21590 |
rw = (struct reg_window32 *)rw->ins[6]; |
21591 |
} |
21592 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_64.c linux-2.6.38.3/arch/sparc/kernel/traps_64.c |
21593 |
---- linux-2.6.38.3/arch/sparc/kernel/traps_64.c 2011-03-14 21:20:32.000000000 -0400 |
21594 |
-+++ linux-2.6.38.3/arch/sparc/kernel/traps_64.c 2011-04-17 15:57:32.000000000 -0400 |
21595 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_64.c linux-2.6.38.4/arch/sparc/kernel/traps_64.c |
21596 |
+--- linux-2.6.38.4/arch/sparc/kernel/traps_64.c 2011-04-22 19:20:59.000000000 -0400 |
21597 |
++++ linux-2.6.38.4/arch/sparc/kernel/traps_64.c 2011-04-22 19:21:10.000000000 -0400 |
21598 |
@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_ |
21599 |
i + 1, |
21600 |
p->trapstack[i].tstate, p->trapstack[i].tpc, |
21601 |
@@ -4494,7 +4494,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_64.c linux-2.6.38.3/arch/sparc |
21602 |
(void *) regs->u_regs[UREG_I7]); |
21603 |
printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] " |
21604 |
"pte[%lx] error[%lx]\n", |
21605 |
-@@ -2196,13 +2207,13 @@ void show_stack(struct task_struct *tsk, |
21606 |
+@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, |
21607 |
fp = (unsigned long)sf->fp + STACK_BIAS; |
21608 |
} |
21609 |
|
21610 |
@@ -4510,7 +4510,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_64.c linux-2.6.38.3/arch/sparc |
21611 |
graph++; |
21612 |
} |
21613 |
} |
21614 |
-@@ -2255,7 +2266,7 @@ void die_if_kernel(char *str, struct pt_ |
21615 |
+@@ -2254,7 +2265,7 @@ void die_if_kernel(char *str, struct pt_ |
21616 |
while (rw && |
21617 |
count++ < 30 && |
21618 |
kstack_valid(tp, (unsigned long) rw)) { |
21619 |
@@ -4519,9 +4519,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/traps_64.c linux-2.6.38.3/arch/sparc |
21620 |
(void *) rw->ins[7]); |
21621 |
|
21622 |
rw = kernel_stack_up(rw); |
21623 |
-diff -urNp linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c |
21624 |
---- linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.000000000 -0400 |
21625 |
-+++ linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:57:32.000000000 -0400 |
21626 |
+diff -urNp linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c |
21627 |
+--- linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c 2011-03-14 21:20:32.000000000 -0400 |
21628 |
++++ linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:57:32.000000000 -0400 |
21629 |
@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs |
21630 |
static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); |
21631 |
|
21632 |
@@ -4531,9 +4531,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/kernel/unaligned_64.c linux-2.6.38.3/arch/s |
21633 |
regs->tpc, (void *) regs->tpc); |
21634 |
} |
21635 |
} |
21636 |
-diff -urNp linux-2.6.38.3/arch/sparc/lib/atomic_64.S linux-2.6.38.3/arch/sparc/lib/atomic_64.S |
21637 |
---- linux-2.6.38.3/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000000 -0400 |
21638 |
-+++ linux-2.6.38.3/arch/sparc/lib/atomic_64.S 2011-04-17 15:57:32.000000000 -0400 |
21639 |
+diff -urNp linux-2.6.38.4/arch/sparc/lib/atomic_64.S linux-2.6.38.4/arch/sparc/lib/atomic_64.S |
21640 |
+--- linux-2.6.38.4/arch/sparc/lib/atomic_64.S 2011-03-14 21:20:32.000000000 -0400 |
21641 |
++++ linux-2.6.38.4/arch/sparc/lib/atomic_64.S 2011-04-17 15:57:32.000000000 -0400 |
21642 |
@@ -18,7 +18,12 @@ |
21643 |
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ |
21644 |
BACKOFF_SETUP(%o2) |
21645 |
@@ -4768,9 +4768,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/lib/atomic_64.S linux-2.6.38.3/arch/sparc/l |
21646 |
casx [%o1], %g1, %g7 |
21647 |
cmp %g1, %g7 |
21648 |
bne,pn %xcc, BACKOFF_LABEL(2f, 1b) |
21649 |
-diff -urNp linux-2.6.38.3/arch/sparc/lib/ksyms.c linux-2.6.38.3/arch/sparc/lib/ksyms.c |
21650 |
---- linux-2.6.38.3/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 -0400 |
21651 |
-+++ linux-2.6.38.3/arch/sparc/lib/ksyms.c 2011-04-17 15:57:32.000000000 -0400 |
21652 |
+diff -urNp linux-2.6.38.4/arch/sparc/lib/ksyms.c linux-2.6.38.4/arch/sparc/lib/ksyms.c |
21653 |
+--- linux-2.6.38.4/arch/sparc/lib/ksyms.c 2011-03-14 21:20:32.000000000 -0400 |
21654 |
++++ linux-2.6.38.4/arch/sparc/lib/ksyms.c 2011-04-17 15:57:32.000000000 -0400 |
21655 |
@@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write); |
21656 |
|
21657 |
/* Atomic counter implementation. */ |
21658 |
@@ -4789,9 +4789,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/lib/ksyms.c linux-2.6.38.3/arch/sparc/lib/k |
21659 |
EXPORT_SYMBOL(atomic64_sub_ret); |
21660 |
|
21661 |
/* Atomic bit operations. */ |
21662 |
-diff -urNp linux-2.6.38.3/arch/sparc/Makefile linux-2.6.38.3/arch/sparc/Makefile |
21663 |
---- linux-2.6.38.3/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -0400 |
21664 |
-+++ linux-2.6.38.3/arch/sparc/Makefile 2011-04-17 15:57:32.000000000 -0400 |
21665 |
+diff -urNp linux-2.6.38.4/arch/sparc/Makefile linux-2.6.38.4/arch/sparc/Makefile |
21666 |
+--- linux-2.6.38.4/arch/sparc/Makefile 2011-03-14 21:20:32.000000000 -0400 |
21667 |
++++ linux-2.6.38.4/arch/sparc/Makefile 2011-04-17 15:57:32.000000000 -0400 |
21668 |
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc |
21669 |
# Export what is needed by arch/sparc/boot/Makefile |
21670 |
export VMLINUX_INIT VMLINUX_MAIN |
21671 |
@@ -4801,9 +4801,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/Makefile linux-2.6.38.3/arch/sparc/Makefile |
21672 |
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) |
21673 |
VMLINUX_MAIN += $(drivers-y) $(net-y) |
21674 |
|
21675 |
-diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_32.c linux-2.6.38.3/arch/sparc/mm/fault_32.c |
21676 |
---- linux-2.6.38.3/arch/sparc/mm/fault_32.c 2011-03-14 21:20:32.000000000 -0400 |
21677 |
-+++ linux-2.6.38.3/arch/sparc/mm/fault_32.c 2011-04-17 15:57:32.000000000 -0400 |
21678 |
+diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_32.c linux-2.6.38.4/arch/sparc/mm/fault_32.c |
21679 |
+--- linux-2.6.38.4/arch/sparc/mm/fault_32.c 2011-04-22 19:20:59.000000000 -0400 |
21680 |
++++ linux-2.6.38.4/arch/sparc/mm/fault_32.c 2011-04-22 19:21:10.000000000 -0400 |
21681 |
@@ -22,6 +22,9 @@ |
21682 |
#include <linux/interrupt.h> |
21683 |
#include <linux/module.h> |
21684 |
@@ -5083,7 +5083,7 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_32.c linux-2.6.38.3/arch/sparc/mm/ |
21685 |
static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs, |
21686 |
int text_fault) |
21687 |
{ |
21688 |
-@@ -282,6 +547,24 @@ good_area: |
21689 |
+@@ -281,6 +546,24 @@ good_area: |
21690 |
if(!(vma->vm_flags & VM_WRITE)) |
21691 |
goto bad_area; |
21692 |
} else { |
21693 |
@@ -5108,9 +5108,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_32.c linux-2.6.38.3/arch/sparc/mm/ |
21694 |
/* Allow reads even for write-only mappings */ |
21695 |
if(!(vma->vm_flags & (VM_READ | VM_EXEC))) |
21696 |
goto bad_area; |
21697 |
-diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_64.c linux-2.6.38.3/arch/sparc/mm/fault_64.c |
21698 |
---- linux-2.6.38.3/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.000000000 -0400 |
21699 |
-+++ linux-2.6.38.3/arch/sparc/mm/fault_64.c 2011-04-17 15:57:32.000000000 -0400 |
21700 |
+diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_64.c linux-2.6.38.4/arch/sparc/mm/fault_64.c |
21701 |
+--- linux-2.6.38.4/arch/sparc/mm/fault_64.c 2011-03-14 21:20:32.000000000 -0400 |
21702 |
++++ linux-2.6.38.4/arch/sparc/mm/fault_64.c 2011-04-17 15:57:32.000000000 -0400 |
21703 |
@@ -21,6 +21,9 @@ |
21704 |
#include <linux/kprobes.h> |
21705 |
#include <linux/kdebug.h> |
21706 |
@@ -5618,9 +5618,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/fault_64.c linux-2.6.38.3/arch/sparc/mm/ |
21707 |
/* Pure DTLB misses do not tell us whether the fault causing |
21708 |
* load/store/atomic was a write or not, it only says that there |
21709 |
* was no match. So in such a case we (carefully) read the |
21710 |
-diff -urNp linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c |
21711 |
---- linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 |
21712 |
-+++ linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:57:32.000000000 -0400 |
21713 |
+diff -urNp linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c |
21714 |
+--- linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 |
21715 |
++++ linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:57:32.000000000 -0400 |
21716 |
@@ -68,7 +68,7 @@ full_search: |
21717 |
} |
21718 |
return -ENOMEM; |
21719 |
@@ -5680,9 +5680,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/hugetlbpage.c linux-2.6.38.3/arch/sparc/ |
21720 |
return addr; |
21721 |
} |
21722 |
if (mm->get_unmapped_area == arch_get_unmapped_area) |
21723 |
-diff -urNp linux-2.6.38.3/arch/sparc/mm/init_32.c linux-2.6.38.3/arch/sparc/mm/init_32.c |
21724 |
---- linux-2.6.38.3/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400 |
21725 |
-+++ linux-2.6.38.3/arch/sparc/mm/init_32.c 2011-04-17 15:57:32.000000000 -0400 |
21726 |
+diff -urNp linux-2.6.38.4/arch/sparc/mm/init_32.c linux-2.6.38.4/arch/sparc/mm/init_32.c |
21727 |
+--- linux-2.6.38.4/arch/sparc/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400 |
21728 |
++++ linux-2.6.38.4/arch/sparc/mm/init_32.c 2011-04-17 15:57:32.000000000 -0400 |
21729 |
@@ -318,6 +318,9 @@ extern void device_scan(void); |
21730 |
pgprot_t PAGE_SHARED __read_mostly; |
21731 |
EXPORT_SYMBOL(PAGE_SHARED); |
21732 |
@@ -5717,9 +5717,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/init_32.c linux-2.6.38.3/arch/sparc/mm/i |
21733 |
protection_map[12] = PAGE_READONLY; |
21734 |
protection_map[13] = PAGE_READONLY; |
21735 |
protection_map[14] = PAGE_SHARED; |
21736 |
-diff -urNp linux-2.6.38.3/arch/sparc/mm/Makefile linux-2.6.38.3/arch/sparc/mm/Makefile |
21737 |
---- linux-2.6.38.3/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 -0400 |
21738 |
-+++ linux-2.6.38.3/arch/sparc/mm/Makefile 2011-04-17 15:57:32.000000000 -0400 |
21739 |
+diff -urNp linux-2.6.38.4/arch/sparc/mm/Makefile linux-2.6.38.4/arch/sparc/mm/Makefile |
21740 |
+--- linux-2.6.38.4/arch/sparc/mm/Makefile 2011-03-14 21:20:32.000000000 -0400 |
21741 |
++++ linux-2.6.38.4/arch/sparc/mm/Makefile 2011-04-17 15:57:32.000000000 -0400 |
21742 |
@@ -2,7 +2,7 @@ |
21743 |
# |
21744 |
|
21745 |
@@ -5729,9 +5729,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/Makefile linux-2.6.38.3/arch/sparc/mm/Ma |
21746 |
|
21747 |
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o |
21748 |
obj-y += fault_$(BITS).o |
21749 |
-diff -urNp linux-2.6.38.3/arch/sparc/mm/srmmu.c linux-2.6.38.3/arch/sparc/mm/srmmu.c |
21750 |
---- linux-2.6.38.3/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -0400 |
21751 |
-+++ linux-2.6.38.3/arch/sparc/mm/srmmu.c 2011-04-17 15:57:32.000000000 -0400 |
21752 |
+diff -urNp linux-2.6.38.4/arch/sparc/mm/srmmu.c linux-2.6.38.4/arch/sparc/mm/srmmu.c |
21753 |
+--- linux-2.6.38.4/arch/sparc/mm/srmmu.c 2011-03-14 21:20:32.000000000 -0400 |
21754 |
++++ linux-2.6.38.4/arch/sparc/mm/srmmu.c 2011-04-17 15:57:32.000000000 -0400 |
21755 |
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) |
21756 |
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); |
21757 |
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); |
21758 |
@@ -5746,9 +5746,9 @@ diff -urNp linux-2.6.38.3/arch/sparc/mm/srmmu.c linux-2.6.38.3/arch/sparc/mm/srm |
21759 |
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); |
21760 |
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); |
21761 |
|
21762 |
-diff -urNp linux-2.6.38.3/arch/um/include/asm/kmap_types.h linux-2.6.38.3/arch/um/include/asm/kmap_types.h |
21763 |
---- linux-2.6.38.3/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
21764 |
-+++ linux-2.6.38.3/arch/um/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
21765 |
+diff -urNp linux-2.6.38.4/arch/um/include/asm/kmap_types.h linux-2.6.38.4/arch/um/include/asm/kmap_types.h |
21766 |
+--- linux-2.6.38.4/arch/um/include/asm/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
21767 |
++++ linux-2.6.38.4/arch/um/include/asm/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
21768 |
@@ -23,6 +23,7 @@ enum km_type { |
21769 |
KM_IRQ1, |
21770 |
KM_SOFTIRQ0, |
21771 |
@@ -5757,9 +5757,9 @@ diff -urNp linux-2.6.38.3/arch/um/include/asm/kmap_types.h linux-2.6.38.3/arch/u |
21772 |
KM_TYPE_NR |
21773 |
}; |
21774 |
|
21775 |
-diff -urNp linux-2.6.38.3/arch/um/include/asm/page.h linux-2.6.38.3/arch/um/include/asm/page.h |
21776 |
---- linux-2.6.38.3/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 |
21777 |
-+++ linux-2.6.38.3/arch/um/include/asm/page.h 2011-04-17 15:57:32.000000000 -0400 |
21778 |
+diff -urNp linux-2.6.38.4/arch/um/include/asm/page.h linux-2.6.38.4/arch/um/include/asm/page.h |
21779 |
+--- linux-2.6.38.4/arch/um/include/asm/page.h 2011-03-14 21:20:32.000000000 -0400 |
21780 |
++++ linux-2.6.38.4/arch/um/include/asm/page.h 2011-04-17 15:57:32.000000000 -0400 |
21781 |
@@ -14,6 +14,9 @@ |
21782 |
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) |
21783 |
#define PAGE_MASK (~(PAGE_SIZE-1)) |
21784 |
@@ -5770,9 +5770,9 @@ diff -urNp linux-2.6.38.3/arch/um/include/asm/page.h linux-2.6.38.3/arch/um/incl |
21785 |
#ifndef __ASSEMBLY__ |
21786 |
|
21787 |
struct page; |
21788 |
-diff -urNp linux-2.6.38.3/arch/um/kernel/process.c linux-2.6.38.3/arch/um/kernel/process.c |
21789 |
---- linux-2.6.38.3/arch/um/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
21790 |
-+++ linux-2.6.38.3/arch/um/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
21791 |
+diff -urNp linux-2.6.38.4/arch/um/kernel/process.c linux-2.6.38.4/arch/um/kernel/process.c |
21792 |
+--- linux-2.6.38.4/arch/um/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
21793 |
++++ linux-2.6.38.4/arch/um/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
21794 |
@@ -404,22 +404,6 @@ int singlestepping(void * t) |
21795 |
return 2; |
21796 |
} |
21797 |
@@ -5796,9 +5796,9 @@ diff -urNp linux-2.6.38.3/arch/um/kernel/process.c linux-2.6.38.3/arch/um/kernel |
21798 |
unsigned long get_wchan(struct task_struct *p) |
21799 |
{ |
21800 |
unsigned long stack_page, sp, ip; |
21801 |
-diff -urNp linux-2.6.38.3/arch/um/sys-i386/syscalls.c linux-2.6.38.3/arch/um/sys-i386/syscalls.c |
21802 |
---- linux-2.6.38.3/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.000000000 -0400 |
21803 |
-+++ linux-2.6.38.3/arch/um/sys-i386/syscalls.c 2011-04-17 15:57:32.000000000 -0400 |
21804 |
+diff -urNp linux-2.6.38.4/arch/um/sys-i386/syscalls.c linux-2.6.38.4/arch/um/sys-i386/syscalls.c |
21805 |
+--- linux-2.6.38.4/arch/um/sys-i386/syscalls.c 2011-03-14 21:20:32.000000000 -0400 |
21806 |
++++ linux-2.6.38.4/arch/um/sys-i386/syscalls.c 2011-04-17 15:57:32.000000000 -0400 |
21807 |
@@ -11,6 +11,21 @@ |
21808 |
#include "asm/uaccess.h" |
21809 |
#include "asm/unistd.h" |
21810 |
@@ -5821,9 +5821,9 @@ diff -urNp linux-2.6.38.3/arch/um/sys-i386/syscalls.c linux-2.6.38.3/arch/um/sys |
21811 |
/* |
21812 |
* The prototype on i386 is: |
21813 |
* |
21814 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/bitops.h linux-2.6.38.3/arch/x86/boot/bitops.h |
21815 |
---- linux-2.6.38.3/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 -0400 |
21816 |
-+++ linux-2.6.38.3/arch/x86/boot/bitops.h 2011-04-17 15:57:32.000000000 -0400 |
21817 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/bitops.h linux-2.6.38.4/arch/x86/boot/bitops.h |
21818 |
+--- linux-2.6.38.4/arch/x86/boot/bitops.h 2011-03-14 21:20:32.000000000 -0400 |
21819 |
++++ linux-2.6.38.4/arch/x86/boot/bitops.h 2011-04-17 15:57:32.000000000 -0400 |
21820 |
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int |
21821 |
u8 v; |
21822 |
const u32 *p = (const u32 *)addr; |
21823 |
@@ -5842,9 +5842,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/bitops.h linux-2.6.38.3/arch/x86/boot/bi |
21824 |
} |
21825 |
|
21826 |
#endif /* BOOT_BITOPS_H */ |
21827 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/boot.h linux-2.6.38.3/arch/x86/boot/boot.h |
21828 |
---- linux-2.6.38.3/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0400 |
21829 |
-+++ linux-2.6.38.3/arch/x86/boot/boot.h 2011-04-17 15:57:32.000000000 -0400 |
21830 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/boot.h linux-2.6.38.4/arch/x86/boot/boot.h |
21831 |
+--- linux-2.6.38.4/arch/x86/boot/boot.h 2011-03-14 21:20:32.000000000 -0400 |
21832 |
++++ linux-2.6.38.4/arch/x86/boot/boot.h 2011-04-17 15:57:32.000000000 -0400 |
21833 |
@@ -85,7 +85,7 @@ static inline void io_delay(void) |
21834 |
static inline u16 ds(void) |
21835 |
{ |
21836 |
@@ -5863,9 +5863,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/boot.h linux-2.6.38.3/arch/x86/boot/boot |
21837 |
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); |
21838 |
return diff; |
21839 |
} |
21840 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/head_32.S linux-2.6.38.3/arch/x86/boot/compressed/head_32.S |
21841 |
---- linux-2.6.38.3/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:32.000000000 -0400 |
21842 |
-+++ linux-2.6.38.3/arch/x86/boot/compressed/head_32.S 2011-04-17 15:57:32.000000000 -0400 |
21843 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_32.S linux-2.6.38.4/arch/x86/boot/compressed/head_32.S |
21844 |
+--- linux-2.6.38.4/arch/x86/boot/compressed/head_32.S 2011-03-14 21:20:32.000000000 -0400 |
21845 |
++++ linux-2.6.38.4/arch/x86/boot/compressed/head_32.S 2011-04-17 15:57:32.000000000 -0400 |
21846 |
@@ -76,7 +76,7 @@ ENTRY(startup_32) |
21847 |
notl %eax |
21848 |
andl %eax, %ebx |
21849 |
@@ -5894,9 +5894,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/head_32.S linux-2.6.38.3/arch |
21850 |
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) |
21851 |
jmp 1b |
21852 |
2: |
21853 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/head_64.S linux-2.6.38.3/arch/x86/boot/compressed/head_64.S |
21854 |
---- linux-2.6.38.3/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:32.000000000 -0400 |
21855 |
-+++ linux-2.6.38.3/arch/x86/boot/compressed/head_64.S 2011-04-17 15:57:32.000000000 -0400 |
21856 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_64.S linux-2.6.38.4/arch/x86/boot/compressed/head_64.S |
21857 |
+--- linux-2.6.38.4/arch/x86/boot/compressed/head_64.S 2011-03-14 21:20:32.000000000 -0400 |
21858 |
++++ linux-2.6.38.4/arch/x86/boot/compressed/head_64.S 2011-04-17 15:57:32.000000000 -0400 |
21859 |
@@ -91,7 +91,7 @@ ENTRY(startup_32) |
21860 |
notl %eax |
21861 |
andl %eax, %ebx |
21862 |
@@ -5915,9 +5915,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/head_64.S linux-2.6.38.3/arch |
21863 |
#endif |
21864 |
|
21865 |
/* Target address to relocate to for decompression */ |
21866 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/misc.c linux-2.6.38.3/arch/x86/boot/compressed/misc.c |
21867 |
---- linux-2.6.38.3/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.000000000 -0400 |
21868 |
-+++ linux-2.6.38.3/arch/x86/boot/compressed/misc.c 2011-04-17 15:57:32.000000000 -0400 |
21869 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/misc.c linux-2.6.38.4/arch/x86/boot/compressed/misc.c |
21870 |
+--- linux-2.6.38.4/arch/x86/boot/compressed/misc.c 2011-03-14 21:20:32.000000000 -0400 |
21871 |
++++ linux-2.6.38.4/arch/x86/boot/compressed/misc.c 2011-04-17 15:57:32.000000000 -0400 |
21872 |
@@ -310,7 +310,7 @@ static void parse_elf(void *output) |
21873 |
case PT_LOAD: |
21874 |
#ifdef CONFIG_RELOCATABLE |
21875 |
@@ -5936,9 +5936,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/misc.c linux-2.6.38.3/arch/x8 |
21876 |
error("Wrong destination address"); |
21877 |
#endif |
21878 |
|
21879 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/relocs.c linux-2.6.38.3/arch/x86/boot/compressed/relocs.c |
21880 |
---- linux-2.6.38.3/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32.000000000 -0400 |
21881 |
-+++ linux-2.6.38.3/arch/x86/boot/compressed/relocs.c 2011-04-17 15:57:32.000000000 -0400 |
21882 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/relocs.c linux-2.6.38.4/arch/x86/boot/compressed/relocs.c |
21883 |
+--- linux-2.6.38.4/arch/x86/boot/compressed/relocs.c 2011-03-14 21:20:32.000000000 -0400 |
21884 |
++++ linux-2.6.38.4/arch/x86/boot/compressed/relocs.c 2011-04-17 15:57:32.000000000 -0400 |
21885 |
@@ -13,8 +13,11 @@ |
21886 |
|
21887 |
static void die(char *fmt, ...); |
21888 |
@@ -6131,9 +6131,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/compressed/relocs.c linux-2.6.38.3/arch/ |
21889 |
read_shdrs(fp); |
21890 |
read_strtabs(fp); |
21891 |
read_symtabs(fp); |
21892 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/cpucheck.c linux-2.6.38.3/arch/x86/boot/cpucheck.c |
21893 |
---- linux-2.6.38.3/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.000000000 -0400 |
21894 |
-+++ linux-2.6.38.3/arch/x86/boot/cpucheck.c 2011-04-17 15:57:32.000000000 -0400 |
21895 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/cpucheck.c linux-2.6.38.4/arch/x86/boot/cpucheck.c |
21896 |
+--- linux-2.6.38.4/arch/x86/boot/cpucheck.c 2011-03-14 21:20:32.000000000 -0400 |
21897 |
++++ linux-2.6.38.4/arch/x86/boot/cpucheck.c 2011-04-17 15:57:32.000000000 -0400 |
21898 |
@@ -74,7 +74,7 @@ static int has_fpu(void) |
21899 |
u16 fcw = -1, fsw = -1; |
21900 |
u32 cr0; |
21901 |
@@ -6229,9 +6229,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/cpucheck.c linux-2.6.38.3/arch/x86/boot/ |
21902 |
|
21903 |
err = check_flags(); |
21904 |
} |
21905 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/header.S linux-2.6.38.3/arch/x86/boot/header.S |
21906 |
---- linux-2.6.38.3/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 -0400 |
21907 |
-+++ linux-2.6.38.3/arch/x86/boot/header.S 2011-04-17 15:57:32.000000000 -0400 |
21908 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/header.S linux-2.6.38.4/arch/x86/boot/header.S |
21909 |
+--- linux-2.6.38.4/arch/x86/boot/header.S 2011-03-14 21:20:32.000000000 -0400 |
21910 |
++++ linux-2.6.38.4/arch/x86/boot/header.S 2011-04-17 15:57:32.000000000 -0400 |
21911 |
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical |
21912 |
# single linked list of |
21913 |
# struct setup_data |
21914 |
@@ -6241,9 +6241,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/header.S linux-2.6.38.3/arch/x86/boot/he |
21915 |
|
21916 |
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) |
21917 |
#define VO_INIT_SIZE (VO__end - VO__text) |
21918 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/memory.c linux-2.6.38.3/arch/x86/boot/memory.c |
21919 |
---- linux-2.6.38.3/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 -0400 |
21920 |
-+++ linux-2.6.38.3/arch/x86/boot/memory.c 2011-04-17 15:57:32.000000000 -0400 |
21921 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/memory.c linux-2.6.38.4/arch/x86/boot/memory.c |
21922 |
+--- linux-2.6.38.4/arch/x86/boot/memory.c 2011-03-14 21:20:32.000000000 -0400 |
21923 |
++++ linux-2.6.38.4/arch/x86/boot/memory.c 2011-04-17 15:57:32.000000000 -0400 |
21924 |
@@ -19,7 +19,7 @@ |
21925 |
|
21926 |
static int detect_memory_e820(void) |
21927 |
@@ -6253,9 +6253,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/memory.c linux-2.6.38.3/arch/x86/boot/me |
21928 |
struct biosregs ireg, oreg; |
21929 |
struct e820entry *desc = boot_params.e820_map; |
21930 |
static struct e820entry buf; /* static so it is zeroed */ |
21931 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/video.c linux-2.6.38.3/arch/x86/boot/video.c |
21932 |
---- linux-2.6.38.3/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -0400 |
21933 |
-+++ linux-2.6.38.3/arch/x86/boot/video.c 2011-04-17 15:57:32.000000000 -0400 |
21934 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/video.c linux-2.6.38.4/arch/x86/boot/video.c |
21935 |
+--- linux-2.6.38.4/arch/x86/boot/video.c 2011-03-14 21:20:32.000000000 -0400 |
21936 |
++++ linux-2.6.38.4/arch/x86/boot/video.c 2011-04-17 15:57:32.000000000 -0400 |
21937 |
@@ -96,7 +96,7 @@ static void store_mode_params(void) |
21938 |
static unsigned int get_entry(void) |
21939 |
{ |
21940 |
@@ -6265,9 +6265,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/video.c linux-2.6.38.3/arch/x86/boot/vid |
21941 |
int key; |
21942 |
unsigned int v; |
21943 |
|
21944 |
-diff -urNp linux-2.6.38.3/arch/x86/boot/video-vesa.c linux-2.6.38.3/arch/x86/boot/video-vesa.c |
21945 |
---- linux-2.6.38.3/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000000 -0400 |
21946 |
-+++ linux-2.6.38.3/arch/x86/boot/video-vesa.c 2011-04-17 15:57:32.000000000 -0400 |
21947 |
+diff -urNp linux-2.6.38.4/arch/x86/boot/video-vesa.c linux-2.6.38.4/arch/x86/boot/video-vesa.c |
21948 |
+--- linux-2.6.38.4/arch/x86/boot/video-vesa.c 2011-03-14 21:20:32.000000000 -0400 |
21949 |
++++ linux-2.6.38.4/arch/x86/boot/video-vesa.c 2011-04-17 15:57:32.000000000 -0400 |
21950 |
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) |
21951 |
|
21952 |
boot_params.screen_info.vesapm_seg = oreg.es; |
21953 |
@@ -6276,9 +6276,9 @@ diff -urNp linux-2.6.38.3/arch/x86/boot/video-vesa.c linux-2.6.38.3/arch/x86/boo |
21954 |
} |
21955 |
|
21956 |
/* |
21957 |
-diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_aout.c linux-2.6.38.3/arch/x86/ia32/ia32_aout.c |
21958 |
---- linux-2.6.38.3/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.000000000 -0400 |
21959 |
-+++ linux-2.6.38.3/arch/x86/ia32/ia32_aout.c 2011-04-17 15:57:32.000000000 -0400 |
21960 |
+diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_aout.c linux-2.6.38.4/arch/x86/ia32/ia32_aout.c |
21961 |
+--- linux-2.6.38.4/arch/x86/ia32/ia32_aout.c 2011-03-14 21:20:32.000000000 -0400 |
21962 |
++++ linux-2.6.38.4/arch/x86/ia32/ia32_aout.c 2011-04-17 15:57:32.000000000 -0400 |
21963 |
@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st |
21964 |
unsigned long dump_start, dump_size; |
21965 |
struct user32 dump; |
21966 |
@@ -6288,9 +6288,9 @@ diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_aout.c linux-2.6.38.3/arch/x86/ia32 |
21967 |
fs = get_fs(); |
21968 |
set_fs(KERNEL_DS); |
21969 |
has_dumped = 1; |
21970 |
-diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32entry.S linux-2.6.38.3/arch/x86/ia32/ia32entry.S |
21971 |
---- linux-2.6.38.3/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.000000000 -0400 |
21972 |
-+++ linux-2.6.38.3/arch/x86/ia32/ia32entry.S 2011-04-17 15:57:32.000000000 -0400 |
21973 |
+diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32entry.S linux-2.6.38.4/arch/x86/ia32/ia32entry.S |
21974 |
+--- linux-2.6.38.4/arch/x86/ia32/ia32entry.S 2011-03-14 21:20:32.000000000 -0400 |
21975 |
++++ linux-2.6.38.4/arch/x86/ia32/ia32entry.S 2011-04-17 15:57:32.000000000 -0400 |
21976 |
@@ -13,6 +13,7 @@ |
21977 |
#include <asm/thread_info.h> |
21978 |
#include <asm/segment.h> |
21979 |
@@ -6428,9 +6428,9 @@ diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32entry.S linux-2.6.38.3/arch/x86/ia32 |
21980 |
/* |
21981 |
* No need to follow this irqs on/off section: the syscall |
21982 |
* disabled irqs and here we enable it straight after entry: |
21983 |
-diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_signal.c linux-2.6.38.3/arch/x86/ia32/ia32_signal.c |
21984 |
---- linux-2.6.38.3/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.000000000 -0400 |
21985 |
-+++ linux-2.6.38.3/arch/x86/ia32/ia32_signal.c 2011-04-17 15:57:32.000000000 -0400 |
21986 |
+diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_signal.c linux-2.6.38.4/arch/x86/ia32/ia32_signal.c |
21987 |
+--- linux-2.6.38.4/arch/x86/ia32/ia32_signal.c 2011-03-14 21:20:32.000000000 -0400 |
21988 |
++++ linux-2.6.38.4/arch/x86/ia32/ia32_signal.c 2011-04-17 15:57:32.000000000 -0400 |
21989 |
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct |
21990 |
sp -= frame_size; |
21991 |
/* Align the stack pointer according to the i386 ABI, |
21992 |
@@ -6480,9 +6480,9 @@ diff -urNp linux-2.6.38.3/arch/x86/ia32/ia32_signal.c linux-2.6.38.3/arch/x86/ia |
21993 |
} put_user_catch(err); |
21994 |
|
21995 |
if (err) |
21996 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/alternative.h linux-2.6.38.3/arch/x86/include/asm/alternative.h |
21997 |
---- linux-2.6.38.3/arch/x86/include/asm/alternative.h 2011-03-14 21:20:32.000000000 -0400 |
21998 |
-+++ linux-2.6.38.3/arch/x86/include/asm/alternative.h 2011-04-17 15:57:32.000000000 -0400 |
21999 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/alternative.h linux-2.6.38.4/arch/x86/include/asm/alternative.h |
22000 |
+--- linux-2.6.38.4/arch/x86/include/asm/alternative.h 2011-03-14 21:20:32.000000000 -0400 |
22001 |
++++ linux-2.6.38.4/arch/x86/include/asm/alternative.h 2011-04-17 15:57:32.000000000 -0400 |
22002 |
@@ -94,7 +94,7 @@ static inline int alternatives_text_rese |
22003 |
".section .discard,\"aw\",@progbits\n" \ |
22004 |
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \ |
22005 |
@@ -6492,9 +6492,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/alternative.h linux-2.6.38.3/arch |
22006 |
"663:\n\t" newinstr "\n664:\n" /* replacement */ \ |
22007 |
".previous" |
22008 |
|
22009 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/apm.h linux-2.6.38.3/arch/x86/include/asm/apm.h |
22010 |
---- linux-2.6.38.3/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000000 -0400 |
22011 |
-+++ linux-2.6.38.3/arch/x86/include/asm/apm.h 2011-04-17 15:57:32.000000000 -0400 |
22012 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/apm.h linux-2.6.38.4/arch/x86/include/asm/apm.h |
22013 |
+--- linux-2.6.38.4/arch/x86/include/asm/apm.h 2011-03-14 21:20:32.000000000 -0400 |
22014 |
++++ linux-2.6.38.4/arch/x86/include/asm/apm.h 2011-04-17 15:57:32.000000000 -0400 |
22015 |
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 |
22016 |
__asm__ __volatile__(APM_DO_ZERO_SEGS |
22017 |
"pushl %%edi\n\t" |
22018 |
@@ -6513,9 +6513,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/apm.h linux-2.6.38.3/arch/x86/inc |
22019 |
"setc %%bl\n\t" |
22020 |
"popl %%ebp\n\t" |
22021 |
"popl %%edi\n\t" |
22022 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h |
22023 |
---- linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:32.000000000 -0400 |
22024 |
-+++ linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h 2011-04-17 15:57:32.000000000 -0400 |
22025 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h |
22026 |
+--- linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h 2011-03-14 21:20:32.000000000 -0400 |
22027 |
++++ linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h 2011-04-17 15:57:32.000000000 -0400 |
22028 |
@@ -12,6 +12,14 @@ typedef struct { |
22029 |
u64 __aligned(8) counter; |
22030 |
} atomic64_t; |
22031 |
@@ -6531,9 +6531,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic64_32.h linux-2.6.38.3/arch |
22032 |
#define ATOMIC64_INIT(val) { (val) } |
22033 |
|
22034 |
#ifdef CONFIG_X86_CMPXCHG64 |
22035 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h |
22036 |
---- linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:32.000000000 -0400 |
22037 |
-+++ linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h 2011-04-17 15:57:32.000000000 -0400 |
22038 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h |
22039 |
+--- linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h 2011-03-14 21:20:32.000000000 -0400 |
22040 |
++++ linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h 2011-04-17 15:57:32.000000000 -0400 |
22041 |
@@ -18,7 +18,19 @@ |
22042 |
*/ |
22043 |
static inline long atomic64_read(const atomic64_t *v) |
22044 |
@@ -6843,9 +6843,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic64_64.h linux-2.6.38.3/arch |
22045 |
} |
22046 |
|
22047 |
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) |
22048 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic.h linux-2.6.38.3/arch/x86/include/asm/atomic.h |
22049 |
---- linux-2.6.38.3/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000000000 -0400 |
22050 |
-+++ linux-2.6.38.3/arch/x86/include/asm/atomic.h 2011-04-17 15:57:32.000000000 -0400 |
22051 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic.h linux-2.6.38.4/arch/x86/include/asm/atomic.h |
22052 |
+--- linux-2.6.38.4/arch/x86/include/asm/atomic.h 2011-03-14 21:20:32.000000000 -0400 |
22053 |
++++ linux-2.6.38.4/arch/x86/include/asm/atomic.h 2011-04-17 15:57:32.000000000 -0400 |
22054 |
@@ -22,7 +22,18 @@ |
22055 |
*/ |
22056 |
static inline int atomic_read(const atomic_t *v) |
22057 |
@@ -7217,9 +7217,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/atomic.h linux-2.6.38.3/arch/x86/ |
22058 |
/* |
22059 |
* atomic_dec_if_positive - decrement by 1 if old value positive |
22060 |
* @v: pointer of type atomic_t |
22061 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/bitops.h linux-2.6.38.3/arch/x86/include/asm/bitops.h |
22062 |
---- linux-2.6.38.3/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000000000 -0400 |
22063 |
-+++ linux-2.6.38.3/arch/x86/include/asm/bitops.h 2011-04-17 15:57:32.000000000 -0400 |
22064 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/bitops.h linux-2.6.38.4/arch/x86/include/asm/bitops.h |
22065 |
+--- linux-2.6.38.4/arch/x86/include/asm/bitops.h 2011-03-14 21:20:32.000000000 -0400 |
22066 |
++++ linux-2.6.38.4/arch/x86/include/asm/bitops.h 2011-04-17 15:57:32.000000000 -0400 |
22067 |
@@ -38,7 +38,7 @@ |
22068 |
* a mask operation on a byte. |
22069 |
*/ |
22070 |
@@ -7229,9 +7229,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/bitops.h linux-2.6.38.3/arch/x86/ |
22071 |
#define CONST_MASK(nr) (1 << ((nr) & 7)) |
22072 |
|
22073 |
/** |
22074 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/boot.h linux-2.6.38.3/arch/x86/include/asm/boot.h |
22075 |
---- linux-2.6.38.3/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.000000000 -0400 |
22076 |
-+++ linux-2.6.38.3/arch/x86/include/asm/boot.h 2011-04-17 15:57:32.000000000 -0400 |
22077 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/boot.h linux-2.6.38.4/arch/x86/include/asm/boot.h |
22078 |
+--- linux-2.6.38.4/arch/x86/include/asm/boot.h 2011-03-14 21:20:32.000000000 -0400 |
22079 |
++++ linux-2.6.38.4/arch/x86/include/asm/boot.h 2011-04-17 15:57:32.000000000 -0400 |
22080 |
@@ -11,10 +11,15 @@ |
22081 |
#include <asm/pgtable_types.h> |
22082 |
|
22083 |
@@ -7249,9 +7249,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/boot.h linux-2.6.38.3/arch/x86/in |
22084 |
/* Minimum kernel alignment, as a power of two */ |
22085 |
#ifdef CONFIG_X86_64 |
22086 |
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT |
22087 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/cacheflush.h linux-2.6.38.3/arch/x86/include/asm/cacheflush.h |
22088 |
---- linux-2.6.38.3/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32.000000000 -0400 |
22089 |
-+++ linux-2.6.38.3/arch/x86/include/asm/cacheflush.h 2011-04-17 15:57:32.000000000 -0400 |
22090 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/cacheflush.h linux-2.6.38.4/arch/x86/include/asm/cacheflush.h |
22091 |
+--- linux-2.6.38.4/arch/x86/include/asm/cacheflush.h 2011-03-14 21:20:32.000000000 -0400 |
22092 |
++++ linux-2.6.38.4/arch/x86/include/asm/cacheflush.h 2011-04-17 15:57:32.000000000 -0400 |
22093 |
@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem |
22094 |
unsigned long pg_flags = pg->flags & _PGMT_MASK; |
22095 |
|
22096 |
@@ -7261,9 +7261,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/cacheflush.h linux-2.6.38.3/arch/ |
22097 |
else if (pg_flags == _PGMT_WC) |
22098 |
return _PAGE_CACHE_WC; |
22099 |
else if (pg_flags == _PGMT_UC_MINUS) |
22100 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/cache.h linux-2.6.38.3/arch/x86/include/asm/cache.h |
22101 |
---- linux-2.6.38.3/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.000000000 -0400 |
22102 |
-+++ linux-2.6.38.3/arch/x86/include/asm/cache.h 2011-04-17 15:57:32.000000000 -0400 |
22103 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/cache.h linux-2.6.38.4/arch/x86/include/asm/cache.h |
22104 |
+--- linux-2.6.38.4/arch/x86/include/asm/cache.h 2011-03-14 21:20:32.000000000 -0400 |
22105 |
++++ linux-2.6.38.4/arch/x86/include/asm/cache.h 2011-04-17 15:57:32.000000000 -0400 |
22106 |
@@ -8,6 +8,7 @@ |
22107 |
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
22108 |
|
22109 |
@@ -7272,9 +7272,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/cache.h linux-2.6.38.3/arch/x86/i |
22110 |
|
22111 |
#define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT |
22112 |
#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT) |
22113 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/checksum_32.h linux-2.6.38.3/arch/x86/include/asm/checksum_32.h |
22114 |
---- linux-2.6.38.3/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:32.000000000 -0400 |
22115 |
-+++ linux-2.6.38.3/arch/x86/include/asm/checksum_32.h 2011-04-17 15:57:32.000000000 -0400 |
22116 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/checksum_32.h linux-2.6.38.4/arch/x86/include/asm/checksum_32.h |
22117 |
+--- linux-2.6.38.4/arch/x86/include/asm/checksum_32.h 2011-03-14 21:20:32.000000000 -0400 |
22118 |
++++ linux-2.6.38.4/arch/x86/include/asm/checksum_32.h 2011-04-17 15:57:32.000000000 -0400 |
22119 |
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene |
22120 |
int len, __wsum sum, |
22121 |
int *src_err_ptr, int *dst_err_ptr); |
22122 |
@@ -7308,9 +7308,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/checksum_32.h linux-2.6.38.3/arch |
22123 |
len, sum, NULL, err_ptr); |
22124 |
|
22125 |
if (len) |
22126 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/cpufeature.h linux-2.6.38.3/arch/x86/include/asm/cpufeature.h |
22127 |
---- linux-2.6.38.3/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32.000000000 -0400 |
22128 |
-+++ linux-2.6.38.3/arch/x86/include/asm/cpufeature.h 2011-04-17 15:57:32.000000000 -0400 |
22129 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/cpufeature.h linux-2.6.38.4/arch/x86/include/asm/cpufeature.h |
22130 |
+--- linux-2.6.38.4/arch/x86/include/asm/cpufeature.h 2011-03-14 21:20:32.000000000 -0400 |
22131 |
++++ linux-2.6.38.4/arch/x86/include/asm/cpufeature.h 2011-04-17 15:57:32.000000000 -0400 |
22132 |
@@ -349,7 +349,7 @@ static __always_inline __pure bool __sta |
22133 |
".section .discard,\"aw\",@progbits\n" |
22134 |
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ |
22135 |
@@ -7320,9 +7320,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/cpufeature.h linux-2.6.38.3/arch/ |
22136 |
"3: movb $1,%0\n" |
22137 |
"4:\n" |
22138 |
".previous\n" |
22139 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc_defs.h linux-2.6.38.3/arch/x86/include/asm/desc_defs.h |
22140 |
---- linux-2.6.38.3/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.000000000 -0400 |
22141 |
-+++ linux-2.6.38.3/arch/x86/include/asm/desc_defs.h 2011-04-17 15:57:32.000000000 -0400 |
22142 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc_defs.h linux-2.6.38.4/arch/x86/include/asm/desc_defs.h |
22143 |
+--- linux-2.6.38.4/arch/x86/include/asm/desc_defs.h 2011-03-14 21:20:32.000000000 -0400 |
22144 |
++++ linux-2.6.38.4/arch/x86/include/asm/desc_defs.h 2011-04-17 15:57:32.000000000 -0400 |
22145 |
@@ -31,6 +31,12 @@ struct desc_struct { |
22146 |
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; |
22147 |
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; |
22148 |
@@ -7336,9 +7336,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc_defs.h linux-2.6.38.3/arch/x |
22149 |
}; |
22150 |
} __attribute__((packed)); |
22151 |
|
22152 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/include/asm/desc.h |
22153 |
---- linux-2.6.38.3/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.000000000 -0400 |
22154 |
-+++ linux-2.6.38.3/arch/x86/include/asm/desc.h 2011-04-17 15:57:32.000000000 -0400 |
22155 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc.h linux-2.6.38.4/arch/x86/include/asm/desc.h |
22156 |
+--- linux-2.6.38.4/arch/x86/include/asm/desc.h 2011-03-14 21:20:32.000000000 -0400 |
22157 |
++++ linux-2.6.38.4/arch/x86/include/asm/desc.h 2011-04-23 12:47:27.000000000 -0400 |
22158 |
@@ -4,6 +4,7 @@ |
22159 |
#include <asm/desc_defs.h> |
22160 |
#include <asm/ldt.h> |
22161 |
@@ -7393,7 +7393,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22162 |
} |
22163 |
|
22164 |
#endif |
22165 |
-@@ -115,19 +118,24 @@ static inline void paravirt_free_ldt(str |
22166 |
+@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(str |
22167 |
static inline void native_write_idt_entry(gate_desc *idt, int entry, |
22168 |
const gate_desc *gate) |
22169 |
{ |
22170 |
@@ -7411,14 +7411,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22171 |
} |
22172 |
|
22173 |
static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry, |
22174 |
- const void *desc, int type) |
22175 |
- { |
22176 |
- unsigned int size; |
22177 |
-+ |
22178 |
- switch (type) { |
22179 |
- case DESC_TSS: |
22180 |
- size = sizeof(tss_desc); |
22181 |
-@@ -139,7 +147,10 @@ static inline void native_write_gdt_entr |
22182 |
+@@ -139,7 +146,10 @@ static inline void native_write_gdt_entr |
22183 |
size = sizeof(struct desc_struct); |
22184 |
break; |
22185 |
} |
22186 |
@@ -7429,7 +7422,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22187 |
} |
22188 |
|
22189 |
static inline void pack_descriptor(struct desc_struct *desc, unsigned long base, |
22190 |
-@@ -211,7 +222,9 @@ static inline void native_set_ldt(const |
22191 |
+@@ -211,7 +221,9 @@ static inline void native_set_ldt(const |
22192 |
|
22193 |
static inline void native_load_tr_desc(void) |
22194 |
{ |
22195 |
@@ -7439,7 +7432,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22196 |
} |
22197 |
|
22198 |
static inline void native_load_gdt(const struct desc_ptr *dtr) |
22199 |
-@@ -246,8 +259,10 @@ static inline void native_load_tls(struc |
22200 |
+@@ -246,8 +258,10 @@ static inline void native_load_tls(struc |
22201 |
unsigned int i; |
22202 |
struct desc_struct *gdt = get_cpu_gdt_table(cpu); |
22203 |
|
22204 |
@@ -7450,7 +7443,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22205 |
} |
22206 |
|
22207 |
#define _LDT_empty(info) \ |
22208 |
-@@ -309,7 +324,7 @@ static inline void set_desc_limit(struct |
22209 |
+@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct |
22210 |
desc->limit = (limit >> 16) & 0xf; |
22211 |
} |
22212 |
|
22213 |
@@ -7459,7 +7452,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22214 |
unsigned dpl, unsigned ist, unsigned seg) |
22215 |
{ |
22216 |
gate_desc s; |
22217 |
-@@ -327,7 +342,7 @@ static inline void _set_gate(int gate, u |
22218 |
+@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, u |
22219 |
* Pentium F0 0F bugfix can have resulted in the mapped |
22220 |
* IDT being write-protected. |
22221 |
*/ |
22222 |
@@ -7468,7 +7461,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22223 |
{ |
22224 |
BUG_ON((unsigned)n > 0xFF); |
22225 |
_set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); |
22226 |
-@@ -356,19 +371,19 @@ static inline void alloc_intr_gate(unsig |
22227 |
+@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsig |
22228 |
/* |
22229 |
* This routine sets up an interrupt gate at directory privilege level 3. |
22230 |
*/ |
22231 |
@@ -7491,7 +7484,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22232 |
{ |
22233 |
BUG_ON((unsigned)n > 0xFF); |
22234 |
_set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); |
22235 |
-@@ -377,19 +392,31 @@ static inline void set_trap_gate(unsigne |
22236 |
+@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigne |
22237 |
static inline void set_task_gate(unsigned int n, unsigned int gdt_entry) |
22238 |
{ |
22239 |
BUG_ON((unsigned)n > 0xFF); |
22240 |
@@ -7526,9 +7519,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/desc.h linux-2.6.38.3/arch/x86/in |
22241 |
+#endif |
22242 |
+ |
22243 |
#endif /* _ASM_X86_DESC_H */ |
22244 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/device.h linux-2.6.38.3/arch/x86/include/asm/device.h |
22245 |
---- linux-2.6.38.3/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
22246 |
-+++ linux-2.6.38.3/arch/x86/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
22247 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/device.h linux-2.6.38.4/arch/x86/include/asm/device.h |
22248 |
+--- linux-2.6.38.4/arch/x86/include/asm/device.h 2011-03-14 21:20:32.000000000 -0400 |
22249 |
++++ linux-2.6.38.4/arch/x86/include/asm/device.h 2011-04-17 15:57:32.000000000 -0400 |
22250 |
@@ -6,7 +6,7 @@ struct dev_archdata { |
22251 |
void *acpi_handle; |
22252 |
#endif |
22253 |
@@ -7538,9 +7531,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/device.h linux-2.6.38.3/arch/x86/ |
22254 |
#endif |
22255 |
#if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU) |
22256 |
void *iommu; /* hook for IOMMU specific extension */ |
22257 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h |
22258 |
---- linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
22259 |
-+++ linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
22260 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h |
22261 |
+--- linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
22262 |
++++ linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
22263 |
@@ -26,9 +26,9 @@ extern int iommu_merge; |
22264 |
extern struct device x86_dma_fallback_dev; |
22265 |
extern int panic_on_overflow; |
22266 |
@@ -7580,9 +7573,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/dma-mapping.h linux-2.6.38.3/arch |
22267 |
|
22268 |
WARN_ON(irqs_disabled()); /* for portability */ |
22269 |
|
22270 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/e820.h linux-2.6.38.3/arch/x86/include/asm/e820.h |
22271 |
---- linux-2.6.38.3/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.000000000 -0400 |
22272 |
-+++ linux-2.6.38.3/arch/x86/include/asm/e820.h 2011-04-17 15:57:32.000000000 -0400 |
22273 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/e820.h linux-2.6.38.4/arch/x86/include/asm/e820.h |
22274 |
+--- linux-2.6.38.4/arch/x86/include/asm/e820.h 2011-03-14 21:20:32.000000000 -0400 |
22275 |
++++ linux-2.6.38.4/arch/x86/include/asm/e820.h 2011-04-17 15:57:32.000000000 -0400 |
22276 |
@@ -69,7 +69,7 @@ struct e820map { |
22277 |
#define ISA_START_ADDRESS 0xa0000 |
22278 |
#define ISA_END_ADDRESS 0x100000 |
22279 |
@@ -7592,9 +7585,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/e820.h linux-2.6.38.3/arch/x86/in |
22280 |
#define BIOS_END 0x00100000 |
22281 |
|
22282 |
#define BIOS_ROM_BASE 0xffe00000 |
22283 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/elf.h linux-2.6.38.3/arch/x86/include/asm/elf.h |
22284 |
---- linux-2.6.38.3/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
22285 |
-+++ linux-2.6.38.3/arch/x86/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
22286 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/elf.h linux-2.6.38.4/arch/x86/include/asm/elf.h |
22287 |
+--- linux-2.6.38.4/arch/x86/include/asm/elf.h 2011-03-14 21:20:32.000000000 -0400 |
22288 |
++++ linux-2.6.38.4/arch/x86/include/asm/elf.h 2011-04-17 15:57:32.000000000 -0400 |
22289 |
@@ -237,7 +237,25 @@ extern int force_personality32; |
22290 |
the loader. We need to make sure that it is out of the way of the program |
22291 |
that it will "exec", and that there is sufficient room for the brk. */ |
22292 |
@@ -7648,9 +7641,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/elf.h linux-2.6.38.3/arch/x86/inc |
22293 |
-#define arch_randomize_brk arch_randomize_brk |
22294 |
- |
22295 |
#endif /* _ASM_X86_ELF_H */ |
22296 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/futex.h linux-2.6.38.3/arch/x86/include/asm/futex.h |
22297 |
---- linux-2.6.38.3/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.000000000 -0400 |
22298 |
-+++ linux-2.6.38.3/arch/x86/include/asm/futex.h 2011-04-17 15:57:32.000000000 -0400 |
22299 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/futex.h linux-2.6.38.4/arch/x86/include/asm/futex.h |
22300 |
+--- linux-2.6.38.4/arch/x86/include/asm/futex.h 2011-03-14 21:20:32.000000000 -0400 |
22301 |
++++ linux-2.6.38.4/arch/x86/include/asm/futex.h 2011-04-17 15:57:32.000000000 -0400 |
22302 |
@@ -12,16 +12,18 @@ |
22303 |
#include <asm/system.h> |
22304 |
|
22305 |
@@ -7726,9 +7719,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/futex.h linux-2.6.38.3/arch/x86/i |
22306 |
: "i" (-EFAULT), "r" (newval), "0" (oldval) |
22307 |
: "memory" |
22308 |
); |
22309 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/i387.h linux-2.6.38.3/arch/x86/include/asm/i387.h |
22310 |
---- linux-2.6.38.3/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.000000000 -0400 |
22311 |
-+++ linux-2.6.38.3/arch/x86/include/asm/i387.h 2011-04-17 15:57:32.000000000 -0400 |
22312 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/i387.h linux-2.6.38.4/arch/x86/include/asm/i387.h |
22313 |
+--- linux-2.6.38.4/arch/x86/include/asm/i387.h 2011-03-14 21:20:32.000000000 -0400 |
22314 |
++++ linux-2.6.38.4/arch/x86/include/asm/i387.h 2011-04-17 15:57:32.000000000 -0400 |
22315 |
@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc |
22316 |
{ |
22317 |
int err; |
22318 |
@@ -7787,9 +7780,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/i387.h linux-2.6.38.3/arch/x86/in |
22319 |
else |
22320 |
clts(); |
22321 |
} |
22322 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/io.h linux-2.6.38.3/arch/x86/include/asm/io.h |
22323 |
---- linux-2.6.38.3/arch/x86/include/asm/io.h 2011-03-14 21:20:32.000000000 -0400 |
22324 |
-+++ linux-2.6.38.3/arch/x86/include/asm/io.h 2011-04-17 15:57:32.000000000 -0400 |
22325 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/io.h linux-2.6.38.4/arch/x86/include/asm/io.h |
22326 |
+--- linux-2.6.38.4/arch/x86/include/asm/io.h 2011-03-14 21:20:32.000000000 -0400 |
22327 |
++++ linux-2.6.38.4/arch/x86/include/asm/io.h 2011-04-17 15:57:32.000000000 -0400 |
22328 |
@@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void); |
22329 |
|
22330 |
#include <linux/vmalloc.h> |
22331 |
@@ -7808,9 +7801,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/io.h linux-2.6.38.3/arch/x86/incl |
22332 |
/* |
22333 |
* Convert a virtual cached pointer to an uncached pointer |
22334 |
*/ |
22335 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/iommu.h linux-2.6.38.3/arch/x86/include/asm/iommu.h |
22336 |
---- linux-2.6.38.3/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400 |
22337 |
-+++ linux-2.6.38.3/arch/x86/include/asm/iommu.h 2011-04-17 15:57:32.000000000 -0400 |
22338 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/iommu.h linux-2.6.38.4/arch/x86/include/asm/iommu.h |
22339 |
+--- linux-2.6.38.4/arch/x86/include/asm/iommu.h 2011-03-14 21:20:32.000000000 -0400 |
22340 |
++++ linux-2.6.38.4/arch/x86/include/asm/iommu.h 2011-04-17 15:57:32.000000000 -0400 |
22341 |
@@ -1,7 +1,7 @@ |
22342 |
#ifndef _ASM_X86_IOMMU_H |
22343 |
#define _ASM_X86_IOMMU_H |
22344 |
@@ -7820,9 +7813,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/iommu.h linux-2.6.38.3/arch/x86/i |
22345 |
extern int force_iommu, no_iommu; |
22346 |
extern int iommu_detected; |
22347 |
extern int iommu_pass_through; |
22348 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/irqflags.h linux-2.6.38.3/arch/x86/include/asm/irqflags.h |
22349 |
---- linux-2.6.38.3/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.000000000 -0400 |
22350 |
-+++ linux-2.6.38.3/arch/x86/include/asm/irqflags.h 2011-04-17 15:57:32.000000000 -0400 |
22351 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/irqflags.h linux-2.6.38.4/arch/x86/include/asm/irqflags.h |
22352 |
+--- linux-2.6.38.4/arch/x86/include/asm/irqflags.h 2011-03-14 21:20:32.000000000 -0400 |
22353 |
++++ linux-2.6.38.4/arch/x86/include/asm/irqflags.h 2011-04-17 15:57:32.000000000 -0400 |
22354 |
@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i |
22355 |
sti; \ |
22356 |
sysexit |
22357 |
@@ -7835,9 +7828,28 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/irqflags.h linux-2.6.38.3/arch/x8 |
22358 |
#else |
22359 |
#define INTERRUPT_RETURN iret |
22360 |
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit |
22361 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/kvm_host.h linux-2.6.38.3/arch/x86/include/asm/kvm_host.h |
22362 |
---- linux-2.6.38.3/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.000000000 -0400 |
22363 |
-+++ linux-2.6.38.3/arch/x86/include/asm/kvm_host.h 2011-04-17 15:57:32.000000000 -0400 |
22364 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/kprobes.h linux-2.6.38.4/arch/x86/include/asm/kprobes.h |
22365 |
+--- linux-2.6.38.4/arch/x86/include/asm/kprobes.h 2011-03-14 21:20:32.000000000 -0400 |
22366 |
++++ linux-2.6.38.4/arch/x86/include/asm/kprobes.h 2011-04-23 12:47:28.000000000 -0400 |
22367 |
+@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t; |
22368 |
+ #define RELATIVEJUMP_SIZE 5 |
22369 |
+ #define RELATIVECALL_OPCODE 0xe8 |
22370 |
+ #define RELATIVE_ADDR_SIZE 4 |
22371 |
+-#define MAX_STACK_SIZE 64 |
22372 |
+-#define MIN_STACK_SIZE(ADDR) \ |
22373 |
+- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ |
22374 |
+- THREAD_SIZE - (unsigned long)(ADDR))) \ |
22375 |
+- ? (MAX_STACK_SIZE) \ |
22376 |
+- : (((unsigned long)current_thread_info()) + \ |
22377 |
+- THREAD_SIZE - (unsigned long)(ADDR))) |
22378 |
++#define MAX_STACK_SIZE 64UL |
22379 |
++#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR)) |
22380 |
+ |
22381 |
+ #define flush_insn_slot(p) do { } while (0) |
22382 |
+ |
22383 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/kvm_host.h linux-2.6.38.4/arch/x86/include/asm/kvm_host.h |
22384 |
+--- linux-2.6.38.4/arch/x86/include/asm/kvm_host.h 2011-03-14 21:20:32.000000000 -0400 |
22385 |
++++ linux-2.6.38.4/arch/x86/include/asm/kvm_host.h 2011-04-17 15:57:32.000000000 -0400 |
22386 |
@@ -603,7 +603,7 @@ struct kvm_arch_async_pf { |
22387 |
bool direct_map; |
22388 |
}; |
22389 |
@@ -7847,9 +7859,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/kvm_host.h linux-2.6.38.3/arch/x8 |
22390 |
|
22391 |
int kvm_mmu_module_init(void); |
22392 |
void kvm_mmu_module_exit(void); |
22393 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/local.h linux-2.6.38.3/arch/x86/include/asm/local.h |
22394 |
---- linux-2.6.38.3/arch/x86/include/asm/local.h 2011-03-14 21:20:32.000000000 -0400 |
22395 |
-+++ linux-2.6.38.3/arch/x86/include/asm/local.h 2011-04-17 15:57:32.000000000 -0400 |
22396 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/local.h linux-2.6.38.4/arch/x86/include/asm/local.h |
22397 |
+--- linux-2.6.38.4/arch/x86/include/asm/local.h 2011-03-14 21:20:32.000000000 -0400 |
22398 |
++++ linux-2.6.38.4/arch/x86/include/asm/local.h 2011-04-17 15:57:32.000000000 -0400 |
22399 |
@@ -18,26 +18,58 @@ typedef struct { |
22400 |
|
22401 |
static inline void local_inc(local_t *l) |
22402 |
@@ -8002,23 +8014,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/local.h linux-2.6.38.3/arch/x86/i |
22403 |
: "+r" (i), "+m" (l->a.counter) |
22404 |
: : "memory"); |
22405 |
return i + __i; |
22406 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/mc146818rtc.h linux-2.6.38.3/arch/x86/include/asm/mc146818rtc.h |
22407 |
---- linux-2.6.38.3/arch/x86/include/asm/mc146818rtc.h 2011-03-14 21:20:32.000000000 -0400 |
22408 |
-+++ linux-2.6.38.3/arch/x86/include/asm/mc146818rtc.h 2011-04-17 15:57:32.000000000 -0400 |
22409 |
-@@ -81,8 +81,8 @@ static inline unsigned char current_lock |
22410 |
- #else |
22411 |
- #define lock_cmos_prefix(reg) do {} while (0) |
22412 |
- #define lock_cmos_suffix(reg) do {} while (0) |
22413 |
--#define lock_cmos(reg) |
22414 |
--#define unlock_cmos() |
22415 |
-+#define lock_cmos(reg) do {} while (0) |
22416 |
-+#define unlock_cmos() do {} while (0) |
22417 |
- #define do_i_have_lock_cmos() 0 |
22418 |
- #define current_lock_cmos_reg() 0 |
22419 |
- #endif |
22420 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/mce.h linux-2.6.38.3/arch/x86/include/asm/mce.h |
22421 |
---- linux-2.6.38.3/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000000 -0400 |
22422 |
-+++ linux-2.6.38.3/arch/x86/include/asm/mce.h 2011-04-17 15:57:32.000000000 -0400 |
22423 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/mce.h linux-2.6.38.4/arch/x86/include/asm/mce.h |
22424 |
+--- linux-2.6.38.4/arch/x86/include/asm/mce.h 2011-03-14 21:20:32.000000000 -0400 |
22425 |
++++ linux-2.6.38.4/arch/x86/include/asm/mce.h 2011-04-17 15:57:32.000000000 -0400 |
22426 |
@@ -198,7 +198,7 @@ int mce_notify_irq(void); |
22427 |
void mce_notify_process(void); |
22428 |
|
22429 |
@@ -8028,9 +8026,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mce.h linux-2.6.38.3/arch/x86/inc |
22430 |
|
22431 |
/* |
22432 |
* Exception handler |
22433 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/microcode.h linux-2.6.38.3/arch/x86/include/asm/microcode.h |
22434 |
---- linux-2.6.38.3/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.000000000 -0400 |
22435 |
-+++ linux-2.6.38.3/arch/x86/include/asm/microcode.h 2011-04-17 15:57:32.000000000 -0400 |
22436 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/microcode.h linux-2.6.38.4/arch/x86/include/asm/microcode.h |
22437 |
+--- linux-2.6.38.4/arch/x86/include/asm/microcode.h 2011-03-14 21:20:32.000000000 -0400 |
22438 |
++++ linux-2.6.38.4/arch/x86/include/asm/microcode.h 2011-04-17 15:57:32.000000000 -0400 |
22439 |
@@ -12,13 +12,13 @@ struct device; |
22440 |
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; |
22441 |
|
22442 |
@@ -8077,9 +8075,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/microcode.h linux-2.6.38.3/arch/x |
22443 |
{ |
22444 |
return NULL; |
22445 |
} |
22446 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/mman.h linux-2.6.38.3/arch/x86/include/asm/mman.h |
22447 |
---- linux-2.6.38.3/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.000000000 -0400 |
22448 |
-+++ linux-2.6.38.3/arch/x86/include/asm/mman.h 2011-04-17 15:57:32.000000000 -0400 |
22449 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/mman.h linux-2.6.38.4/arch/x86/include/asm/mman.h |
22450 |
+--- linux-2.6.38.4/arch/x86/include/asm/mman.h 2011-03-14 21:20:32.000000000 -0400 |
22451 |
++++ linux-2.6.38.4/arch/x86/include/asm/mman.h 2011-04-17 15:57:32.000000000 -0400 |
22452 |
@@ -5,4 +5,14 @@ |
22453 |
|
22454 |
#include <asm-generic/mman.h> |
22455 |
@@ -8095,9 +8093,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mman.h linux-2.6.38.3/arch/x86/in |
22456 |
+#endif |
22457 |
+ |
22458 |
#endif /* _ASM_X86_MMAN_H */ |
22459 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/mmu_context.h linux-2.6.38.3/arch/x86/include/asm/mmu_context.h |
22460 |
---- linux-2.6.38.3/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:32.000000000 -0400 |
22461 |
-+++ linux-2.6.38.3/arch/x86/include/asm/mmu_context.h 2011-04-17 15:57:32.000000000 -0400 |
22462 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu_context.h linux-2.6.38.4/arch/x86/include/asm/mmu_context.h |
22463 |
+--- linux-2.6.38.4/arch/x86/include/asm/mmu_context.h 2011-03-14 21:20:32.000000000 -0400 |
22464 |
++++ linux-2.6.38.4/arch/x86/include/asm/mmu_context.h 2011-04-17 15:57:32.000000000 -0400 |
22465 |
@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m |
22466 |
|
22467 |
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) |
22468 |
@@ -8221,9 +8219,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mmu_context.h linux-2.6.38.3/arch |
22469 |
} |
22470 |
|
22471 |
#define activate_mm(prev, next) \ |
22472 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/mmu.h linux-2.6.38.3/arch/x86/include/asm/mmu.h |
22473 |
---- linux-2.6.38.3/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000000 -0400 |
22474 |
-+++ linux-2.6.38.3/arch/x86/include/asm/mmu.h 2011-04-17 15:57:32.000000000 -0400 |
22475 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu.h linux-2.6.38.4/arch/x86/include/asm/mmu.h |
22476 |
+--- linux-2.6.38.4/arch/x86/include/asm/mmu.h 2011-03-14 21:20:32.000000000 -0400 |
22477 |
++++ linux-2.6.38.4/arch/x86/include/asm/mmu.h 2011-04-17 15:57:32.000000000 -0400 |
22478 |
@@ -9,10 +9,23 @@ |
22479 |
* we put the segment information here. |
22480 |
*/ |
22481 |
@@ -8250,40 +8248,53 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/mmu.h linux-2.6.38.3/arch/x86/inc |
22482 |
} mm_context_t; |
22483 |
|
22484 |
#ifdef CONFIG_SMP |
22485 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/module.h linux-2.6.38.3/arch/x86/include/asm/module.h |
22486 |
---- linux-2.6.38.3/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000000000 -0400 |
22487 |
-+++ linux-2.6.38.3/arch/x86/include/asm/module.h 2011-04-17 15:57:32.000000000 -0400 |
22488 |
-@@ -59,8 +59,26 @@ |
22489 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/module.h linux-2.6.38.4/arch/x86/include/asm/module.h |
22490 |
+--- linux-2.6.38.4/arch/x86/include/asm/module.h 2011-03-14 21:20:32.000000000 -0400 |
22491 |
++++ linux-2.6.38.4/arch/x86/include/asm/module.h 2011-04-23 12:51:37.000000000 -0400 |
22492 |
+@@ -5,6 +5,7 @@ |
22493 |
+ |
22494 |
+ #ifdef CONFIG_X86_64 |
22495 |
+ /* X86_64 does not define MODULE_PROC_FAMILY */ |
22496 |
++#define MODULE_PROC_FAMILY "" |
22497 |
+ #elif defined CONFIG_M386 |
22498 |
+ #define MODULE_PROC_FAMILY "386 " |
22499 |
+ #elif defined CONFIG_M486 |
22500 |
+@@ -59,8 +60,30 @@ |
22501 |
#error unknown processor family |
22502 |
#endif |
22503 |
|
22504 |
+-#ifdef CONFIG_X86_32 |
22505 |
+-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY |
22506 |
+#ifdef CONFIG_PAX_MEMORY_UDEREF |
22507 |
+#define MODULE_PAX_UDEREF "UDEREF " |
22508 |
+#else |
22509 |
+#define MODULE_PAX_UDEREF "" |
22510 |
+#endif |
22511 |
+ |
22512 |
- #ifdef CONFIG_X86_32 |
22513 |
--# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY |
22514 |
-+# ifdef CONFIG_PAX_KERNEXEC |
22515 |
-+# define MODULE_PAX_KERNEXEC "KERNEXEC " |
22516 |
-+# else |
22517 |
-+# define MODULE_PAX_KERNEXEC "" |
22518 |
-+# endif |
22519 |
-+# ifdef CONFIG_GRKERNSEC |
22520 |
-+# define MODULE_GRSEC "GRSECURITY " |
22521 |
-+# else |
22522 |
-+# define MODULE_GRSEC "" |
22523 |
-+# endif |
22524 |
-+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF |
22525 |
++#ifdef CONFIG_PAX_KERNEXEC |
22526 |
++#define MODULE_PAX_KERNEXEC "KERNEXEC " |
22527 |
+#else |
22528 |
-+# define MODULE_ARCH_VERMAGIC MODULE_PAX_UDEREF |
22529 |
++#define MODULE_PAX_KERNEXEC "" |
22530 |
#endif |
22531 |
|
22532 |
++#ifdef CONFIG_PAX_REFCOUNT |
22533 |
++#define MODULE_PAX_REFCOUNT "REFCOUNT " |
22534 |
++#else |
22535 |
++#define MODULE_PAX_REFCOUNT "" |
22536 |
++#endif |
22537 |
++ |
22538 |
++#ifdef CONFIG_GRKERNSEC |
22539 |
++#define MODULE_GRSEC "GRSECURITY " |
22540 |
++#else |
22541 |
++#define MODULE_GRSEC "" |
22542 |
++#endif |
22543 |
++ |
22544 |
++#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT |
22545 |
++ |
22546 |
#endif /* _ASM_X86_MODULE_H */ |
22547 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/page_64_types.h linux-2.6.38.3/arch/x86/include/asm/page_64_types.h |
22548 |
---- linux-2.6.38.3/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20:32.000000000 -0400 |
22549 |
-+++ linux-2.6.38.3/arch/x86/include/asm/page_64_types.h 2011-04-17 15:57:32.000000000 -0400 |
22550 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/page_64_types.h linux-2.6.38.4/arch/x86/include/asm/page_64_types.h |
22551 |
+--- linux-2.6.38.4/arch/x86/include/asm/page_64_types.h 2011-03-14 21:20:32.000000000 -0400 |
22552 |
++++ linux-2.6.38.4/arch/x86/include/asm/page_64_types.h 2011-04-17 15:57:32.000000000 -0400 |
22553 |
@@ -56,7 +56,7 @@ void copy_page(void *to, void *from); |
22554 |
|
22555 |
/* duplicated to the one in bootmem.h */ |
22556 |
@@ -8293,9 +8304,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/page_64_types.h linux-2.6.38.3/ar |
22557 |
|
22558 |
extern unsigned long __phys_addr(unsigned long); |
22559 |
#define __phys_reloc_hide(x) (x) |
22560 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/paravirt.h linux-2.6.38.3/arch/x86/include/asm/paravirt.h |
22561 |
---- linux-2.6.38.3/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.000000000 -0400 |
22562 |
-+++ linux-2.6.38.3/arch/x86/include/asm/paravirt.h 2011-04-17 15:57:32.000000000 -0400 |
22563 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt.h linux-2.6.38.4/arch/x86/include/asm/paravirt.h |
22564 |
+--- linux-2.6.38.4/arch/x86/include/asm/paravirt.h 2011-03-14 21:20:32.000000000 -0400 |
22565 |
++++ linux-2.6.38.4/arch/x86/include/asm/paravirt.h 2011-04-17 15:57:32.000000000 -0400 |
22566 |
@@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned |
22567 |
pv_mmu_ops.set_fixmap(idx, phys, flags); |
22568 |
} |
22569 |
@@ -8349,9 +8360,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/paravirt.h linux-2.6.38.3/arch/x8 |
22570 |
#endif /* CONFIG_X86_32 */ |
22571 |
|
22572 |
#endif /* __ASSEMBLY__ */ |
22573 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h |
22574 |
---- linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:20:32.000000000 -0400 |
22575 |
-+++ linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:57:32.000000000 -0400 |
22576 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h |
22577 |
+--- linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h 2011-03-14 21:20:32.000000000 -0400 |
22578 |
++++ linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h 2011-04-17 15:57:32.000000000 -0400 |
22579 |
@@ -317,6 +317,12 @@ struct pv_mmu_ops { |
22580 |
an mfn. We can tell which is which from the index. */ |
22581 |
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, |
22582 |
@@ -8365,9 +8376,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/paravirt_types.h linux-2.6.38.3/a |
22583 |
}; |
22584 |
|
22585 |
struct arch_spinlock; |
22586 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pci_x86.h linux-2.6.38.3/arch/x86/include/asm/pci_x86.h |
22587 |
---- linux-2.6.38.3/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.000000000 -0400 |
22588 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pci_x86.h 2011-04-17 15:57:32.000000000 -0400 |
22589 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pci_x86.h linux-2.6.38.4/arch/x86/include/asm/pci_x86.h |
22590 |
+--- linux-2.6.38.4/arch/x86/include/asm/pci_x86.h 2011-03-14 21:20:32.000000000 -0400 |
22591 |
++++ linux-2.6.38.4/arch/x86/include/asm/pci_x86.h 2011-04-17 15:57:32.000000000 -0400 |
22592 |
@@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct |
22593 |
extern void (*pcibios_disable_irq)(struct pci_dev *dev); |
22594 |
|
22595 |
@@ -8390,9 +8401,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pci_x86.h linux-2.6.38.3/arch/x86 |
22596 |
extern bool port_cf9_safe; |
22597 |
|
22598 |
/* arch_initcall level */ |
22599 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgalloc.h linux-2.6.38.3/arch/x86/include/asm/pgalloc.h |
22600 |
---- linux-2.6.38.3/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.000000000 -0400 |
22601 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgalloc.h 2011-04-17 15:57:32.000000000 -0400 |
22602 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgalloc.h linux-2.6.38.4/arch/x86/include/asm/pgalloc.h |
22603 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgalloc.h 2011-03-14 21:20:32.000000000 -0400 |
22604 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgalloc.h 2011-04-17 15:57:32.000000000 -0400 |
22605 |
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s |
22606 |
pmd_t *pmd, pte_t *pte) |
22607 |
{ |
22608 |
@@ -8407,9 +8418,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgalloc.h linux-2.6.38.3/arch/x86 |
22609 |
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); |
22610 |
} |
22611 |
|
22612 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h |
22613 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:20:32.000000000 -0400 |
22614 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:57:32.000000000 -0400 |
22615 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h |
22616 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h 2011-03-14 21:20:32.000000000 -0400 |
22617 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:57:32.000000000 -0400 |
22618 |
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t |
22619 |
|
22620 |
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
22621 |
@@ -8420,9 +8431,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.3/a |
22622 |
} |
22623 |
|
22624 |
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) |
22625 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h |
22626 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400 |
22627 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:57:32.000000000 -0400 |
22628 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h |
22629 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h 2011-03-14 21:20:32.000000000 -0400 |
22630 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:57:32.000000000 -0400 |
22631 |
@@ -25,9 +25,6 @@ |
22632 |
struct mm_struct; |
22633 |
struct vm_area_struct; |
22634 |
@@ -8466,9 +8477,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_32.h linux-2.6.38.3/arch/ |
22635 |
/* |
22636 |
* kern_addr_valid() is (1) for FLATMEM and (0) for |
22637 |
* SPARSEMEM and DISCONTIGMEM |
22638 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h |
22639 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21:20:32.000000000 -0400 |
22640 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15:57:32.000000000 -0400 |
22641 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h |
22642 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h 2011-03-14 21:20:32.000000000 -0400 |
22643 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15:57:32.000000000 -0400 |
22644 |
@@ -8,7 +8,7 @@ |
22645 |
*/ |
22646 |
#ifdef CONFIG_X86_PAE |
22647 |
@@ -8498,9 +8509,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.3 |
22648 |
#define MODULES_VADDR VMALLOC_START |
22649 |
#define MODULES_END VMALLOC_END |
22650 |
#define MODULES_LEN (MODULES_VADDR - MODULES_END) |
22651 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h |
22652 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h 2011-04-18 17:27:13.000000000 -0400 |
22653 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:57:32.000000000 -0400 |
22654 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h |
22655 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h 2011-04-18 17:27:13.000000000 -0400 |
22656 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:57:32.000000000 -0400 |
22657 |
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic |
22658 |
|
22659 |
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) |
22660 |
@@ -8518,9 +8529,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.3/a |
22661 |
} |
22662 |
|
22663 |
/* |
22664 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h |
22665 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32.000000000 -0400 |
22666 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:57:32.000000000 -0400 |
22667 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h |
22668 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h 2011-03-14 21:20:32.000000000 -0400 |
22669 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h 2011-04-17 15:57:32.000000000 -0400 |
22670 |
@@ -16,10 +16,13 @@ |
22671 |
|
22672 |
extern pud_t level3_kernel_pgt[512]; |
22673 |
@@ -8557,9 +8568,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_64.h linux-2.6.38.3/arch/ |
22674 |
} |
22675 |
|
22676 |
static inline void native_pgd_clear(pgd_t *pgd) |
22677 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h |
22678 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21:20:32.000000000 -0400 |
22679 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15:57:32.000000000 -0400 |
22680 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h |
22681 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h 2011-03-14 21:20:32.000000000 -0400 |
22682 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15:57:32.000000000 -0400 |
22683 |
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; |
22684 |
#define MODULES_VADDR _AC(0xffffffffa0000000, UL) |
22685 |
#define MODULES_END _AC(0xffffffffff000000, UL) |
22686 |
@@ -8571,9 +8582,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.3 |
22687 |
+#define ktva_ktla(addr) (addr) |
22688 |
|
22689 |
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */ |
22690 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable.h linux-2.6.38.3/arch/x86/include/asm/pgtable.h |
22691 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
22692 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
22693 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable.h linux-2.6.38.4/arch/x86/include/asm/pgtable.h |
22694 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
22695 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
22696 |
@@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm |
22697 |
|
22698 |
#define arch_end_context_switch(prev) do {} while(0) |
22699 |
@@ -8743,9 +8754,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable.h linux-2.6.38.3/arch/x86 |
22700 |
|
22701 |
#include <asm-generic/pgtable.h> |
22702 |
#endif /* __ASSEMBLY__ */ |
22703 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h |
22704 |
---- linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20:32.000000000 -0400 |
22705 |
-+++ linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:57:32.000000000 -0400 |
22706 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h |
22707 |
+--- linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h 2011-03-14 21:20:32.000000000 -0400 |
22708 |
++++ linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:57:32.000000000 -0400 |
22709 |
@@ -16,13 +16,12 @@ |
22710 |
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ |
22711 |
#define _PAGE_BIT_PAT 7 /* on 4KB pages */ |
22712 |
@@ -8859,9 +8870,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/pgtable_types.h linux-2.6.38.3/ar |
22713 |
|
22714 |
#define pgprot_writecombine pgprot_writecombine |
22715 |
extern pgprot_t pgprot_writecombine(pgprot_t prot); |
22716 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/processor.h linux-2.6.38.3/arch/x86/include/asm/processor.h |
22717 |
---- linux-2.6.38.3/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.000000000 -0400 |
22718 |
-+++ linux-2.6.38.3/arch/x86/include/asm/processor.h 2011-04-17 15:57:32.000000000 -0400 |
22719 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4/arch/x86/include/asm/processor.h |
22720 |
+--- linux-2.6.38.4/arch/x86/include/asm/processor.h 2011-03-14 21:20:32.000000000 -0400 |
22721 |
++++ linux-2.6.38.4/arch/x86/include/asm/processor.h 2011-04-23 12:47:27.000000000 -0400 |
22722 |
@@ -270,7 +270,7 @@ struct tss_struct { |
22723 |
|
22724 |
} ____cacheline_aligned; |
22725 |
@@ -8906,7 +8917,7 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/processor.h linux-2.6.38.3/arch/x |
22726 |
- unsigned long *__ptr = (unsigned long *)(info); \ |
22727 |
- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \ |
22728 |
-}) |
22729 |
-+#define KSTK_TOP(info) ((info)->task.thread.sp0) |
22730 |
++#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0) |
22731 |
|
22732 |
/* |
22733 |
* The below -8 is to reserve 8 bytes on top of the ring0 stack. |
22734 |
@@ -8946,9 +8957,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/processor.h linux-2.6.38.3/arch/x |
22735 |
#define KSTK_EIP(task) (task_pt_regs(task)->ip) |
22736 |
|
22737 |
/* Get/set a process' ability to use the timestamp counter instruction */ |
22738 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/ptrace.h linux-2.6.38.3/arch/x86/include/asm/ptrace.h |
22739 |
---- linux-2.6.38.3/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000000000 -0400 |
22740 |
-+++ linux-2.6.38.3/arch/x86/include/asm/ptrace.h 2011-04-17 15:57:32.000000000 -0400 |
22741 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/ptrace.h linux-2.6.38.4/arch/x86/include/asm/ptrace.h |
22742 |
+--- linux-2.6.38.4/arch/x86/include/asm/ptrace.h 2011-03-14 21:20:32.000000000 -0400 |
22743 |
++++ linux-2.6.38.4/arch/x86/include/asm/ptrace.h 2011-04-17 15:57:32.000000000 -0400 |
22744 |
@@ -152,28 +152,29 @@ static inline unsigned long regs_return_ |
22745 |
} |
22746 |
|
22747 |
@@ -8985,9 +8996,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/ptrace.h linux-2.6.38.3/arch/x86/ |
22748 |
#endif |
22749 |
} |
22750 |
|
22751 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/reboot.h linux-2.6.38.3/arch/x86/include/asm/reboot.h |
22752 |
---- linux-2.6.38.3/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000000000 -0400 |
22753 |
-+++ linux-2.6.38.3/arch/x86/include/asm/reboot.h 2011-04-17 15:57:32.000000000 -0400 |
22754 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/reboot.h linux-2.6.38.4/arch/x86/include/asm/reboot.h |
22755 |
+--- linux-2.6.38.4/arch/x86/include/asm/reboot.h 2011-03-14 21:20:32.000000000 -0400 |
22756 |
++++ linux-2.6.38.4/arch/x86/include/asm/reboot.h 2011-04-17 15:57:32.000000000 -0400 |
22757 |
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; |
22758 |
|
22759 |
void native_machine_crash_shutdown(struct pt_regs *regs); |
22760 |
@@ -8997,9 +9008,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/reboot.h linux-2.6.38.3/arch/x86/ |
22761 |
|
22762 |
typedef void (*nmi_shootdown_cb)(int, struct die_args*); |
22763 |
void nmi_shootdown_cpus(nmi_shootdown_cb callback); |
22764 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/rwsem.h linux-2.6.38.3/arch/x86/include/asm/rwsem.h |
22765 |
---- linux-2.6.38.3/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.000000000 -0400 |
22766 |
-+++ linux-2.6.38.3/arch/x86/include/asm/rwsem.h 2011-04-17 15:57:32.000000000 -0400 |
22767 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/rwsem.h linux-2.6.38.4/arch/x86/include/asm/rwsem.h |
22768 |
+--- linux-2.6.38.4/arch/x86/include/asm/rwsem.h 2011-03-14 21:20:32.000000000 -0400 |
22769 |
++++ linux-2.6.38.4/arch/x86/include/asm/rwsem.h 2011-04-17 15:57:32.000000000 -0400 |
22770 |
@@ -118,6 +118,14 @@ static inline void __down_read(struct rw |
22771 |
{ |
22772 |
asm volatile("# beginning down_read\n\t" |
22773 |
@@ -9124,9 +9135,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/rwsem.h linux-2.6.38.3/arch/x86/i |
22774 |
: "+r" (tmp), "+m" (sem->count) |
22775 |
: : "memory"); |
22776 |
|
22777 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/segment.h linux-2.6.38.3/arch/x86/include/asm/segment.h |
22778 |
---- linux-2.6.38.3/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.000000000 -0400 |
22779 |
-+++ linux-2.6.38.3/arch/x86/include/asm/segment.h 2011-04-17 15:57:32.000000000 -0400 |
22780 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/segment.h linux-2.6.38.4/arch/x86/include/asm/segment.h |
22781 |
+--- linux-2.6.38.4/arch/x86/include/asm/segment.h 2011-03-14 21:20:32.000000000 -0400 |
22782 |
++++ linux-2.6.38.4/arch/x86/include/asm/segment.h 2011-04-17 15:57:32.000000000 -0400 |
22783 |
@@ -62,8 +62,8 @@ |
22784 |
* 26 - ESPFIX small SS |
22785 |
* 27 - per-cpu [ offset to per-cpu data area ] |
22786 |
@@ -9186,9 +9197,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/segment.h linux-2.6.38.3/arch/x86 |
22787 |
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8) |
22788 |
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3) |
22789 |
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3) |
22790 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/smp.h linux-2.6.38.3/arch/x86/include/asm/smp.h |
22791 |
---- linux-2.6.38.3/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000000 -0400 |
22792 |
-+++ linux-2.6.38.3/arch/x86/include/asm/smp.h 2011-04-17 15:57:32.000000000 -0400 |
22793 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/smp.h linux-2.6.38.4/arch/x86/include/asm/smp.h |
22794 |
+--- linux-2.6.38.4/arch/x86/include/asm/smp.h 2011-03-14 21:20:32.000000000 -0400 |
22795 |
++++ linux-2.6.38.4/arch/x86/include/asm/smp.h 2011-04-17 15:57:32.000000000 -0400 |
22796 |
@@ -24,7 +24,7 @@ extern unsigned int num_processors; |
22797 |
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); |
22798 |
DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); |
22799 |
@@ -9215,9 +9226,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/smp.h linux-2.6.38.3/arch/x86/inc |
22800 |
#define safe_smp_processor_id() smp_processor_id() |
22801 |
|
22802 |
#endif |
22803 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/spinlock.h linux-2.6.38.3/arch/x86/include/asm/spinlock.h |
22804 |
---- linux-2.6.38.3/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400 |
22805 |
-+++ linux-2.6.38.3/arch/x86/include/asm/spinlock.h 2011-04-17 15:57:32.000000000 -0400 |
22806 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/spinlock.h linux-2.6.38.4/arch/x86/include/asm/spinlock.h |
22807 |
+--- linux-2.6.38.4/arch/x86/include/asm/spinlock.h 2011-03-14 21:20:32.000000000 -0400 |
22808 |
++++ linux-2.6.38.4/arch/x86/include/asm/spinlock.h 2011-04-17 15:57:32.000000000 -0400 |
22809 |
@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar |
22810 |
static inline void arch_read_lock(arch_rwlock_t *rw) |
22811 |
{ |
22812 |
@@ -9280,9 +9291,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/spinlock.h linux-2.6.38.3/arch/x8 |
22813 |
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); |
22814 |
} |
22815 |
|
22816 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/stackprotector.h linux-2.6.38.3/arch/x86/include/asm/stackprotector.h |
22817 |
---- linux-2.6.38.3/arch/x86/include/asm/stackprotector.h 2011-03-14 21:20:32.000000000 -0400 |
22818 |
-+++ linux-2.6.38.3/arch/x86/include/asm/stackprotector.h 2011-04-17 15:57:32.000000000 -0400 |
22819 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/stackprotector.h linux-2.6.38.4/arch/x86/include/asm/stackprotector.h |
22820 |
+--- linux-2.6.38.4/arch/x86/include/asm/stackprotector.h 2011-03-14 21:20:32.000000000 -0400 |
22821 |
++++ linux-2.6.38.4/arch/x86/include/asm/stackprotector.h 2011-04-17 15:57:32.000000000 -0400 |
22822 |
@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se |
22823 |
|
22824 |
static inline void load_stack_canary_segment(void) |
22825 |
@@ -9292,9 +9303,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/stackprotector.h linux-2.6.38.3/a |
22826 |
asm volatile ("mov %0, %%gs" : : "r" (0)); |
22827 |
#endif |
22828 |
} |
22829 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/stacktrace.h linux-2.6.38.3/arch/x86/include/asm/stacktrace.h |
22830 |
---- linux-2.6.38.3/arch/x86/include/asm/stacktrace.h 2011-03-14 21:20:32.000000000 -0400 |
22831 |
-+++ linux-2.6.38.3/arch/x86/include/asm/stacktrace.h 2011-04-17 15:57:32.000000000 -0400 |
22832 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/stacktrace.h linux-2.6.38.4/arch/x86/include/asm/stacktrace.h |
22833 |
+--- linux-2.6.38.4/arch/x86/include/asm/stacktrace.h 2011-03-14 21:20:32.000000000 -0400 |
22834 |
++++ linux-2.6.38.4/arch/x86/include/asm/stacktrace.h 2011-04-17 15:57:32.000000000 -0400 |
22835 |
@@ -11,28 +11,20 @@ |
22836 |
|
22837 |
extern int kstack_depth_to_print; |
22838 |
@@ -9345,9 +9356,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/stacktrace.h linux-2.6.38.3/arch/ |
22839 |
}; |
22840 |
|
22841 |
void dump_trace(struct task_struct *tsk, struct pt_regs *regs, |
22842 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/system.h linux-2.6.38.3/arch/x86/include/asm/system.h |
22843 |
---- linux-2.6.38.3/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
22844 |
-+++ linux-2.6.38.3/arch/x86/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
22845 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/system.h linux-2.6.38.4/arch/x86/include/asm/system.h |
22846 |
+--- linux-2.6.38.4/arch/x86/include/asm/system.h 2011-03-14 21:20:32.000000000 -0400 |
22847 |
++++ linux-2.6.38.4/arch/x86/include/asm/system.h 2011-04-17 15:57:32.000000000 -0400 |
22848 |
@@ -131,7 +131,7 @@ do { \ |
22849 |
"call __switch_to\n\t" \ |
22850 |
"movq "__percpu_arg([current_task])",%%rsi\n\t" \ |
22851 |
@@ -9384,9 +9395,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/system.h linux-2.6.38.3/arch/x86/ |
22852 |
extern void free_init_pages(char *what, unsigned long begin, unsigned long end); |
22853 |
|
22854 |
void default_idle(void); |
22855 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/thread_info.h linux-2.6.38.3/arch/x86/include/asm/thread_info.h |
22856 |
---- linux-2.6.38.3/arch/x86/include/asm/thread_info.h 2011-03-14 21:20:32.000000000 -0400 |
22857 |
-+++ linux-2.6.38.3/arch/x86/include/asm/thread_info.h 2011-04-17 15:57:32.000000000 -0400 |
22858 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/thread_info.h linux-2.6.38.4/arch/x86/include/asm/thread_info.h |
22859 |
+--- linux-2.6.38.4/arch/x86/include/asm/thread_info.h 2011-03-14 21:20:32.000000000 -0400 |
22860 |
++++ linux-2.6.38.4/arch/x86/include/asm/thread_info.h 2011-04-17 15:57:32.000000000 -0400 |
22861 |
@@ -10,6 +10,7 @@ |
22862 |
#include <linux/compiler.h> |
22863 |
#include <asm/page.h> |
22864 |
@@ -9531,9 +9542,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/thread_info.h linux-2.6.38.3/arch |
22865 |
+ |
22866 |
#endif |
22867 |
#endif /* _ASM_X86_THREAD_INFO_H */ |
22868 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h |
22869 |
---- linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400 |
22870 |
-+++ linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:57:32.000000000 -0400 |
22871 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h |
22872 |
+--- linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h 2011-03-14 21:20:32.000000000 -0400 |
22873 |
++++ linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h 2011-04-17 15:57:32.000000000 -0400 |
22874 |
@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u |
22875 |
static __always_inline unsigned long __must_check |
22876 |
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) |
22877 |
@@ -9690,9 +9701,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess_32.h linux-2.6.38.3/arch/ |
22878 |
return n; |
22879 |
} |
22880 |
|
22881 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h |
22882 |
---- linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400 |
22883 |
-+++ linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:57:32.000000000 -0400 |
22884 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h |
22885 |
+--- linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h 2011-03-14 21:20:32.000000000 -0400 |
22886 |
++++ linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h 2011-04-17 15:57:32.000000000 -0400 |
22887 |
@@ -11,6 +11,9 @@ |
22888 |
#include <asm/alternative.h> |
22889 |
#include <asm/cpufeature.h> |
22890 |
@@ -10065,9 +10076,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess_64.h linux-2.6.38.3/arch/ |
22891 |
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); |
22892 |
|
22893 |
#endif /* _ASM_X86_UACCESS_64_H */ |
22894 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess.h linux-2.6.38.3/arch/x86/include/asm/uaccess.h |
22895 |
---- linux-2.6.38.3/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
22896 |
-+++ linux-2.6.38.3/arch/x86/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
22897 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess.h linux-2.6.38.4/arch/x86/include/asm/uaccess.h |
22898 |
+--- linux-2.6.38.4/arch/x86/include/asm/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
22899 |
++++ linux-2.6.38.4/arch/x86/include/asm/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
22900 |
@@ -8,12 +8,15 @@ |
22901 |
#include <linux/thread_info.h> |
22902 |
#include <linux/prefetch.h> |
22903 |
@@ -10286,9 +10297,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/uaccess.h linux-2.6.38.3/arch/x86 |
22904 |
#ifdef CONFIG_X86_32 |
22905 |
# include "uaccess_32.h" |
22906 |
#else |
22907 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/vgtod.h linux-2.6.38.3/arch/x86/include/asm/vgtod.h |
22908 |
---- linux-2.6.38.3/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.000000000 -0400 |
22909 |
-+++ linux-2.6.38.3/arch/x86/include/asm/vgtod.h 2011-04-17 15:57:32.000000000 -0400 |
22910 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/vgtod.h linux-2.6.38.4/arch/x86/include/asm/vgtod.h |
22911 |
+--- linux-2.6.38.4/arch/x86/include/asm/vgtod.h 2011-03-14 21:20:32.000000000 -0400 |
22912 |
++++ linux-2.6.38.4/arch/x86/include/asm/vgtod.h 2011-04-17 15:57:32.000000000 -0400 |
22913 |
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { |
22914 |
int sysctl_enabled; |
22915 |
struct timezone sys_tz; |
22916 |
@@ -10297,9 +10308,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/vgtod.h linux-2.6.38.3/arch/x86/i |
22917 |
cycle_t (*vread)(void); |
22918 |
cycle_t cycle_last; |
22919 |
cycle_t mask; |
22920 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/vsyscall.h linux-2.6.38.3/arch/x86/include/asm/vsyscall.h |
22921 |
---- linux-2.6.38.3/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.000000000 -0400 |
22922 |
-+++ linux-2.6.38.3/arch/x86/include/asm/vsyscall.h 2011-04-17 15:57:32.000000000 -0400 |
22923 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/vsyscall.h linux-2.6.38.4/arch/x86/include/asm/vsyscall.h |
22924 |
+--- linux-2.6.38.4/arch/x86/include/asm/vsyscall.h 2011-03-14 21:20:32.000000000 -0400 |
22925 |
++++ linux-2.6.38.4/arch/x86/include/asm/vsyscall.h 2011-04-17 15:57:32.000000000 -0400 |
22926 |
@@ -15,9 +15,10 @@ enum vsyscall_num { |
22927 |
|
22928 |
#ifdef __KERNEL__ |
22929 |
@@ -10330,9 +10341,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/vsyscall.h linux-2.6.38.3/arch/x8 |
22930 |
#endif /* __KERNEL__ */ |
22931 |
|
22932 |
#endif /* _ASM_X86_VSYSCALL_H */ |
22933 |
-diff -urNp linux-2.6.38.3/arch/x86/include/asm/xsave.h linux-2.6.38.3/arch/x86/include/asm/xsave.h |
22934 |
---- linux-2.6.38.3/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.000000000 -0400 |
22935 |
-+++ linux-2.6.38.3/arch/x86/include/asm/xsave.h 2011-04-17 15:57:32.000000000 -0400 |
22936 |
+diff -urNp linux-2.6.38.4/arch/x86/include/asm/xsave.h linux-2.6.38.4/arch/x86/include/asm/xsave.h |
22937 |
+--- linux-2.6.38.4/arch/x86/include/asm/xsave.h 2011-03-14 21:20:32.000000000 -0400 |
22938 |
++++ linux-2.6.38.4/arch/x86/include/asm/xsave.h 2011-04-17 15:57:32.000000000 -0400 |
22939 |
@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav |
22940 |
{ |
22941 |
int err; |
22942 |
@@ -10357,9 +10368,9 @@ diff -urNp linux-2.6.38.3/arch/x86/include/asm/xsave.h linux-2.6.38.3/arch/x86/i |
22943 |
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" |
22944 |
"2:\n" |
22945 |
".section .fixup,\"ax\"\n" |
22946 |
-diff -urNp linux-2.6.38.3/arch/x86/Kconfig linux-2.6.38.3/arch/x86/Kconfig |
22947 |
---- linux-2.6.38.3/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
22948 |
-+++ linux-2.6.38.3/arch/x86/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
22949 |
+diff -urNp linux-2.6.38.4/arch/x86/Kconfig linux-2.6.38.4/arch/x86/Kconfig |
22950 |
+--- linux-2.6.38.4/arch/x86/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
22951 |
++++ linux-2.6.38.4/arch/x86/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
22952 |
@@ -223,7 +223,7 @@ config X86_TRAMPOLINE |
22953 |
|
22954 |
config X86_32_LAZY_GS |
22955 |
@@ -10441,9 +10452,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Kconfig linux-2.6.38.3/arch/x86/Kconfig |
22956 |
---help--- |
22957 |
Map the 32-bit VDSO to the predictable old-style address too. |
22958 |
|
22959 |
-diff -urNp linux-2.6.38.3/arch/x86/Kconfig.cpu linux-2.6.38.3/arch/x86/Kconfig.cpu |
22960 |
---- linux-2.6.38.3/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0400 |
22961 |
-+++ linux-2.6.38.3/arch/x86/Kconfig.cpu 2011-04-17 15:57:32.000000000 -0400 |
22962 |
+diff -urNp linux-2.6.38.4/arch/x86/Kconfig.cpu linux-2.6.38.4/arch/x86/Kconfig.cpu |
22963 |
+--- linux-2.6.38.4/arch/x86/Kconfig.cpu 2011-03-14 21:20:32.000000000 -0400 |
22964 |
++++ linux-2.6.38.4/arch/x86/Kconfig.cpu 2011-04-17 15:57:32.000000000 -0400 |
22965 |
@@ -339,7 +339,7 @@ config X86_PPRO_FENCE |
22966 |
|
22967 |
config X86_F00F_BUG |
22968 |
@@ -10471,9 +10482,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Kconfig.cpu linux-2.6.38.3/arch/x86/Kconfig.c |
22969 |
|
22970 |
config X86_MINIMUM_CPU_FAMILY |
22971 |
int |
22972 |
-diff -urNp linux-2.6.38.3/arch/x86/Kconfig.debug linux-2.6.38.3/arch/x86/Kconfig.debug |
22973 |
---- linux-2.6.38.3/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400 |
22974 |
-+++ linux-2.6.38.3/arch/x86/Kconfig.debug 2011-04-17 15:57:32.000000000 -0400 |
22975 |
+diff -urNp linux-2.6.38.4/arch/x86/Kconfig.debug linux-2.6.38.4/arch/x86/Kconfig.debug |
22976 |
+--- linux-2.6.38.4/arch/x86/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400 |
22977 |
++++ linux-2.6.38.4/arch/x86/Kconfig.debug 2011-04-17 15:57:32.000000000 -0400 |
22978 |
@@ -101,7 +101,7 @@ config X86_PTDUMP |
22979 |
config DEBUG_RODATA |
22980 |
bool "Write protect kernel read-only data structures" |
22981 |
@@ -10492,21 +10503,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Kconfig.debug linux-2.6.38.3/arch/x86/Kconfig |
22982 |
---help--- |
22983 |
This option helps catch unintended modifications to loadable |
22984 |
kernel module's text and read-only data. It also prevents execution |
22985 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/boot.c linux-2.6.38.3/arch/x86/kernel/acpi/boot.c |
22986 |
---- linux-2.6.38.3/arch/x86/kernel/acpi/boot.c 2011-03-14 21:20:32.000000000 -0400 |
22987 |
-+++ linux-2.6.38.3/arch/x86/kernel/acpi/boot.c 2011-04-17 15:57:32.000000000 -0400 |
22988 |
-@@ -1472,7 +1472,7 @@ static struct dmi_system_id __initdata a |
22989 |
- DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), |
22990 |
- }, |
22991 |
- }, |
22992 |
-- {} |
22993 |
-+ { NULL, NULL, {{0, {0}}}, NULL} |
22994 |
- }; |
22995 |
- |
22996 |
- /* |
22997 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c |
22998 |
---- linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.000000000 -0400 |
22999 |
-+++ linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:57:32.000000000 -0400 |
23000 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c |
23001 |
+--- linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c 2011-03-14 21:20:32.000000000 -0400 |
23002 |
++++ linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c 2011-04-17 15:57:32.000000000 -0400 |
23003 |
@@ -18,7 +18,7 @@ |
23004 |
#include "realmode/wakeup.h" |
23005 |
#include "sleep.h" |
23006 |
@@ -10529,9 +10528,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/sleep.c linux-2.6.38.3/arch/x86/k |
23007 |
initial_gs = per_cpu_offset(smp_processor_id()); |
23008 |
#endif |
23009 |
initial_code = (unsigned long)wakeup_long64; |
23010 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S |
23011 |
---- linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.000000000 -0400 |
23012 |
-+++ linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:57:32.000000000 -0400 |
23013 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S |
23014 |
+--- linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S 2011-03-14 21:20:32.000000000 -0400 |
23015 |
++++ linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:57:32.000000000 -0400 |
23016 |
@@ -30,13 +30,11 @@ wakeup_pmode_return: |
23017 |
# and restore the stack ... but you need gdt for this to work |
23018 |
movl saved_context_esp, %esp |
23019 |
@@ -10548,9 +10547,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.3/arch/x |
23020 |
|
23021 |
bogus_magic: |
23022 |
jmp bogus_magic |
23023 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/alternative.c linux-2.6.38.3/arch/x86/kernel/alternative.c |
23024 |
---- linux-2.6.38.3/arch/x86/kernel/alternative.c 2011-04-18 17:27:13.000000000 -0400 |
23025 |
-+++ linux-2.6.38.3/arch/x86/kernel/alternative.c 2011-04-17 15:57:32.000000000 -0400 |
23026 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/alternative.c linux-2.6.38.4/arch/x86/kernel/alternative.c |
23027 |
+--- linux-2.6.38.4/arch/x86/kernel/alternative.c 2011-04-18 17:27:13.000000000 -0400 |
23028 |
++++ linux-2.6.38.4/arch/x86/kernel/alternative.c 2011-04-17 15:57:32.000000000 -0400 |
23029 |
@@ -248,7 +248,7 @@ static void alternatives_smp_lock(const |
23030 |
if (!*poff || ptr < text || ptr >= text_end) |
23031 |
continue; |
23032 |
@@ -10664,9 +10663,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/alternative.c linux-2.6.38.3/arch/x86/ |
23033 |
#endif |
23034 |
|
23035 |
void __init arch_init_ideal_nop5(void) |
23036 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/amd_iommu.c linux-2.6.38.3/arch/x86/kernel/amd_iommu.c |
23037 |
---- linux-2.6.38.3/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
23038 |
-+++ linux-2.6.38.3/arch/x86/kernel/amd_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
23039 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/amd_iommu.c linux-2.6.38.4/arch/x86/kernel/amd_iommu.c |
23040 |
+--- linux-2.6.38.4/arch/x86/kernel/amd_iommu.c 2011-03-14 21:20:32.000000000 -0400 |
23041 |
++++ linux-2.6.38.4/arch/x86/kernel/amd_iommu.c 2011-04-17 15:57:32.000000000 -0400 |
23042 |
@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains( |
23043 |
} |
23044 |
} |
23045 |
@@ -10676,9 +10675,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/amd_iommu.c linux-2.6.38.3/arch/x86/ke |
23046 |
.alloc_coherent = alloc_coherent, |
23047 |
.free_coherent = free_coherent, |
23048 |
.map_page = map_page, |
23049 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c |
23050 |
---- linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.000000000 -0400 |
23051 |
-+++ linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:57:32.000000000 -0400 |
23052 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c |
23053 |
+--- linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c 2011-03-14 21:20:32.000000000 -0400 |
23054 |
++++ linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c 2011-04-17 15:57:32.000000000 -0400 |
23055 |
@@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapi |
23056 |
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, |
23057 |
GFP_KERNEL); |
23058 |
@@ -10715,9 +10714,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/apic/io_apic.c linux-2.6.38.3/arch/x86 |
23059 |
{ |
23060 |
raw_spin_unlock(&vector_lock); |
23061 |
} |
23062 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/apm_32.c linux-2.6.38.3/arch/x86/kernel/apm_32.c |
23063 |
---- linux-2.6.38.3/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.000000000 -0400 |
23064 |
-+++ linux-2.6.38.3/arch/x86/kernel/apm_32.c 2011-04-17 15:57:32.000000000 -0400 |
23065 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/apm_32.c linux-2.6.38.4/arch/x86/kernel/apm_32.c |
23066 |
+--- linux-2.6.38.4/arch/x86/kernel/apm_32.c 2011-03-14 21:20:32.000000000 -0400 |
23067 |
++++ linux-2.6.38.4/arch/x86/kernel/apm_32.c 2011-04-23 12:47:27.000000000 -0400 |
23068 |
@@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex); |
23069 |
* This is for buggy BIOS's that refer to (real mode) segment 0x40 |
23070 |
* even though they are called in protected mode. |
23071 |
@@ -10782,28 +10781,7 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/apm_32.c linux-2.6.38.3/arch/x86/kerne |
23072 |
0xb8, 0x00, 0x10, /* movw $0x1000,ax */ |
23073 |
0x8e, 0xd0, /* movw ax,ss */ |
23074 |
0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ |
23075 |
-@@ -1932,7 +1946,10 @@ static const struct file_operations apm_ |
23076 |
- static struct miscdevice apm_device = { |
23077 |
- APM_MINOR_DEV, |
23078 |
- "apm_bios", |
23079 |
-- &apm_bios_fops |
23080 |
-+ &apm_bios_fops, |
23081 |
-+ {NULL, NULL}, |
23082 |
-+ NULL, |
23083 |
-+ NULL |
23084 |
- }; |
23085 |
- |
23086 |
- |
23087 |
-@@ -2253,7 +2270,7 @@ static struct dmi_system_id __initdata a |
23088 |
- { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, |
23089 |
- }, |
23090 |
- |
23091 |
-- { } |
23092 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} |
23093 |
- }; |
23094 |
- |
23095 |
- /* |
23096 |
-@@ -2356,12 +2373,15 @@ static int __init apm_init(void) |
23097 |
+@@ -2356,12 +2370,15 @@ static int __init apm_init(void) |
23098 |
* code to that CPU. |
23099 |
*/ |
23100 |
gdt = get_cpu_gdt_table(0); |
23101 |
@@ -10819,9 +10797,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/apm_32.c linux-2.6.38.3/arch/x86/kerne |
23102 |
|
23103 |
proc_create("apm", 0, NULL, &apm_file_ops); |
23104 |
|
23105 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c |
23106 |
---- linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.000000000 -0400 |
23107 |
-+++ linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:57:32.000000000 -0400 |
23108 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c |
23109 |
+--- linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c 2011-03-14 21:20:32.000000000 -0400 |
23110 |
++++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c 2011-04-17 15:57:32.000000000 -0400 |
23111 |
@@ -51,7 +51,6 @@ void foo(void) |
23112 |
OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); |
23113 |
BLANK(); |
23114 |
@@ -10842,9 +10820,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.3/arch/x |
23115 |
#endif |
23116 |
|
23117 |
#ifdef CONFIG_XEN |
23118 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c |
23119 |
---- linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.000000000 -0400 |
23120 |
-+++ linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:57:32.000000000 -0400 |
23121 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c |
23122 |
+--- linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c 2011-03-14 21:20:32.000000000 -0400 |
23123 |
++++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c 2011-04-17 15:57:32.000000000 -0400 |
23124 |
@@ -63,6 +63,18 @@ int main(void) |
23125 |
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); |
23126 |
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); |
23127 |
@@ -10872,10 +10850,10 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.3/arch/x |
23128 |
DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); |
23129 |
BLANK(); |
23130 |
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); |
23131 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/amd.c linux-2.6.38.3/arch/x86/kernel/cpu/amd.c |
23132 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/amd.c 2011-03-14 21:20:32.000000000 -0400 |
23133 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/amd.c 2011-04-17 15:57:32.000000000 -0400 |
23134 |
-@@ -601,7 +601,7 @@ static unsigned int __cpuinit amd_size_c |
23135 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/amd.c linux-2.6.38.4/arch/x86/kernel/cpu/amd.c |
23136 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/amd.c 2011-04-22 19:20:59.000000000 -0400 |
23137 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/amd.c 2011-04-22 19:21:10.000000000 -0400 |
23138 |
+@@ -624,7 +624,7 @@ static unsigned int __cpuinit amd_size_c |
23139 |
unsigned int size) |
23140 |
{ |
23141 |
/* AMD errata T13 (order #21922) */ |
23142 |
@@ -10884,9 +10862,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/amd.c linux-2.6.38.3/arch/x86/kern |
23143 |
/* Duron Rev A0 */ |
23144 |
if (c->x86_model == 3 && c->x86_mask == 0) |
23145 |
size = 64; |
23146 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/common.c linux-2.6.38.3/arch/x86/kernel/cpu/common.c |
23147 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.000000000 -0400 |
23148 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/common.c 2011-04-17 15:57:32.000000000 -0400 |
23149 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/common.c linux-2.6.38.4/arch/x86/kernel/cpu/common.c |
23150 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/common.c 2011-03-14 21:20:32.000000000 -0400 |
23151 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/common.c 2011-04-17 15:57:32.000000000 -0400 |
23152 |
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon |
23153 |
|
23154 |
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; |
23155 |
@@ -11031,33 +11009,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/common.c linux-2.6.38.3/arch/x86/k |
23156 |
struct thread_struct *thread = &curr->thread; |
23157 |
|
23158 |
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { |
23159 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c |
23160 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-03-14 21:20:32.000000000 -0400 |
23161 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2011-04-17 15:57:32.000000000 -0400 |
23162 |
-@@ -481,7 +481,7 @@ static const struct dmi_system_id sw_any |
23163 |
- DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), |
23164 |
- }, |
23165 |
- }, |
23166 |
-- { } |
23167 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
23168 |
- }; |
23169 |
- |
23170 |
- static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) |
23171 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c |
23172 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-03-14 21:20:32.000000000 -0400 |
23173 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2011-04-17 15:57:32.000000000 -0400 |
23174 |
-@@ -226,7 +226,7 @@ static struct cpu_model models[] = |
23175 |
- { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, |
23176 |
- { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, |
23177 |
- |
23178 |
-- { NULL, } |
23179 |
-+ { NULL, NULL, 0, NULL} |
23180 |
- }; |
23181 |
- #undef _BANIAS |
23182 |
- #undef BANIAS |
23183 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/intel.c linux-2.6.38.3/arch/x86/kernel/cpu/intel.c |
23184 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.000000000 -0400 |
23185 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/intel.c 2011-04-17 15:57:32.000000000 -0400 |
23186 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/intel.c linux-2.6.38.4/arch/x86/kernel/cpu/intel.c |
23187 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/intel.c 2011-03-14 21:20:32.000000000 -0400 |
23188 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/intel.c 2011-04-17 15:57:32.000000000 -0400 |
23189 |
@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug |
23190 |
* Update the IDT descriptor and reload the IDT so that |
23191 |
* it uses the read-only mapped virtual address. |
23192 |
@@ -11067,9 +11021,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/intel.c linux-2.6.38.3/arch/x86/ke |
23193 |
load_idt(&idt_descr); |
23194 |
} |
23195 |
#endif |
23196 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/Makefile linux-2.6.38.3/arch/x86/kernel/cpu/Makefile |
23197 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.000000000 -0400 |
23198 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/Makefile 2011-04-17 15:57:32.000000000 -0400 |
23199 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/Makefile linux-2.6.38.4/arch/x86/kernel/cpu/Makefile |
23200 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/Makefile 2011-03-14 21:20:32.000000000 -0400 |
23201 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/Makefile 2011-04-17 15:57:32.000000000 -0400 |
23202 |
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg |
23203 |
CFLAGS_REMOVE_perf_event.o = -pg |
23204 |
endif |
23205 |
@@ -11081,9 +11035,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/Makefile linux-2.6.38.3/arch/x86/k |
23206 |
obj-y := intel_cacheinfo.o scattered.o topology.o |
23207 |
obj-y += proc.o capflags.o powerflags.o common.o |
23208 |
obj-y += vmware.o hypervisor.o sched.o mshyperv.o |
23209 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c |
23210 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.000000000 -0400 |
23211 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-17 15:57:32.000000000 -0400 |
23212 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c |
23213 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-14 21:20:32.000000000 -0400 |
23214 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-04-23 12:47:27.000000000 -0400 |
23215 |
@@ -45,6 +45,7 @@ |
23216 |
#include <asm/ipi.h> |
23217 |
#include <asm/mce.h> |
23218 |
@@ -11146,29 +11100,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.3/arch/x |
23219 |
.open = mce_open, |
23220 |
.release = mce_release, |
23221 |
.read = mce_read, |
23222 |
-@@ -1673,6 +1673,7 @@ static struct miscdevice mce_log_device |
23223 |
- MISC_MCELOG_MINOR, |
23224 |
- "mcelog", |
23225 |
- &mce_chrdev_ops, |
23226 |
-+ {NULL, NULL}, NULL, NULL |
23227 |
- }; |
23228 |
- |
23229 |
- /* |
23230 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/generic.c |
23231 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-14 21:20:32.000000000 -0400 |
23232 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-17 15:57:32.000000000 -0400 |
23233 |
-@@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra |
23234 |
- { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ |
23235 |
- { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ |
23236 |
- { MSR_MTRRfix4K_C0000, 8 }, /* eight 4k MTRRs */ |
23237 |
-- {} |
23238 |
-+ { 0, 0 } |
23239 |
- }; |
23240 |
- |
23241 |
- static unsigned long smp_changes_mask; |
23242 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c |
23243 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c 2011-04-18 17:27:18.000000000 -0400 |
23244 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 16:53:16.000000000 -0400 |
23245 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c |
23246 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c 2011-04-18 17:27:18.000000000 -0400 |
23247 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 16:53:16.000000000 -0400 |
23248 |
@@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex); |
23249 |
u64 size_or_mask, size_and_mask; |
23250 |
static bool mtrr_aps_delayed_init; |
23251 |
@@ -11178,9 +11112,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.3/arch/x8 |
23252 |
|
23253 |
const struct mtrr_ops *mtrr_if; |
23254 |
|
23255 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h |
23256 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.000000000 -0400 |
23257 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:57:32.000000000 -0400 |
23258 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h |
23259 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-14 21:20:32.000000000 -0400 |
23260 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:57:32.000000000 -0400 |
23261 |
@@ -12,19 +12,19 @@ |
23262 |
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; |
23263 |
|
23264 |
@@ -11209,9 +11143,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.3/arch/x8 |
23265 |
}; |
23266 |
|
23267 |
extern int generic_get_free_region(unsigned long base, unsigned long size, |
23268 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c |
23269 |
---- linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.000000000 -0400 |
23270 |
-+++ linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:57:32.000000000 -0400 |
23271 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c |
23272 |
+--- linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c 2011-03-14 21:20:32.000000000 -0400 |
23273 |
++++ linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c 2011-04-17 15:57:32.000000000 -0400 |
23274 |
@@ -1781,7 +1781,7 @@ perf_callchain_user(struct perf_callchai |
23275 |
break; |
23276 |
|
23277 |
@@ -11221,9 +11155,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.3/arch/x |
23278 |
} |
23279 |
} |
23280 |
|
23281 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/crash.c linux-2.6.38.3/arch/x86/kernel/crash.c |
23282 |
---- linux-2.6.38.3/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000 -0400 |
23283 |
-+++ linux-2.6.38.3/arch/x86/kernel/crash.c 2011-04-17 15:57:32.000000000 -0400 |
23284 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/crash.c linux-2.6.38.4/arch/x86/kernel/crash.c |
23285 |
+--- linux-2.6.38.4/arch/x86/kernel/crash.c 2011-03-14 21:20:32.000000000 -0400 |
23286 |
++++ linux-2.6.38.4/arch/x86/kernel/crash.c 2011-04-17 15:57:32.000000000 -0400 |
23287 |
@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, |
23288 |
regs = args->regs; |
23289 |
|
23290 |
@@ -11233,9 +11167,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/crash.c linux-2.6.38.3/arch/x86/kernel |
23291 |
crash_fixup_ss_esp(&fixed_regs, regs); |
23292 |
regs = &fixed_regs; |
23293 |
} |
23294 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/doublefault_32.c linux-2.6.38.3/arch/x86/kernel/doublefault_32.c |
23295 |
---- linux-2.6.38.3/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.000000000 -0400 |
23296 |
-+++ linux-2.6.38.3/arch/x86/kernel/doublefault_32.c 2011-04-17 15:57:32.000000000 -0400 |
23297 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/doublefault_32.c linux-2.6.38.4/arch/x86/kernel/doublefault_32.c |
23298 |
+--- linux-2.6.38.4/arch/x86/kernel/doublefault_32.c 2011-03-14 21:20:32.000000000 -0400 |
23299 |
++++ linux-2.6.38.4/arch/x86/kernel/doublefault_32.c 2011-04-17 15:57:32.000000000 -0400 |
23300 |
@@ -11,7 +11,7 @@ |
23301 |
|
23302 |
#define DOUBLEFAULT_STACKSIZE (1024) |
23303 |
@@ -11267,9 +11201,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/doublefault_32.c linux-2.6.38.3/arch/x |
23304 |
.fs = __KERNEL_PERCPU, |
23305 |
|
23306 |
.__cr3 = __pa_nodebug(swapper_pg_dir), |
23307 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c |
23308 |
---- linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.000000000 -0400 |
23309 |
-+++ linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:57:32.000000000 -0400 |
23310 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c |
23311 |
+--- linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c 2011-03-14 21:20:32.000000000 -0400 |
23312 |
++++ linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:57:32.000000000 -0400 |
23313 |
@@ -37,15 +37,12 @@ void dump_trace(struct task_struct *task |
23314 |
|
23315 |
bp = stack_frame(task, regs); |
23316 |
@@ -11333,9 +11267,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack_32.c linux-2.6.38.3/arch/x86 |
23317 |
if (ip < PAGE_OFFSET) |
23318 |
return 0; |
23319 |
if (probe_kernel_address((unsigned short *)ip, ud2)) |
23320 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c |
23321 |
---- linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c 2011-03-14 21:20:32.000000000 -0400 |
23322 |
-+++ linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:57:32.000000000 -0400 |
23323 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c |
23324 |
+--- linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c 2011-03-14 21:20:32.000000000 -0400 |
23325 |
++++ linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:57:32.000000000 -0400 |
23326 |
@@ -147,10 +147,10 @@ void dump_trace(struct task_struct *task |
23327 |
unsigned long *irq_stack_end = |
23328 |
(unsigned long *)per_cpu(irq_stack_ptr, cpu); |
23329 |
@@ -11388,9 +11322,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack_64.c linux-2.6.38.3/arch/x86 |
23330 |
put_cpu(); |
23331 |
} |
23332 |
EXPORT_SYMBOL(dump_trace); |
23333 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack.c linux-2.6.38.3/arch/x86/kernel/dumpstack.c |
23334 |
---- linux-2.6.38.3/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.000000000 -0400 |
23335 |
-+++ linux-2.6.38.3/arch/x86/kernel/dumpstack.c 2011-04-17 15:57:32.000000000 -0400 |
23336 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack.c linux-2.6.38.4/arch/x86/kernel/dumpstack.c |
23337 |
+--- linux-2.6.38.4/arch/x86/kernel/dumpstack.c 2011-03-14 21:20:32.000000000 -0400 |
23338 |
++++ linux-2.6.38.4/arch/x86/kernel/dumpstack.c 2011-04-17 15:57:32.000000000 -0400 |
23339 |
@@ -2,6 +2,9 @@ |
23340 |
* Copyright (C) 1991, 1992 Linus Torvalds |
23341 |
* Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs |
23342 |
@@ -11543,9 +11477,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/dumpstack.c linux-2.6.38.3/arch/x86/ke |
23343 |
report_bug(regs->ip, regs); |
23344 |
|
23345 |
if (__die(str, regs, err)) |
23346 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_32.S linux-2.6.38.3/arch/x86/kernel/entry_32.S |
23347 |
---- linux-2.6.38.3/arch/x86/kernel/entry_32.S 2011-04-18 17:27:16.000000000 -0400 |
23348 |
-+++ linux-2.6.38.3/arch/x86/kernel/entry_32.S 2011-04-19 17:17:51.000000000 -0400 |
23349 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/kernel/entry_32.S |
23350 |
+--- linux-2.6.38.4/arch/x86/kernel/entry_32.S 2011-04-18 17:27:16.000000000 -0400 |
23351 |
++++ linux-2.6.38.4/arch/x86/kernel/entry_32.S 2011-04-19 17:17:51.000000000 -0400 |
23352 |
@@ -183,13 +183,81 @@ |
23353 |
/*CFI_REL_OFFSET gs, PT_GS*/ |
23354 |
.endm |
23355 |
@@ -11923,9 +11857,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_32.S linux-2.6.38.3/arch/x86/ker |
23356 |
RESTORE_REGS |
23357 |
lss 12+4(%esp), %esp # back to espfix stack |
23358 |
CFI_ADJUST_CFA_OFFSET -24 |
23359 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_64.S linux-2.6.38.3/arch/x86/kernel/entry_64.S |
23360 |
---- linux-2.6.38.3/arch/x86/kernel/entry_64.S 2011-04-18 17:27:13.000000000 -0400 |
23361 |
-+++ linux-2.6.38.3/arch/x86/kernel/entry_64.S 2011-04-17 15:57:32.000000000 -0400 |
23362 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/kernel/entry_64.S |
23363 |
+--- linux-2.6.38.4/arch/x86/kernel/entry_64.S 2011-04-18 17:27:13.000000000 -0400 |
23364 |
++++ linux-2.6.38.4/arch/x86/kernel/entry_64.S 2011-04-17 15:57:32.000000000 -0400 |
23365 |
@@ -53,6 +53,7 @@ |
23366 |
#include <asm/paravirt.h> |
23367 |
#include <asm/ftrace.h> |
23368 |
@@ -12425,9 +12359,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/entry_64.S linux-2.6.38.3/arch/x86/ker |
23369 |
RESTORE_ALL 8 |
23370 |
jmp irq_return |
23371 |
nmi_userspace: |
23372 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/ftrace.c linux-2.6.38.3/arch/x86/kernel/ftrace.c |
23373 |
---- linux-2.6.38.3/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.000000000 -0400 |
23374 |
-+++ linux-2.6.38.3/arch/x86/kernel/ftrace.c 2011-04-17 15:57:32.000000000 -0400 |
23375 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/ftrace.c linux-2.6.38.4/arch/x86/kernel/ftrace.c |
23376 |
+--- linux-2.6.38.4/arch/x86/kernel/ftrace.c 2011-03-14 21:20:32.000000000 -0400 |
23377 |
++++ linux-2.6.38.4/arch/x86/kernel/ftrace.c 2011-04-17 15:57:32.000000000 -0400 |
23378 |
@@ -177,7 +177,9 @@ void ftrace_nmi_enter(void) |
23379 |
|
23380 |
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { |
23381 |
@@ -12465,9 +12399,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ftrace.c linux-2.6.38.3/arch/x86/kerne |
23382 |
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) |
23383 |
return -EFAULT; |
23384 |
|
23385 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/head32.c linux-2.6.38.3/arch/x86/kernel/head32.c |
23386 |
---- linux-2.6.38.3/arch/x86/kernel/head32.c 2011-03-14 21:20:32.000000000 -0400 |
23387 |
-+++ linux-2.6.38.3/arch/x86/kernel/head32.c 2011-04-17 15:57:32.000000000 -0400 |
23388 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/head32.c linux-2.6.38.4/arch/x86/kernel/head32.c |
23389 |
+--- linux-2.6.38.4/arch/x86/kernel/head32.c 2011-03-14 21:20:32.000000000 -0400 |
23390 |
++++ linux-2.6.38.4/arch/x86/kernel/head32.c 2011-04-17 15:57:32.000000000 -0400 |
23391 |
@@ -19,6 +19,7 @@ |
23392 |
#include <asm/io_apic.h> |
23393 |
#include <asm/bios_ebda.h> |
23394 |
@@ -12485,9 +12419,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/head32.c linux-2.6.38.3/arch/x86/kerne |
23395 |
|
23396 |
#ifdef CONFIG_BLK_DEV_INITRD |
23397 |
/* Reserve INITRD */ |
23398 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/head_32.S linux-2.6.38.3/arch/x86/kernel/head_32.S |
23399 |
---- linux-2.6.38.3/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.000000000 -0400 |
23400 |
-+++ linux-2.6.38.3/arch/x86/kernel/head_32.S 2011-04-17 16:02:16.000000000 -0400 |
23401 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/head_32.S linux-2.6.38.4/arch/x86/kernel/head_32.S |
23402 |
+--- linux-2.6.38.4/arch/x86/kernel/head_32.S 2011-03-14 21:20:32.000000000 -0400 |
23403 |
++++ linux-2.6.38.4/arch/x86/kernel/head_32.S 2011-04-17 16:02:16.000000000 -0400 |
23404 |
@@ -25,6 +25,12 @@ |
23405 |
/* Physical address */ |
23406 |
#define pa(X) ((X) - __PAGE_OFFSET) |
23407 |
@@ -12922,9 +12856,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/head_32.S linux-2.6.38.3/arch/x86/kern |
23408 |
+ /* Be sure this is zeroed to avoid false validations in Xen */ |
23409 |
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 |
23410 |
+ .endr |
23411 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/head_64.S linux-2.6.38.3/arch/x86/kernel/head_64.S |
23412 |
---- linux-2.6.38.3/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.000000000 -0400 |
23413 |
-+++ linux-2.6.38.3/arch/x86/kernel/head_64.S 2011-04-17 15:57:32.000000000 -0400 |
23414 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/head_64.S linux-2.6.38.4/arch/x86/kernel/head_64.S |
23415 |
+--- linux-2.6.38.4/arch/x86/kernel/head_64.S 2011-03-14 21:20:32.000000000 -0400 |
23416 |
++++ linux-2.6.38.4/arch/x86/kernel/head_64.S 2011-04-17 15:57:32.000000000 -0400 |
23417 |
@@ -19,6 +19,7 @@ |
23418 |
#include <asm/cache.h> |
23419 |
#include <asm/processor-flags.h> |
23420 |
@@ -13194,9 +13128,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/head_64.S linux-2.6.38.3/arch/x86/kern |
23421 |
|
23422 |
__PAGE_ALIGNED_BSS |
23423 |
.align PAGE_SIZE |
23424 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c |
23425 |
---- linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.000000000 -0400 |
23426 |
-+++ linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:57:32.000000000 -0400 |
23427 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c |
23428 |
+--- linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c 2011-03-14 21:20:32.000000000 -0400 |
23429 |
++++ linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:57:32.000000000 -0400 |
23430 |
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); |
23431 |
EXPORT_SYMBOL(cmpxchg8b_emu); |
23432 |
#endif |
23433 |
@@ -13218,9 +13152,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.3/arch/x8 |
23434 |
+#ifdef CONFIG_PAX_KERNEXEC |
23435 |
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); |
23436 |
+#endif |
23437 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/init_task.c linux-2.6.38.3/arch/x86/kernel/init_task.c |
23438 |
---- linux-2.6.38.3/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.000000000 -0400 |
23439 |
-+++ linux-2.6.38.3/arch/x86/kernel/init_task.c 2011-04-17 15:57:32.000000000 -0400 |
23440 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/init_task.c linux-2.6.38.4/arch/x86/kernel/init_task.c |
23441 |
+--- linux-2.6.38.4/arch/x86/kernel/init_task.c 2011-03-14 21:20:32.000000000 -0400 |
23442 |
++++ linux-2.6.38.4/arch/x86/kernel/init_task.c 2011-04-17 15:57:32.000000000 -0400 |
23443 |
@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan |
23444 |
* way process stacks are handled. This is done by having a special |
23445 |
* "init_task" linker map entry.. |
23446 |
@@ -13239,9 +13173,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/init_task.c linux-2.6.38.3/arch/x86/ke |
23447 |
- |
23448 |
+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; |
23449 |
+EXPORT_SYMBOL(init_tss); |
23450 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/ioport.c linux-2.6.38.3/arch/x86/kernel/ioport.c |
23451 |
---- linux-2.6.38.3/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400 |
23452 |
-+++ linux-2.6.38.3/arch/x86/kernel/ioport.c 2011-04-17 15:57:32.000000000 -0400 |
23453 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/ioport.c linux-2.6.38.4/arch/x86/kernel/ioport.c |
23454 |
+--- linux-2.6.38.4/arch/x86/kernel/ioport.c 2011-03-14 21:20:32.000000000 -0400 |
23455 |
++++ linux-2.6.38.4/arch/x86/kernel/ioport.c 2011-04-17 15:57:32.000000000 -0400 |
23456 |
@@ -6,6 +6,7 @@ |
23457 |
#include <linux/sched.h> |
23458 |
#include <linux/kernel.h> |
23459 |
@@ -13285,9 +13219,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ioport.c linux-2.6.38.3/arch/x86/kerne |
23460 |
if (!capable(CAP_SYS_RAWIO)) |
23461 |
return -EPERM; |
23462 |
} |
23463 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/irq_32.c linux-2.6.38.3/arch/x86/kernel/irq_32.c |
23464 |
---- linux-2.6.38.3/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.000000000 -0400 |
23465 |
-+++ linux-2.6.38.3/arch/x86/kernel/irq_32.c 2011-04-17 15:57:32.000000000 -0400 |
23466 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/irq_32.c linux-2.6.38.4/arch/x86/kernel/irq_32.c |
23467 |
+--- linux-2.6.38.4/arch/x86/kernel/irq_32.c 2011-03-14 21:20:32.000000000 -0400 |
23468 |
++++ linux-2.6.38.4/arch/x86/kernel/irq_32.c 2011-04-17 15:57:32.000000000 -0400 |
23469 |
@@ -36,7 +36,7 @@ static int check_stack_overflow(void) |
23470 |
__asm__ __volatile__("andl %%esp,%0" : |
23471 |
"=r" (sp) : "0" (THREAD_SIZE - 1)); |
23472 |
@@ -13429,9 +13363,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/irq_32.c linux-2.6.38.3/arch/x86/kerne |
23473 |
/* |
23474 |
* Shouldnt happen, we returned above if in_interrupt(): |
23475 |
*/ |
23476 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/kgdb.c linux-2.6.38.3/arch/x86/kernel/kgdb.c |
23477 |
---- linux-2.6.38.3/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
23478 |
-+++ linux-2.6.38.3/arch/x86/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
23479 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/kgdb.c linux-2.6.38.4/arch/x86/kernel/kgdb.c |
23480 |
+--- linux-2.6.38.4/arch/x86/kernel/kgdb.c 2011-03-14 21:20:32.000000000 -0400 |
23481 |
++++ linux-2.6.38.4/arch/x86/kernel/kgdb.c 2011-04-17 15:57:32.000000000 -0400 |
23482 |
@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, |
23483 |
switch (regno) { |
23484 |
#ifdef CONFIG_X86_32 |
23485 |
@@ -13455,9 +13389,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/kgdb.c linux-2.6.38.3/arch/x86/kernel/ |
23486 |
/* Breakpoint instruction: */ |
23487 |
.gdb_bpt_instr = { 0xcc }, |
23488 |
.flags = KGDB_HW_BREAKPOINT, |
23489 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/kprobes.c linux-2.6.38.3/arch/x86/kernel/kprobes.c |
23490 |
---- linux-2.6.38.3/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 |
23491 |
-+++ linux-2.6.38.3/arch/x86/kernel/kprobes.c 2011-04-17 15:57:32.000000000 -0400 |
23492 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/kprobes.c linux-2.6.38.4/arch/x86/kernel/kprobes.c |
23493 |
+--- linux-2.6.38.4/arch/x86/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 |
23494 |
++++ linux-2.6.38.4/arch/x86/kernel/kprobes.c 2011-04-17 15:57:32.000000000 -0400 |
23495 |
@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat |
23496 |
} __attribute__((packed)) *insn; |
23497 |
|
23498 |
@@ -13591,9 +13525,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/kprobes.c linux-2.6.38.3/arch/x86/kern |
23499 |
RELATIVE_ADDR_SIZE); |
23500 |
|
23501 |
insn_buf[0] = RELATIVEJUMP_OPCODE; |
23502 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/ldt.c linux-2.6.38.3/arch/x86/kernel/ldt.c |
23503 |
---- linux-2.6.38.3/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -0400 |
23504 |
-+++ linux-2.6.38.3/arch/x86/kernel/ldt.c 2011-04-17 15:57:32.000000000 -0400 |
23505 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/ldt.c linux-2.6.38.4/arch/x86/kernel/ldt.c |
23506 |
+--- linux-2.6.38.4/arch/x86/kernel/ldt.c 2011-03-14 21:20:32.000000000 -0400 |
23507 |
++++ linux-2.6.38.4/arch/x86/kernel/ldt.c 2011-04-17 15:57:32.000000000 -0400 |
23508 |
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i |
23509 |
if (reload) { |
23510 |
#ifdef CONFIG_SMP |
23511 |
@@ -13658,9 +13592,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ldt.c linux-2.6.38.3/arch/x86/kernel/l |
23512 |
fill_ldt(&ldt, &ldt_info); |
23513 |
if (oldmode) |
23514 |
ldt.avl = 0; |
23515 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c |
23516 |
---- linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:32.000000000 -0400 |
23517 |
-+++ linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:57:32.000000000 -0400 |
23518 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c |
23519 |
+--- linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c 2011-03-14 21:20:32.000000000 -0400 |
23520 |
++++ linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:57:32.000000000 -0400 |
23521 |
@@ -27,7 +27,7 @@ |
23522 |
#include <asm/cacheflush.h> |
23523 |
#include <asm/debugreg.h> |
23524 |
@@ -13688,9 +13622,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.3/arch |
23525 |
|
23526 |
relocate_kernel_ptr = control_page; |
23527 |
page_list[PA_CONTROL_PAGE] = __pa(control_page); |
23528 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_amd.c linux-2.6.38.3/arch/x86/kernel/microcode_amd.c |
23529 |
---- linux-2.6.38.3/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.000000000 -0400 |
23530 |
-+++ linux-2.6.38.3/arch/x86/kernel/microcode_amd.c 2011-04-17 15:57:32.000000000 -0400 |
23531 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_amd.c linux-2.6.38.4/arch/x86/kernel/microcode_amd.c |
23532 |
+--- linux-2.6.38.4/arch/x86/kernel/microcode_amd.c 2011-03-14 21:20:32.000000000 -0400 |
23533 |
++++ linux-2.6.38.4/arch/x86/kernel/microcode_amd.c 2011-04-17 15:57:32.000000000 -0400 |
23534 |
@@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int c |
23535 |
uci->mc = NULL; |
23536 |
} |
23537 |
@@ -13709,9 +13643,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_amd.c linux-2.6.38.3/arch/x8 |
23538 |
{ |
23539 |
return µcode_amd_ops; |
23540 |
} |
23541 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_core.c linux-2.6.38.3/arch/x86/kernel/microcode_core.c |
23542 |
---- linux-2.6.38.3/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.000000000 -0400 |
23543 |
-+++ linux-2.6.38.3/arch/x86/kernel/microcode_core.c 2011-04-17 15:57:32.000000000 -0400 |
23544 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_core.c linux-2.6.38.4/arch/x86/kernel/microcode_core.c |
23545 |
+--- linux-2.6.38.4/arch/x86/kernel/microcode_core.c 2011-03-14 21:20:32.000000000 -0400 |
23546 |
++++ linux-2.6.38.4/arch/x86/kernel/microcode_core.c 2011-04-17 15:57:32.000000000 -0400 |
23547 |
@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL"); |
23548 |
|
23549 |
#define MICROCODE_VERSION "2.00" |
23550 |
@@ -13721,9 +13655,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_core.c linux-2.6.38.3/arch/x |
23551 |
|
23552 |
/* |
23553 |
* Synchronization. |
23554 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_intel.c linux-2.6.38.3/arch/x86/kernel/microcode_intel.c |
23555 |
---- linux-2.6.38.3/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32.000000000 -0400 |
23556 |
-+++ linux-2.6.38.3/arch/x86/kernel/microcode_intel.c 2011-04-17 15:57:32.000000000 -0400 |
23557 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_intel.c linux-2.6.38.4/arch/x86/kernel/microcode_intel.c |
23558 |
+--- linux-2.6.38.4/arch/x86/kernel/microcode_intel.c 2011-03-14 21:20:32.000000000 -0400 |
23559 |
++++ linux-2.6.38.4/arch/x86/kernel/microcode_intel.c 2011-04-17 15:57:32.000000000 -0400 |
23560 |
@@ -440,13 +440,13 @@ static enum ucode_state request_microcod |
23561 |
|
23562 |
static int get_ucode_user(void *to, const void *from, size_t n) |
23563 |
@@ -13758,9 +13692,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/microcode_intel.c linux-2.6.38.3/arch/ |
23564 |
{ |
23565 |
return µcode_intel_ops; |
23566 |
} |
23567 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/module.c linux-2.6.38.3/arch/x86/kernel/module.c |
23568 |
---- linux-2.6.38.3/arch/x86/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
23569 |
-+++ linux-2.6.38.3/arch/x86/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
23570 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/module.c linux-2.6.38.4/arch/x86/kernel/module.c |
23571 |
+--- linux-2.6.38.4/arch/x86/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
23572 |
++++ linux-2.6.38.4/arch/x86/kernel/module.c 2011-04-17 15:57:32.000000000 -0400 |
23573 |
@@ -35,21 +35,66 @@ |
23574 |
#define DEBUGP(fmt...) |
23575 |
#endif |
23576 |
@@ -13899,9 +13833,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/module.c linux-2.6.38.3/arch/x86/kerne |
23577 |
#if 0 |
23578 |
if ((s64)val != *(s32 *)loc) |
23579 |
goto overflow; |
23580 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/paravirt.c linux-2.6.38.3/arch/x86/kernel/paravirt.c |
23581 |
---- linux-2.6.38.3/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000000 -0400 |
23582 |
-+++ linux-2.6.38.3/arch/x86/kernel/paravirt.c 2011-04-17 15:57:32.000000000 -0400 |
23583 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt.c linux-2.6.38.4/arch/x86/kernel/paravirt.c |
23584 |
+--- linux-2.6.38.4/arch/x86/kernel/paravirt.c 2011-03-14 21:20:32.000000000 -0400 |
23585 |
++++ linux-2.6.38.4/arch/x86/kernel/paravirt.c 2011-04-17 15:57:32.000000000 -0400 |
23586 |
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu |
23587 |
* corresponding structure. */ |
23588 |
static void *get_call_destination(u8 type) |
23589 |
@@ -14005,9 +13939,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/paravirt.c linux-2.6.38.3/arch/x86/ker |
23590 |
}; |
23591 |
|
23592 |
EXPORT_SYMBOL_GPL(pv_time_ops); |
23593 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c |
23594 |
---- linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20:32.000000000 -0400 |
23595 |
-+++ linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:57:32.000000000 -0400 |
23596 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c |
23597 |
+--- linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c 2011-03-14 21:20:32.000000000 -0400 |
23598 |
++++ linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:57:32.000000000 -0400 |
23599 |
@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t |
23600 |
arch_spin_lock(lock); |
23601 |
} |
23602 |
@@ -14017,9 +13951,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.3/ar |
23603 |
#ifdef CONFIG_SMP |
23604 |
.spin_is_locked = __ticket_spin_is_locked, |
23605 |
.spin_is_contended = __ticket_spin_is_contended, |
23606 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c |
23607 |
---- linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.000000000 -0400 |
23608 |
-+++ linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:57:32.000000000 -0400 |
23609 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c |
23610 |
+--- linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c 2011-03-14 21:20:32.000000000 -0400 |
23611 |
++++ linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:57:32.000000000 -0400 |
23612 |
@@ -476,7 +476,7 @@ static void calgary_free_coherent(struct |
23613 |
free_pages((unsigned long)vaddr, get_order(size)); |
23614 |
} |
23615 |
@@ -14029,9 +13963,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.3/arch/x |
23616 |
.alloc_coherent = calgary_alloc_coherent, |
23617 |
.free_coherent = calgary_free_coherent, |
23618 |
.map_sg = calgary_map_sg, |
23619 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-dma.c linux-2.6.38.3/arch/x86/kernel/pci-dma.c |
23620 |
---- linux-2.6.38.3/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400 |
23621 |
-+++ linux-2.6.38.3/arch/x86/kernel/pci-dma.c 2011-04-17 15:57:32.000000000 -0400 |
23622 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-dma.c linux-2.6.38.4/arch/x86/kernel/pci-dma.c |
23623 |
+--- linux-2.6.38.4/arch/x86/kernel/pci-dma.c 2011-03-14 21:20:32.000000000 -0400 |
23624 |
++++ linux-2.6.38.4/arch/x86/kernel/pci-dma.c 2011-04-17 15:57:32.000000000 -0400 |
23625 |
@@ -16,7 +16,7 @@ |
23626 |
|
23627 |
static int forbid_dac __read_mostly; |
23628 |
@@ -14050,9 +13984,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-dma.c linux-2.6.38.3/arch/x86/kern |
23629 |
|
23630 |
#ifdef CONFIG_PCI |
23631 |
if (mask > 0xffffffff && forbid_dac > 0) { |
23632 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c |
23633 |
---- linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c 2011-03-14 21:20:32.000000000 -0400 |
23634 |
-+++ linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:57:32.000000000 -0400 |
23635 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c |
23636 |
+--- linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c 2011-03-14 21:20:32.000000000 -0400 |
23637 |
++++ linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:57:32.000000000 -0400 |
23638 |
@@ -706,7 +706,7 @@ static __init int init_amd_gatt(struct a |
23639 |
return -1; |
23640 |
} |
23641 |
@@ -14062,9 +13996,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-gart_64.c linux-2.6.38.3/arch/x86/ |
23642 |
.map_sg = gart_map_sg, |
23643 |
.unmap_sg = gart_unmap_sg, |
23644 |
.map_page = gart_map_page, |
23645 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-nommu.c linux-2.6.38.3/arch/x86/kernel/pci-nommu.c |
23646 |
---- linux-2.6.38.3/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.000000000 -0400 |
23647 |
-+++ linux-2.6.38.3/arch/x86/kernel/pci-nommu.c 2011-04-17 15:57:32.000000000 -0400 |
23648 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-nommu.c linux-2.6.38.4/arch/x86/kernel/pci-nommu.c |
23649 |
+--- linux-2.6.38.4/arch/x86/kernel/pci-nommu.c 2011-03-14 21:20:32.000000000 -0400 |
23650 |
++++ linux-2.6.38.4/arch/x86/kernel/pci-nommu.c 2011-04-17 15:57:32.000000000 -0400 |
23651 |
@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str |
23652 |
flush_write_buffers(); |
23653 |
} |
23654 |
@@ -14074,9 +14008,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-nommu.c linux-2.6.38.3/arch/x86/ke |
23655 |
.alloc_coherent = dma_generic_alloc_coherent, |
23656 |
.free_coherent = nommu_free_coherent, |
23657 |
.map_sg = nommu_map_sg, |
23658 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c |
23659 |
---- linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 |
23660 |
-+++ linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:57:32.000000000 -0400 |
23661 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c |
23662 |
+--- linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c 2011-03-14 21:20:32.000000000 -0400 |
23663 |
++++ linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:57:32.000000000 -0400 |
23664 |
@@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent( |
23665 |
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); |
23666 |
} |
23667 |
@@ -14086,9 +14020,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.3/arch/x86/ |
23668 |
.mapping_error = swiotlb_dma_mapping_error, |
23669 |
.alloc_coherent = x86_swiotlb_alloc_coherent, |
23670 |
.free_coherent = swiotlb_free_coherent, |
23671 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/process_32.c linux-2.6.38.3/arch/x86/kernel/process_32.c |
23672 |
---- linux-2.6.38.3/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400 |
23673 |
-+++ linux-2.6.38.3/arch/x86/kernel/process_32.c 2011-04-17 15:57:32.000000000 -0400 |
23674 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/process_32.c linux-2.6.38.4/arch/x86/kernel/process_32.c |
23675 |
+--- linux-2.6.38.4/arch/x86/kernel/process_32.c 2011-03-14 21:20:32.000000000 -0400 |
23676 |
++++ linux-2.6.38.4/arch/x86/kernel/process_32.c 2011-04-17 15:57:32.000000000 -0400 |
23677 |
@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as |
23678 |
unsigned long thread_saved_pc(struct task_struct *tsk) |
23679 |
{ |
23680 |
@@ -14168,9 +14102,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/process_32.c linux-2.6.38.3/arch/x86/k |
23681 |
return 0; |
23682 |
} |
23683 |
- |
23684 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/process_64.c linux-2.6.38.3/arch/x86/kernel/process_64.c |
23685 |
---- linux-2.6.38.3/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400 |
23686 |
-+++ linux-2.6.38.3/arch/x86/kernel/process_64.c 2011-04-17 15:57:32.000000000 -0400 |
23687 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/process_64.c linux-2.6.38.4/arch/x86/kernel/process_64.c |
23688 |
+--- linux-2.6.38.4/arch/x86/kernel/process_64.c 2011-03-14 21:20:32.000000000 -0400 |
23689 |
++++ linux-2.6.38.4/arch/x86/kernel/process_64.c 2011-04-17 15:57:32.000000000 -0400 |
23690 |
@@ -87,7 +87,7 @@ static void __exit_idle(void) |
23691 |
void exit_idle(void) |
23692 |
{ |
23693 |
@@ -14227,9 +14161,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/process_64.c linux-2.6.38.3/arch/x86/k |
23694 |
return 0; |
23695 |
ip = *(u64 *)(fp+8); |
23696 |
if (!in_sched_functions(ip)) |
23697 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/process.c linux-2.6.38.3/arch/x86/kernel/process.c |
23698 |
---- linux-2.6.38.3/arch/x86/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
23699 |
-+++ linux-2.6.38.3/arch/x86/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
23700 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4/arch/x86/kernel/process.c |
23701 |
+--- linux-2.6.38.4/arch/x86/kernel/process.c 2011-03-14 21:20:32.000000000 -0400 |
23702 |
++++ linux-2.6.38.4/arch/x86/kernel/process.c 2011-04-17 15:57:32.000000000 -0400 |
23703 |
@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru |
23704 |
|
23705 |
void free_thread_info(struct thread_info *ti) |
23706 |
@@ -14352,9 +14286,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/process.c linux-2.6.38.3/arch/x86/kern |
23707 |
+#endif |
23708 |
+} |
23709 |
+#endif |
23710 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/ptrace.c linux-2.6.38.3/arch/x86/kernel/ptrace.c |
23711 |
---- linux-2.6.38.3/arch/x86/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400 |
23712 |
-+++ linux-2.6.38.3/arch/x86/kernel/ptrace.c 2011-04-17 15:57:32.000000000 -0400 |
23713 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/ptrace.c linux-2.6.38.4/arch/x86/kernel/ptrace.c |
23714 |
+--- linux-2.6.38.4/arch/x86/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400 |
23715 |
++++ linux-2.6.38.4/arch/x86/kernel/ptrace.c 2011-04-17 15:57:32.000000000 -0400 |
23716 |
@@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi |
23717 |
unsigned long addr, unsigned long data) |
23718 |
{ |
23719 |
@@ -14408,9 +14342,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/ptrace.c linux-2.6.38.3/arch/x86/kerne |
23720 |
{ |
23721 |
bool step; |
23722 |
|
23723 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/reboot.c linux-2.6.38.3/arch/x86/kernel/reboot.c |
23724 |
---- linux-2.6.38.3/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.000000000 -0400 |
23725 |
-+++ linux-2.6.38.3/arch/x86/kernel/reboot.c 2011-04-17 15:57:32.000000000 -0400 |
23726 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/reboot.c linux-2.6.38.4/arch/x86/kernel/reboot.c |
23727 |
+--- linux-2.6.38.4/arch/x86/kernel/reboot.c 2011-03-14 21:20:32.000000000 -0400 |
23728 |
++++ linux-2.6.38.4/arch/x86/kernel/reboot.c 2011-04-23 12:47:27.000000000 -0400 |
23729 |
@@ -34,7 +34,7 @@ void (*pm_power_off)(void); |
23730 |
EXPORT_SYMBOL(pm_power_off); |
23731 |
|
23732 |
@@ -14420,15 +14354,6 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/reboot.c linux-2.6.38.3/arch/x86/kerne |
23733 |
enum reboot_type reboot_type = BOOT_KBD; |
23734 |
int reboot_force; |
23735 |
|
23736 |
-@@ -293,7 +293,7 @@ static struct dmi_system_id __initdata r |
23737 |
- DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"), |
23738 |
- }, |
23739 |
- }, |
23740 |
-- { } |
23741 |
-+ { NULL, NULL, {{0, {0}}}, NULL} |
23742 |
- }; |
23743 |
- |
23744 |
- static int __init reboot_init(void) |
23745 |
@@ -309,12 +309,12 @@ core_initcall(reboot_init); |
23746 |
controller to pulse the CPU reset line, which is more thorough, but |
23747 |
doesn't work with at least one type of 486 motherboard. It is easy |
23748 |
@@ -14476,9 +14401,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/reboot.c linux-2.6.38.3/arch/x86/kerne |
23749 |
|
23750 |
/* Set up the IDT for real mode. */ |
23751 |
load_idt(&real_mode_idt); |
23752 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/setup.c linux-2.6.38.3/arch/x86/kernel/setup.c |
23753 |
---- linux-2.6.38.3/arch/x86/kernel/setup.c 2011-04-18 17:27:18.000000000 -0400 |
23754 |
-+++ linux-2.6.38.3/arch/x86/kernel/setup.c 2011-04-17 16:53:16.000000000 -0400 |
23755 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/setup.c linux-2.6.38.4/arch/x86/kernel/setup.c |
23756 |
+--- linux-2.6.38.4/arch/x86/kernel/setup.c 2011-04-18 17:27:18.000000000 -0400 |
23757 |
++++ linux-2.6.38.4/arch/x86/kernel/setup.c 2011-04-17 16:53:16.000000000 -0400 |
23758 |
@@ -654,7 +654,7 @@ static void __init trim_bios_range(void) |
23759 |
* area (640->1Mb) as ram even though it is not. |
23760 |
* take them out. |
23761 |
@@ -14508,9 +14433,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/setup.c linux-2.6.38.3/arch/x86/kernel |
23762 |
data_resource.end = virt_to_phys(_edata)-1; |
23763 |
bss_resource.start = virt_to_phys(&__bss_start); |
23764 |
bss_resource.end = virt_to_phys(&__bss_stop)-1; |
23765 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/setup_percpu.c linux-2.6.38.3/arch/x86/kernel/setup_percpu.c |
23766 |
---- linux-2.6.38.3/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.000000000 -0400 |
23767 |
-+++ linux-2.6.38.3/arch/x86/kernel/setup_percpu.c 2011-04-17 15:57:32.000000000 -0400 |
23768 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/setup_percpu.c linux-2.6.38.4/arch/x86/kernel/setup_percpu.c |
23769 |
+--- linux-2.6.38.4/arch/x86/kernel/setup_percpu.c 2011-03-14 21:20:32.000000000 -0400 |
23770 |
++++ linux-2.6.38.4/arch/x86/kernel/setup_percpu.c 2011-04-17 15:57:32.000000000 -0400 |
23771 |
@@ -21,19 +21,17 @@ |
23772 |
#include <asm/cpu.h> |
23773 |
#include <asm/stackprotector.h> |
23774 |
@@ -14574,9 +14499,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/setup_percpu.c linux-2.6.38.3/arch/x86 |
23775 |
/* |
23776 |
* Up to this point, the boot CPU has been using .init.data |
23777 |
* area. Reload any changed state for the boot CPU. |
23778 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/signal.c linux-2.6.38.3/arch/x86/kernel/signal.c |
23779 |
---- linux-2.6.38.3/arch/x86/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400 |
23780 |
-+++ linux-2.6.38.3/arch/x86/kernel/signal.c 2011-04-17 15:57:32.000000000 -0400 |
23781 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/signal.c linux-2.6.38.4/arch/x86/kernel/signal.c |
23782 |
+--- linux-2.6.38.4/arch/x86/kernel/signal.c 2011-03-14 21:20:32.000000000 -0400 |
23783 |
++++ linux-2.6.38.4/arch/x86/kernel/signal.c 2011-04-17 15:57:32.000000000 -0400 |
23784 |
@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi |
23785 |
* Align the stack pointer according to the i386 ABI, |
23786 |
* i.e. so that on function entry ((sp + 4) & 15) == 0. |
23787 |
@@ -14651,9 +14576,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/signal.c linux-2.6.38.3/arch/x86/kerne |
23788 |
return; |
23789 |
|
23790 |
if (current_thread_info()->status & TS_RESTORE_SIGMASK) |
23791 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/smpboot.c linux-2.6.38.3/arch/x86/kernel/smpboot.c |
23792 |
---- linux-2.6.38.3/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.000000000 -0400 |
23793 |
-+++ linux-2.6.38.3/arch/x86/kernel/smpboot.c 2011-04-17 15:57:32.000000000 -0400 |
23794 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/smpboot.c linux-2.6.38.4/arch/x86/kernel/smpboot.c |
23795 |
+--- linux-2.6.38.4/arch/x86/kernel/smpboot.c 2011-03-14 21:20:32.000000000 -0400 |
23796 |
++++ linux-2.6.38.4/arch/x86/kernel/smpboot.c 2011-04-17 15:57:32.000000000 -0400 |
23797 |
@@ -773,17 +773,20 @@ static int __cpuinit do_boot_cpu(int api |
23798 |
set_idle_for_cpu(cpu, c_idle.idle); |
23799 |
do_rest: |
23800 |
@@ -14691,9 +14616,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/smpboot.c linux-2.6.38.3/arch/x86/kern |
23801 |
err = do_boot_cpu(apicid, cpu); |
23802 |
if (err) { |
23803 |
pr_debug("do_boot_cpu failed %d\n", err); |
23804 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/step.c linux-2.6.38.3/arch/x86/kernel/step.c |
23805 |
---- linux-2.6.38.3/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 -0400 |
23806 |
-+++ linux-2.6.38.3/arch/x86/kernel/step.c 2011-04-17 15:57:32.000000000 -0400 |
23807 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/step.c linux-2.6.38.4/arch/x86/kernel/step.c |
23808 |
+--- linux-2.6.38.4/arch/x86/kernel/step.c 2011-03-14 21:20:32.000000000 -0400 |
23809 |
++++ linux-2.6.38.4/arch/x86/kernel/step.c 2011-04-17 15:57:32.000000000 -0400 |
23810 |
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc |
23811 |
struct desc_struct *desc; |
23812 |
unsigned long base; |
23813 |
@@ -14736,17 +14661,17 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/step.c linux-2.6.38.3/arch/x86/kernel/ |
23814 |
/* 32-bit mode: register increment */ |
23815 |
return 0; |
23816 |
/* 64-bit mode: REX prefix */ |
23817 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/syscall_table_32.S linux-2.6.38.3/arch/x86/kernel/syscall_table_32.S |
23818 |
---- linux-2.6.38.3/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:32.000000000 -0400 |
23819 |
-+++ linux-2.6.38.3/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:57:32.000000000 -0400 |
23820 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S |
23821 |
+--- linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S 2011-03-14 21:20:32.000000000 -0400 |
23822 |
++++ linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:57:32.000000000 -0400 |
23823 |
@@ -1,3 +1,4 @@ |
23824 |
+.section .rodata,"a",@progbits |
23825 |
ENTRY(sys_call_table) |
23826 |
.long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ |
23827 |
.long sys_exit |
23828 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c |
23829 |
---- linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000000000 -0400 |
23830 |
-+++ linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:57:32.000000000 -0400 |
23831 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c |
23832 |
+--- linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c 2011-03-14 21:20:32.000000000 -0400 |
23833 |
++++ linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:57:32.000000000 -0400 |
23834 |
@@ -24,17 +24,224 @@ |
23835 |
|
23836 |
#include <asm/syscalls.h> |
23837 |
@@ -14984,9 +14909,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_i386_32.c linux-2.6.38.3/arch/x86/ |
23838 |
+ |
23839 |
+ return addr; |
23840 |
} |
23841 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c |
23842 |
---- linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.000000000 -0400 |
23843 |
-+++ linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:57:32.000000000 -0400 |
23844 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c |
23845 |
+--- linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c 2011-03-14 21:20:32.000000000 -0400 |
23846 |
++++ linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:57:32.000000000 -0400 |
23847 |
@@ -32,8 +32,8 @@ out: |
23848 |
return error; |
23849 |
} |
23850 |
@@ -15124,9 +15049,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/sys_x86_64.c linux-2.6.38.3/arch/x86/k |
23851 |
mm->cached_hole_size = ~0UL; |
23852 |
|
23853 |
return addr; |
23854 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/time.c linux-2.6.38.3/arch/x86/kernel/time.c |
23855 |
---- linux-2.6.38.3/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 |
23856 |
-+++ linux-2.6.38.3/arch/x86/kernel/time.c 2011-04-17 15:57:32.000000000 -0400 |
23857 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/time.c linux-2.6.38.4/arch/x86/kernel/time.c |
23858 |
+--- linux-2.6.38.4/arch/x86/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 |
23859 |
++++ linux-2.6.38.4/arch/x86/kernel/time.c 2011-04-17 15:57:32.000000000 -0400 |
23860 |
@@ -22,17 +22,13 @@ |
23861 |
#include <asm/hpet.h> |
23862 |
#include <asm/time.h> |
23863 |
@@ -15165,9 +15090,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/time.c linux-2.6.38.3/arch/x86/kernel/ |
23864 |
} |
23865 |
return pc; |
23866 |
} |
23867 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/tls.c linux-2.6.38.3/arch/x86/kernel/tls.c |
23868 |
---- linux-2.6.38.3/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -0400 |
23869 |
-+++ linux-2.6.38.3/arch/x86/kernel/tls.c 2011-04-17 15:57:32.000000000 -0400 |
23870 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/tls.c linux-2.6.38.4/arch/x86/kernel/tls.c |
23871 |
+--- linux-2.6.38.4/arch/x86/kernel/tls.c 2011-03-14 21:20:32.000000000 -0400 |
23872 |
++++ linux-2.6.38.4/arch/x86/kernel/tls.c 2011-04-17 15:57:32.000000000 -0400 |
23873 |
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc |
23874 |
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) |
23875 |
return -EINVAL; |
23876 |
@@ -15180,9 +15105,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/tls.c linux-2.6.38.3/arch/x86/kernel/t |
23877 |
set_tls_desc(p, idx, &info, 1); |
23878 |
|
23879 |
return 0; |
23880 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/trampoline_32.S linux-2.6.38.3/arch/x86/kernel/trampoline_32.S |
23881 |
---- linux-2.6.38.3/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.000000000 -0400 |
23882 |
-+++ linux-2.6.38.3/arch/x86/kernel/trampoline_32.S 2011-04-17 15:57:32.000000000 -0400 |
23883 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_32.S linux-2.6.38.4/arch/x86/kernel/trampoline_32.S |
23884 |
+--- linux-2.6.38.4/arch/x86/kernel/trampoline_32.S 2011-03-14 21:20:32.000000000 -0400 |
23885 |
++++ linux-2.6.38.4/arch/x86/kernel/trampoline_32.S 2011-04-17 15:57:32.000000000 -0400 |
23886 |
@@ -32,6 +32,12 @@ |
23887 |
#include <asm/segment.h> |
23888 |
#include <asm/page_types.h> |
23889 |
@@ -15205,9 +15130,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/trampoline_32.S linux-2.6.38.3/arch/x8 |
23890 |
|
23891 |
# These need to be in the same 64K segment as the above; |
23892 |
# hence we don't use the boot_gdt_descr defined in head.S |
23893 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/trampoline_64.S linux-2.6.38.3/arch/x86/kernel/trampoline_64.S |
23894 |
---- linux-2.6.38.3/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.000000000 -0400 |
23895 |
-+++ linux-2.6.38.3/arch/x86/kernel/trampoline_64.S 2011-04-17 15:57:32.000000000 -0400 |
23896 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_64.S linux-2.6.38.4/arch/x86/kernel/trampoline_64.S |
23897 |
+--- linux-2.6.38.4/arch/x86/kernel/trampoline_64.S 2011-03-14 21:20:32.000000000 -0400 |
23898 |
++++ linux-2.6.38.4/arch/x86/kernel/trampoline_64.S 2011-04-17 15:57:32.000000000 -0400 |
23899 |
@@ -91,7 +91,7 @@ startup_32: |
23900 |
movl $__KERNEL_DS, %eax # Initialize the %ds segment register |
23901 |
movl %eax, %ds |
23902 |
@@ -15226,9 +15151,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/trampoline_64.S linux-2.6.38.3/arch/x8 |
23903 |
.long tgdt - r_base |
23904 |
.short 0 |
23905 |
.quad 0x00cf9b000000ffff # __KERNEL32_CS |
23906 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/traps.c linux-2.6.38.3/arch/x86/kernel/traps.c |
23907 |
---- linux-2.6.38.3/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400 |
23908 |
-+++ linux-2.6.38.3/arch/x86/kernel/traps.c 2011-04-17 15:57:32.000000000 -0400 |
23909 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/traps.c linux-2.6.38.4/arch/x86/kernel/traps.c |
23910 |
+--- linux-2.6.38.4/arch/x86/kernel/traps.c 2011-03-14 21:20:32.000000000 -0400 |
23911 |
++++ linux-2.6.38.4/arch/x86/kernel/traps.c 2011-04-17 15:57:32.000000000 -0400 |
23912 |
@@ -70,12 +70,6 @@ asmlinkage int system_call(void); |
23913 |
|
23914 |
/* Do we ignore FPU interrupts ? */ |
23915 |
@@ -15390,21 +15315,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/traps.c linux-2.6.38.3/arch/x86/kernel |
23916 |
|
23917 |
if (!tsk_used_math(tsk)) { |
23918 |
local_irq_enable(); |
23919 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/tsc.c linux-2.6.38.3/arch/x86/kernel/tsc.c |
23920 |
---- linux-2.6.38.3/arch/x86/kernel/tsc.c 2011-03-14 21:20:32.000000000 -0400 |
23921 |
-+++ linux-2.6.38.3/arch/x86/kernel/tsc.c 2011-04-17 15:57:32.000000000 -0400 |
23922 |
-@@ -837,7 +837,7 @@ static struct dmi_system_id __initdata b |
23923 |
- DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), |
23924 |
- }, |
23925 |
- }, |
23926 |
-- {} |
23927 |
-+ { NULL, NULL, {{0, {0}}}, NULL} |
23928 |
- }; |
23929 |
- |
23930 |
- static void __init check_system_tsc_reliable(void) |
23931 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/vm86_32.c linux-2.6.38.3/arch/x86/kernel/vm86_32.c |
23932 |
---- linux-2.6.38.3/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.000000000 -0400 |
23933 |
-+++ linux-2.6.38.3/arch/x86/kernel/vm86_32.c 2011-04-17 15:57:32.000000000 -0400 |
23934 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/vm86_32.c linux-2.6.38.4/arch/x86/kernel/vm86_32.c |
23935 |
+--- linux-2.6.38.4/arch/x86/kernel/vm86_32.c 2011-03-14 21:20:32.000000000 -0400 |
23936 |
++++ linux-2.6.38.4/arch/x86/kernel/vm86_32.c 2011-04-17 15:57:32.000000000 -0400 |
23937 |
@@ -41,6 +41,7 @@ |
23938 |
#include <linux/ptrace.h> |
23939 |
#include <linux/audit.h> |
23940 |
@@ -15469,9 +15382,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/vm86_32.c linux-2.6.38.3/arch/x86/kern |
23941 |
if (get_user(segoffs, intr_ptr)) |
23942 |
goto cannot_handle; |
23943 |
if ((segoffs >> 16) == BIOSSEG) |
23944 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S |
23945 |
---- linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400 |
23946 |
-+++ linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:57:32.000000000 -0400 |
23947 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S |
23948 |
+--- linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S 2011-03-14 21:20:32.000000000 -0400 |
23949 |
++++ linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:57:32.000000000 -0400 |
23950 |
@@ -26,6 +26,13 @@ |
23951 |
#include <asm/page_types.h> |
23952 |
#include <asm/cache.h> |
23953 |
@@ -15768,9 +15681,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.3/arch/x86/ |
23954 |
"kernel image bigger than KERNEL_IMAGE_SIZE"); |
23955 |
|
23956 |
#ifdef CONFIG_SMP |
23957 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c |
23958 |
---- linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000000000 -0400 |
23959 |
-+++ linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c 2011-04-17 15:57:32.000000000 -0400 |
23960 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c |
23961 |
+--- linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c 2011-03-14 21:20:32.000000000 -0400 |
23962 |
++++ linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c 2011-04-17 15:57:32.000000000 -0400 |
23963 |
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa |
23964 |
|
23965 |
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); |
23966 |
@@ -15788,9 +15701,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/vsyscall_64.c linux-2.6.38.3/arch/x86/ |
23967 |
p = tcache->blob[1]; |
23968 |
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) { |
23969 |
/* Load per CPU data from RDTSCP */ |
23970 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c |
23971 |
---- linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.000000000 -0400 |
23972 |
-+++ linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:57:32.000000000 -0400 |
23973 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c |
23974 |
+--- linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c 2011-03-14 21:20:32.000000000 -0400 |
23975 |
++++ linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:57:32.000000000 -0400 |
23976 |
@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8); |
23977 |
EXPORT_SYMBOL(copy_user_generic_string); |
23978 |
EXPORT_SYMBOL(copy_user_generic_unrolled); |
23979 |
@@ -15800,9 +15713,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.3/arch/x |
23980 |
|
23981 |
EXPORT_SYMBOL(copy_page); |
23982 |
EXPORT_SYMBOL(clear_page); |
23983 |
-diff -urNp linux-2.6.38.3/arch/x86/kernel/xsave.c linux-2.6.38.3/arch/x86/kernel/xsave.c |
23984 |
---- linux-2.6.38.3/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000 -0400 |
23985 |
-+++ linux-2.6.38.3/arch/x86/kernel/xsave.c 2011-04-17 15:57:32.000000000 -0400 |
23986 |
+diff -urNp linux-2.6.38.4/arch/x86/kernel/xsave.c linux-2.6.38.4/arch/x86/kernel/xsave.c |
23987 |
+--- linux-2.6.38.4/arch/x86/kernel/xsave.c 2011-03-14 21:20:32.000000000 -0400 |
23988 |
++++ linux-2.6.38.4/arch/x86/kernel/xsave.c 2011-04-17 15:57:32.000000000 -0400 |
23989 |
@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_ |
23990 |
fx_sw_user->xstate_size > fx_sw_user->extended_size) |
23991 |
return -EINVAL; |
23992 |
@@ -15830,9 +15743,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kernel/xsave.c linux-2.6.38.3/arch/x86/kernel |
23993 |
buf); |
23994 |
if (unlikely(err)) { |
23995 |
/* |
23996 |
-diff -urNp linux-2.6.38.3/arch/x86/kvm/emulate.c linux-2.6.38.3/arch/x86/kvm/emulate.c |
23997 |
---- linux-2.6.38.3/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 -0400 |
23998 |
-+++ linux-2.6.38.3/arch/x86/kvm/emulate.c 2011-04-17 15:57:32.000000000 -0400 |
23999 |
+diff -urNp linux-2.6.38.4/arch/x86/kvm/emulate.c linux-2.6.38.4/arch/x86/kvm/emulate.c |
24000 |
+--- linux-2.6.38.4/arch/x86/kvm/emulate.c 2011-03-14 21:20:32.000000000 -0400 |
24001 |
++++ linux-2.6.38.4/arch/x86/kvm/emulate.c 2011-04-17 15:57:32.000000000 -0400 |
24002 |
@@ -88,7 +88,7 @@ |
24003 |
#define Src2ImmByte (2<<29) |
24004 |
#define Src2One (3<<29) |
24005 |
@@ -15867,9 +15780,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/emulate.c linux-2.6.38.3/arch/x86/kvm/emu |
24006 |
switch ((_dst).bytes) { \ |
24007 |
case 1: \ |
24008 |
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \ |
24009 |
-diff -urNp linux-2.6.38.3/arch/x86/kvm/lapic.c linux-2.6.38.3/arch/x86/kvm/lapic.c |
24010 |
---- linux-2.6.38.3/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0400 |
24011 |
-+++ linux-2.6.38.3/arch/x86/kvm/lapic.c 2011-04-17 15:57:32.000000000 -0400 |
24012 |
+diff -urNp linux-2.6.38.4/arch/x86/kvm/lapic.c linux-2.6.38.4/arch/x86/kvm/lapic.c |
24013 |
+--- linux-2.6.38.4/arch/x86/kvm/lapic.c 2011-03-14 21:20:32.000000000 -0400 |
24014 |
++++ linux-2.6.38.4/arch/x86/kvm/lapic.c 2011-04-17 15:57:32.000000000 -0400 |
24015 |
@@ -53,7 +53,7 @@ |
24016 |
#define APIC_BUS_CYCLE_NS 1 |
24017 |
|
24018 |
@@ -15879,9 +15792,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/lapic.c linux-2.6.38.3/arch/x86/kvm/lapic |
24019 |
|
24020 |
#define APIC_LVT_NUM 6 |
24021 |
/* 14 is the version for Xeon and Pentium 8.4.8*/ |
24022 |
-diff -urNp linux-2.6.38.3/arch/x86/kvm/svm.c linux-2.6.38.3/arch/x86/kvm/svm.c |
24023 |
---- linux-2.6.38.3/arch/x86/kvm/svm.c 2011-03-14 21:20:32.000000000 -0400 |
24024 |
-+++ linux-2.6.38.3/arch/x86/kvm/svm.c 2011-04-17 15:57:32.000000000 -0400 |
24025 |
+diff -urNp linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4/arch/x86/kvm/svm.c |
24026 |
+--- linux-2.6.38.4/arch/x86/kvm/svm.c 2011-03-14 21:20:32.000000000 -0400 |
24027 |
++++ linux-2.6.38.4/arch/x86/kvm/svm.c 2011-04-17 15:57:32.000000000 -0400 |
24028 |
@@ -3273,7 +3273,11 @@ static void reload_tss(struct kvm_vcpu * |
24029 |
int cpu = raw_smp_processor_id(); |
24030 |
|
24031 |
@@ -15903,9 +15816,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/svm.c linux-2.6.38.3/arch/x86/kvm/svm.c |
24032 |
.cpu_has_kvm_support = has_svm, |
24033 |
.disabled_by_bios = is_disabled, |
24034 |
.hardware_setup = svm_hardware_setup, |
24035 |
-diff -urNp linux-2.6.38.3/arch/x86/kvm/vmx.c linux-2.6.38.3/arch/x86/kvm/vmx.c |
24036 |
---- linux-2.6.38.3/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -0400 |
24037 |
-+++ linux-2.6.38.3/arch/x86/kvm/vmx.c 2011-04-17 15:57:32.000000000 -0400 |
24038 |
+diff -urNp linux-2.6.38.4/arch/x86/kvm/vmx.c linux-2.6.38.4/arch/x86/kvm/vmx.c |
24039 |
+--- linux-2.6.38.4/arch/x86/kvm/vmx.c 2011-03-14 21:20:32.000000000 -0400 |
24040 |
++++ linux-2.6.38.4/arch/x86/kvm/vmx.c 2011-04-23 12:47:27.000000000 -0400 |
24041 |
@@ -725,7 +725,11 @@ static void reload_tss(void) |
24042 |
struct desc_struct *descs; |
24043 |
|
24044 |
@@ -15966,16 +15879,25 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/vmx.c linux-2.6.38.3/arch/x86/kvm/vmx.c |
24045 |
: "cc", "memory" |
24046 |
, R"ax", R"bx", R"di", R"si" |
24047 |
#ifdef CONFIG_X86_64 |
24048 |
-@@ -4091,7 +4109,7 @@ static void vmx_vcpu_run(struct kvm_vcpu |
24049 |
+@@ -4091,7 +4109,16 @@ static void vmx_vcpu_run(struct kvm_vcpu |
24050 |
|
24051 |
vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD); |
24052 |
|
24053 |
- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS)); |
24054 |
+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS)); |
24055 |
++ |
24056 |
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) |
24057 |
++ asm("mov %0, %%fs" : : "r"(__KERNEL_PERCPU)); |
24058 |
++#endif |
24059 |
++ |
24060 |
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) |
24061 |
++ __set_fs(current_thread_info()->addr_limit); |
24062 |
++#endif |
24063 |
++ |
24064 |
vmx->launched = 1; |
24065 |
|
24066 |
vmx->exit_reason = vmcs_read32(VM_EXIT_REASON); |
24067 |
-@@ -4326,7 +4344,7 @@ static void vmx_set_supported_cpuid(u32 |
24068 |
+@@ -4326,7 +4353,7 @@ static void vmx_set_supported_cpuid(u32 |
24069 |
{ |
24070 |
} |
24071 |
|
24072 |
@@ -15984,9 +15906,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/vmx.c linux-2.6.38.3/arch/x86/kvm/vmx.c |
24073 |
.cpu_has_kvm_support = cpu_has_kvm_support, |
24074 |
.disabled_by_bios = vmx_disabled_by_bios, |
24075 |
.hardware_setup = hardware_setup, |
24076 |
-diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linux-2.6.38.3/arch/x86/kvm/x86.c |
24077 |
---- linux-2.6.38.3/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -0400 |
24078 |
-+++ linux-2.6.38.3/arch/x86/kvm/x86.c 2011-04-17 15:57:32.000000000 -0400 |
24079 |
+diff -urNp linux-2.6.38.4/arch/x86/kvm/x86.c linux-2.6.38.4/arch/x86/kvm/x86.c |
24080 |
+--- linux-2.6.38.4/arch/x86/kvm/x86.c 2011-03-14 21:20:32.000000000 -0400 |
24081 |
++++ linux-2.6.38.4/arch/x86/kvm/x86.c 2011-04-23 12:47:27.000000000 -0400 |
24082 |
@@ -93,7 +93,7 @@ static void update_cr8_intercept(struct |
24083 |
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, |
24084 |
struct kvm_cpuid_entry2 __user *entries); |
24085 |
@@ -15996,77 +15918,6 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linux-2.6.38.3/arch/x86/kvm/x86.c |
24086 |
EXPORT_SYMBOL_GPL(kvm_x86_ops); |
24087 |
|
24088 |
int ignore_msrs = 0; |
24089 |
-@@ -119,38 +119,38 @@ static struct kvm_shared_msrs_global __r |
24090 |
- static DEFINE_PER_CPU(struct kvm_shared_msrs, shared_msrs); |
24091 |
- |
24092 |
- struct kvm_stats_debugfs_item debugfs_entries[] = { |
24093 |
-- { "pf_fixed", VCPU_STAT(pf_fixed) }, |
24094 |
-- { "pf_guest", VCPU_STAT(pf_guest) }, |
24095 |
-- { "tlb_flush", VCPU_STAT(tlb_flush) }, |
24096 |
-- { "invlpg", VCPU_STAT(invlpg) }, |
24097 |
-- { "exits", VCPU_STAT(exits) }, |
24098 |
-- { "io_exits", VCPU_STAT(io_exits) }, |
24099 |
-- { "mmio_exits", VCPU_STAT(mmio_exits) }, |
24100 |
-- { "signal_exits", VCPU_STAT(signal_exits) }, |
24101 |
-- { "irq_window", VCPU_STAT(irq_window_exits) }, |
24102 |
-- { "nmi_window", VCPU_STAT(nmi_window_exits) }, |
24103 |
-- { "halt_exits", VCPU_STAT(halt_exits) }, |
24104 |
-- { "halt_wakeup", VCPU_STAT(halt_wakeup) }, |
24105 |
-- { "hypercalls", VCPU_STAT(hypercalls) }, |
24106 |
-- { "request_irq", VCPU_STAT(request_irq_exits) }, |
24107 |
-- { "irq_exits", VCPU_STAT(irq_exits) }, |
24108 |
-- { "host_state_reload", VCPU_STAT(host_state_reload) }, |
24109 |
-- { "efer_reload", VCPU_STAT(efer_reload) }, |
24110 |
-- { "fpu_reload", VCPU_STAT(fpu_reload) }, |
24111 |
-- { "insn_emulation", VCPU_STAT(insn_emulation) }, |
24112 |
-- { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail) }, |
24113 |
-- { "irq_injections", VCPU_STAT(irq_injections) }, |
24114 |
-- { "nmi_injections", VCPU_STAT(nmi_injections) }, |
24115 |
-- { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped) }, |
24116 |
-- { "mmu_pte_write", VM_STAT(mmu_pte_write) }, |
24117 |
-- { "mmu_pte_updated", VM_STAT(mmu_pte_updated) }, |
24118 |
-- { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped) }, |
24119 |
-- { "mmu_flooded", VM_STAT(mmu_flooded) }, |
24120 |
-- { "mmu_recycled", VM_STAT(mmu_recycled) }, |
24121 |
-- { "mmu_cache_miss", VM_STAT(mmu_cache_miss) }, |
24122 |
-- { "mmu_unsync", VM_STAT(mmu_unsync) }, |
24123 |
-- { "remote_tlb_flush", VM_STAT(remote_tlb_flush) }, |
24124 |
-- { "largepages", VM_STAT(lpages) }, |
24125 |
-+ { "pf_fixed", VCPU_STAT(pf_fixed), NULL }, |
24126 |
-+ { "pf_guest", VCPU_STAT(pf_guest), NULL }, |
24127 |
-+ { "tlb_flush", VCPU_STAT(tlb_flush), NULL }, |
24128 |
-+ { "invlpg", VCPU_STAT(invlpg), NULL }, |
24129 |
-+ { "exits", VCPU_STAT(exits), NULL }, |
24130 |
-+ { "io_exits", VCPU_STAT(io_exits), NULL }, |
24131 |
-+ { "mmio_exits", VCPU_STAT(mmio_exits), NULL }, |
24132 |
-+ { "signal_exits", VCPU_STAT(signal_exits), NULL }, |
24133 |
-+ { "irq_window", VCPU_STAT(irq_window_exits), NULL }, |
24134 |
-+ { "nmi_window", VCPU_STAT(nmi_window_exits), NULL }, |
24135 |
-+ { "halt_exits", VCPU_STAT(halt_exits), NULL }, |
24136 |
-+ { "halt_wakeup", VCPU_STAT(halt_wakeup), NULL }, |
24137 |
-+ { "hypercalls", VCPU_STAT(hypercalls), NULL }, |
24138 |
-+ { "request_irq", VCPU_STAT(request_irq_exits), NULL }, |
24139 |
-+ { "irq_exits", VCPU_STAT(irq_exits), NULL }, |
24140 |
-+ { "host_state_reload", VCPU_STAT(host_state_reload), NULL }, |
24141 |
-+ { "efer_reload", VCPU_STAT(efer_reload), NULL }, |
24142 |
-+ { "fpu_reload", VCPU_STAT(fpu_reload), NULL }, |
24143 |
-+ { "insn_emulation", VCPU_STAT(insn_emulation), NULL }, |
24144 |
-+ { "insn_emulation_fail", VCPU_STAT(insn_emulation_fail), NULL }, |
24145 |
-+ { "irq_injections", VCPU_STAT(irq_injections), NULL }, |
24146 |
-+ { "nmi_injections", VCPU_STAT(nmi_injections), NULL }, |
24147 |
-+ { "mmu_shadow_zapped", VM_STAT(mmu_shadow_zapped), NULL }, |
24148 |
-+ { "mmu_pte_write", VM_STAT(mmu_pte_write), NULL }, |
24149 |
-+ { "mmu_pte_updated", VM_STAT(mmu_pte_updated), NULL }, |
24150 |
-+ { "mmu_pde_zapped", VM_STAT(mmu_pde_zapped), NULL }, |
24151 |
-+ { "mmu_flooded", VM_STAT(mmu_flooded), NULL }, |
24152 |
-+ { "mmu_recycled", VM_STAT(mmu_recycled), NULL }, |
24153 |
-+ { "mmu_cache_miss", VM_STAT(mmu_cache_miss), NULL }, |
24154 |
-+ { "mmu_unsync", VM_STAT(mmu_unsync), NULL }, |
24155 |
-+ { "remote_tlb_flush", VM_STAT(remote_tlb_flush), NULL }, |
24156 |
-+ { "largepages", VM_STAT(lpages), NULL }, |
24157 |
- { NULL } |
24158 |
- }; |
24159 |
- |
24160 |
@@ -2023,6 +2023,8 @@ long kvm_arch_dev_ioctl(struct file *fil |
24161 |
if (n < msr_list.nmsrs) |
24162 |
goto out; |
24163 |
@@ -16076,7 +15927,54 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linux-2.6.38.3/arch/x86/kvm/x86.c |
24164 |
if (copy_to_user(user_msr_list->indices, &msrs_to_save, |
24165 |
num_msrs_to_save * sizeof(u32))) |
24166 |
goto out; |
24167 |
-@@ -2499,7 +2501,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru |
24168 |
+@@ -2190,15 +2192,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str |
24169 |
+ struct kvm_cpuid2 *cpuid, |
24170 |
+ struct kvm_cpuid_entry2 __user *entries) |
24171 |
+ { |
24172 |
+- int r; |
24173 |
++ int r, i; |
24174 |
+ |
24175 |
+ r = -E2BIG; |
24176 |
+ if (cpuid->nent > KVM_MAX_CPUID_ENTRIES) |
24177 |
+ goto out; |
24178 |
+ r = -EFAULT; |
24179 |
+- if (copy_from_user(&vcpu->arch.cpuid_entries, entries, |
24180 |
+- cpuid->nent * sizeof(struct kvm_cpuid_entry2))) |
24181 |
++ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2))) |
24182 |
+ goto out; |
24183 |
++ for (i = 0; i < cpuid->nent; ++i) { |
24184 |
++ struct kvm_cpuid_entry2 cpuid_entry; |
24185 |
++ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry))) |
24186 |
++ goto out; |
24187 |
++ vcpu->arch.cpuid_entries[i] = cpuid_entry; |
24188 |
++ } |
24189 |
+ vcpu->arch.cpuid_nent = cpuid->nent; |
24190 |
+ kvm_apic_set_version(vcpu); |
24191 |
+ kvm_x86_ops->cpuid_update(vcpu); |
24192 |
+@@ -2213,15 +2220,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str |
24193 |
+ struct kvm_cpuid2 *cpuid, |
24194 |
+ struct kvm_cpuid_entry2 __user *entries) |
24195 |
+ { |
24196 |
+- int r; |
24197 |
++ int r, i; |
24198 |
+ |
24199 |
+ r = -E2BIG; |
24200 |
+ if (cpuid->nent < vcpu->arch.cpuid_nent) |
24201 |
+ goto out; |
24202 |
+ r = -EFAULT; |
24203 |
+- if (copy_to_user(entries, &vcpu->arch.cpuid_entries, |
24204 |
+- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) |
24205 |
++ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) |
24206 |
+ goto out; |
24207 |
++ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) { |
24208 |
++ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i]; |
24209 |
++ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry))) |
24210 |
++ goto out; |
24211 |
++ } |
24212 |
+ return 0; |
24213 |
+ |
24214 |
+ out: |
24215 |
+@@ -2499,7 +2510,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru |
24216 |
static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, |
24217 |
struct kvm_interrupt *irq) |
24218 |
{ |
24219 |
@@ -16085,7 +15983,7 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linux-2.6.38.3/arch/x86/kvm/x86.c |
24220 |
return -EINVAL; |
24221 |
if (irqchip_in_kernel(vcpu->kvm)) |
24222 |
return -ENXIO; |
24223 |
-@@ -4687,10 +4689,10 @@ void kvm_after_handle_nmi(struct kvm_vcp |
24224 |
+@@ -4687,10 +4698,10 @@ void kvm_after_handle_nmi(struct kvm_vcp |
24225 |
} |
24226 |
EXPORT_SYMBOL_GPL(kvm_after_handle_nmi); |
24227 |
|
24228 |
@@ -16098,9 +15996,9 @@ diff -urNp linux-2.6.38.3/arch/x86/kvm/x86.c linux-2.6.38.3/arch/x86/kvm/x86.c |
24229 |
|
24230 |
if (kvm_x86_ops) { |
24231 |
printk(KERN_ERR "kvm: already loaded the other module\n"); |
24232 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S |
24233 |
---- linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.000000000 -0400 |
24234 |
-+++ linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S 2011-04-17 15:57:32.000000000 -0400 |
24235 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S |
24236 |
+--- linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S 2011-03-14 21:20:32.000000000 -0400 |
24237 |
++++ linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S 2011-04-17 15:57:32.000000000 -0400 |
24238 |
@@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8) |
24239 |
movl %edx, %ecx |
24240 |
\ins\()l %esi, %ebx |
24241 |
@@ -16181,9 +16079,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.3/arch/x86 |
24242 |
LOCK_PREFIX |
24243 |
cmpxchg8b (%esi) |
24244 |
jne 1b |
24245 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/checksum_32.S linux-2.6.38.3/arch/x86/lib/checksum_32.S |
24246 |
---- linux-2.6.38.3/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000000 -0400 |
24247 |
-+++ linux-2.6.38.3/arch/x86/lib/checksum_32.S 2011-04-17 15:57:32.000000000 -0400 |
24248 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/checksum_32.S linux-2.6.38.4/arch/x86/lib/checksum_32.S |
24249 |
+--- linux-2.6.38.4/arch/x86/lib/checksum_32.S 2011-03-14 21:20:32.000000000 -0400 |
24250 |
++++ linux-2.6.38.4/arch/x86/lib/checksum_32.S 2011-04-17 15:57:32.000000000 -0400 |
24251 |
@@ -28,7 +28,8 @@ |
24252 |
#include <linux/linkage.h> |
24253 |
#include <asm/dwarf2.h> |
24254 |
@@ -16444,9 +16342,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/checksum_32.S linux-2.6.38.3/arch/x86/lib |
24255 |
|
24256 |
#undef ROUND |
24257 |
#undef ROUND1 |
24258 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/clear_page_64.S linux-2.6.38.3/arch/x86/lib/clear_page_64.S |
24259 |
---- linux-2.6.38.3/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.000000000 -0400 |
24260 |
-+++ linux-2.6.38.3/arch/x86/lib/clear_page_64.S 2011-04-17 15:57:32.000000000 -0400 |
24261 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/clear_page_64.S linux-2.6.38.4/arch/x86/lib/clear_page_64.S |
24262 |
+--- linux-2.6.38.4/arch/x86/lib/clear_page_64.S 2011-03-14 21:20:32.000000000 -0400 |
24263 |
++++ linux-2.6.38.4/arch/x86/lib/clear_page_64.S 2011-04-17 15:57:32.000000000 -0400 |
24264 |
@@ -43,7 +43,7 @@ ENDPROC(clear_page) |
24265 |
|
24266 |
#include <asm/cpufeature.h> |
24267 |
@@ -16456,9 +16354,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/clear_page_64.S linux-2.6.38.3/arch/x86/l |
24268 |
1: .byte 0xeb /* jmp <disp8> */ |
24269 |
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ |
24270 |
2: |
24271 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/copy_page_64.S linux-2.6.38.3/arch/x86/lib/copy_page_64.S |
24272 |
---- linux-2.6.38.3/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.000000000 -0400 |
24273 |
-+++ linux-2.6.38.3/arch/x86/lib/copy_page_64.S 2011-04-17 15:57:32.000000000 -0400 |
24274 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/copy_page_64.S linux-2.6.38.4/arch/x86/lib/copy_page_64.S |
24275 |
+--- linux-2.6.38.4/arch/x86/lib/copy_page_64.S 2011-03-14 21:20:32.000000000 -0400 |
24276 |
++++ linux-2.6.38.4/arch/x86/lib/copy_page_64.S 2011-04-17 15:57:32.000000000 -0400 |
24277 |
@@ -104,7 +104,7 @@ ENDPROC(copy_page) |
24278 |
|
24279 |
#include <asm/cpufeature.h> |
24280 |
@@ -16468,9 +16366,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/copy_page_64.S linux-2.6.38.3/arch/x86/li |
24281 |
1: .byte 0xeb /* jmp <disp8> */ |
24282 |
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ |
24283 |
2: |
24284 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_64.S linux-2.6.38.3/arch/x86/lib/copy_user_64.S |
24285 |
---- linux-2.6.38.3/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.000000000 -0400 |
24286 |
-+++ linux-2.6.38.3/arch/x86/lib/copy_user_64.S 2011-04-17 15:57:32.000000000 -0400 |
24287 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_64.S linux-2.6.38.4/arch/x86/lib/copy_user_64.S |
24288 |
+--- linux-2.6.38.4/arch/x86/lib/copy_user_64.S 2011-03-14 21:20:32.000000000 -0400 |
24289 |
++++ linux-2.6.38.4/arch/x86/lib/copy_user_64.S 2011-04-17 15:57:32.000000000 -0400 |
24290 |
@@ -15,13 +15,14 @@ |
24291 |
#include <asm/asm-offsets.h> |
24292 |
#include <asm/thread_info.h> |
24293 |
@@ -16527,9 +16425,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_64.S linux-2.6.38.3/arch/x86/li |
24294 |
movl %edx,%ecx |
24295 |
xorl %eax,%eax |
24296 |
rep |
24297 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S |
24298 |
---- linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:32.000000000 -0400 |
24299 |
-+++ linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:57:32.000000000 -0400 |
24300 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S |
24301 |
+--- linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S 2011-03-14 21:20:32.000000000 -0400 |
24302 |
++++ linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:57:32.000000000 -0400 |
24303 |
@@ -14,6 +14,7 @@ |
24304 |
#include <asm/current.h> |
24305 |
#include <asm/asm-offsets.h> |
24306 |
@@ -16554,9 +16452,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.3/arc |
24307 |
cmpl $8,%edx |
24308 |
jb 20f /* less then 8 bytes, go to byte copy loop */ |
24309 |
ALIGN_DESTINATION |
24310 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c |
24311 |
---- linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.000000000 -0400 |
24312 |
-+++ linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:57:32.000000000 -0400 |
24313 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c |
24314 |
+--- linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c 2011-03-14 21:20:32.000000000 -0400 |
24315 |
++++ linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c 2011-04-17 15:57:32.000000000 -0400 |
24316 |
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ |
24317 |
len -= 2; |
24318 |
} |
24319 |
@@ -16575,9 +16473,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.3/arch/x8 |
24320 |
return csum_partial_copy_generic(src, (void __force *)dst, |
24321 |
len, isum, NULL, errp); |
24322 |
} |
24323 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/getuser.S linux-2.6.38.3/arch/x86/lib/getuser.S |
24324 |
---- linux-2.6.38.3/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 -0400 |
24325 |
-+++ linux-2.6.38.3/arch/x86/lib/getuser.S 2011-04-17 15:57:32.000000000 -0400 |
24326 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/getuser.S linux-2.6.38.4/arch/x86/lib/getuser.S |
24327 |
+--- linux-2.6.38.4/arch/x86/lib/getuser.S 2011-03-14 21:20:32.000000000 -0400 |
24328 |
++++ linux-2.6.38.4/arch/x86/lib/getuser.S 2011-04-17 15:57:32.000000000 -0400 |
24329 |
@@ -33,14 +33,35 @@ |
24330 |
#include <asm/asm-offsets.h> |
24331 |
#include <asm/thread_info.h> |
24332 |
@@ -16683,9 +16581,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/getuser.S linux-2.6.38.3/arch/x86/lib/get |
24333 |
4: movq -7(%_ASM_AX),%_ASM_DX |
24334 |
xor %eax,%eax |
24335 |
ret |
24336 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/insn.c linux-2.6.38.3/arch/x86/lib/insn.c |
24337 |
---- linux-2.6.38.3/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -0400 |
24338 |
-+++ linux-2.6.38.3/arch/x86/lib/insn.c 2011-04-17 15:57:32.000000000 -0400 |
24339 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/insn.c linux-2.6.38.4/arch/x86/lib/insn.c |
24340 |
+--- linux-2.6.38.4/arch/x86/lib/insn.c 2011-03-14 21:20:32.000000000 -0400 |
24341 |
++++ linux-2.6.38.4/arch/x86/lib/insn.c 2011-04-17 15:57:32.000000000 -0400 |
24342 |
@@ -21,6 +21,11 @@ |
24343 |
#include <linux/string.h> |
24344 |
#include <asm/inat.h> |
24345 |
@@ -16709,9 +16607,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/insn.c linux-2.6.38.3/arch/x86/lib/insn.c |
24346 |
insn->x86_64 = x86_64 ? 1 : 0; |
24347 |
insn->opnd_bytes = 4; |
24348 |
if (x86_64) |
24349 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/mmx_32.c linux-2.6.38.3/arch/x86/lib/mmx_32.c |
24350 |
---- linux-2.6.38.3/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -0400 |
24351 |
-+++ linux-2.6.38.3/arch/x86/lib/mmx_32.c 2011-04-17 15:57:32.000000000 -0400 |
24352 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/mmx_32.c linux-2.6.38.4/arch/x86/lib/mmx_32.c |
24353 |
+--- linux-2.6.38.4/arch/x86/lib/mmx_32.c 2011-03-14 21:20:32.000000000 -0400 |
24354 |
++++ linux-2.6.38.4/arch/x86/lib/mmx_32.c 2011-04-17 15:57:32.000000000 -0400 |
24355 |
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * |
24356 |
{ |
24357 |
void *p; |
24358 |
@@ -17027,9 +16925,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/mmx_32.c linux-2.6.38.3/arch/x86/lib/mmx_ |
24359 |
|
24360 |
from += 64; |
24361 |
to += 64; |
24362 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/putuser.S linux-2.6.38.3/arch/x86/lib/putuser.S |
24363 |
---- linux-2.6.38.3/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 -0400 |
24364 |
-+++ linux-2.6.38.3/arch/x86/lib/putuser.S 2011-04-17 15:57:32.000000000 -0400 |
24365 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/putuser.S linux-2.6.38.4/arch/x86/lib/putuser.S |
24366 |
+--- linux-2.6.38.4/arch/x86/lib/putuser.S 2011-03-14 21:20:32.000000000 -0400 |
24367 |
++++ linux-2.6.38.4/arch/x86/lib/putuser.S 2011-04-17 15:57:32.000000000 -0400 |
24368 |
@@ -15,7 +15,8 @@ |
24369 |
#include <asm/thread_info.h> |
24370 |
#include <asm/errno.h> |
24371 |
@@ -17167,9 +17065,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/putuser.S linux-2.6.38.3/arch/x86/lib/put |
24372 |
#endif |
24373 |
xor %eax,%eax |
24374 |
EXIT |
24375 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_32.c linux-2.6.38.3/arch/x86/lib/usercopy_32.c |
24376 |
---- linux-2.6.38.3/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000000 -0400 |
24377 |
-+++ linux-2.6.38.3/arch/x86/lib/usercopy_32.c 2011-04-17 15:57:32.000000000 -0400 |
24378 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_32.c linux-2.6.38.4/arch/x86/lib/usercopy_32.c |
24379 |
+--- linux-2.6.38.4/arch/x86/lib/usercopy_32.c 2011-03-14 21:20:32.000000000 -0400 |
24380 |
++++ linux-2.6.38.4/arch/x86/lib/usercopy_32.c 2011-04-23 21:36:15.000000000 -0400 |
24381 |
@@ -43,7 +43,7 @@ do { \ |
24382 |
__asm__ __volatile__( \ |
24383 |
" testl %1,%1\n" \ |
24384 |
@@ -17691,7 +17589,7 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_32.c linux-2.6.38.3/arch/x86/lib |
24385 |
return n; |
24386 |
} |
24387 |
EXPORT_SYMBOL(__copy_from_user_ll_nozero); |
24388 |
-@@ -827,65 +943,49 @@ unsigned long __copy_from_user_ll_nocach |
24389 |
+@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocach |
24390 |
if (n > 64 && cpu_has_xmm2) |
24391 |
n = __copy_user_intel_nocache(to, from, n); |
24392 |
else |
24393 |
@@ -17781,6 +17679,7 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_32.c linux-2.6.38.3/arch/x86/lib |
24394 |
+ return; |
24395 |
} |
24396 |
-EXPORT_SYMBOL(copy_from_user_overflow); |
24397 |
++EXPORT_SYMBOL(__set_fs); |
24398 |
+ |
24399 |
+void set_fs(mm_segment_t x) |
24400 |
+{ |
24401 |
@@ -17789,9 +17688,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_32.c linux-2.6.38.3/arch/x86/lib |
24402 |
+} |
24403 |
+EXPORT_SYMBOL(set_fs); |
24404 |
+#endif |
24405 |
-diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_64.c linux-2.6.38.3/arch/x86/lib/usercopy_64.c |
24406 |
---- linux-2.6.38.3/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400 |
24407 |
-+++ linux-2.6.38.3/arch/x86/lib/usercopy_64.c 2011-04-17 15:57:32.000000000 -0400 |
24408 |
+diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_64.c linux-2.6.38.4/arch/x86/lib/usercopy_64.c |
24409 |
+--- linux-2.6.38.4/arch/x86/lib/usercopy_64.c 2011-03-14 21:20:32.000000000 -0400 |
24410 |
++++ linux-2.6.38.4/arch/x86/lib/usercopy_64.c 2011-04-17 15:57:32.000000000 -0400 |
24411 |
@@ -42,6 +42,8 @@ long |
24412 |
__strncpy_from_user(char *dst, const char __user *src, long count) |
24413 |
{ |
24414 |
@@ -17828,9 +17727,9 @@ diff -urNp linux-2.6.38.3/arch/x86/lib/usercopy_64.c linux-2.6.38.3/arch/x86/lib |
24415 |
} |
24416 |
EXPORT_SYMBOL(copy_in_user); |
24417 |
|
24418 |
-diff -urNp linux-2.6.38.3/arch/x86/Makefile linux-2.6.38.3/arch/x86/Makefile |
24419 |
---- linux-2.6.38.3/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400 |
24420 |
-+++ linux-2.6.38.3/arch/x86/Makefile 2011-04-17 15:57:32.000000000 -0400 |
24421 |
+diff -urNp linux-2.6.38.4/arch/x86/Makefile linux-2.6.38.4/arch/x86/Makefile |
24422 |
+--- linux-2.6.38.4/arch/x86/Makefile 2011-03-14 21:20:32.000000000 -0400 |
24423 |
++++ linux-2.6.38.4/arch/x86/Makefile 2011-04-17 15:57:32.000000000 -0400 |
24424 |
@@ -195,3 +195,12 @@ define archhelp |
24425 |
echo ' FDARGS="..." arguments for the booted kernel' |
24426 |
echo ' FDINITRD=file initrd for the booted kernel' |
24427 |
@@ -17844,9 +17743,9 @@ diff -urNp linux-2.6.38.3/arch/x86/Makefile linux-2.6.38.3/arch/x86/Makefile |
24428 |
+ |
24429 |
+archprepare: |
24430 |
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) |
24431 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/extable.c linux-2.6.38.3/arch/x86/mm/extable.c |
24432 |
---- linux-2.6.38.3/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -0400 |
24433 |
-+++ linux-2.6.38.3/arch/x86/mm/extable.c 2011-04-17 15:57:32.000000000 -0400 |
24434 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/extable.c linux-2.6.38.4/arch/x86/mm/extable.c |
24435 |
+--- linux-2.6.38.4/arch/x86/mm/extable.c 2011-03-14 21:20:32.000000000 -0400 |
24436 |
++++ linux-2.6.38.4/arch/x86/mm/extable.c 2011-04-17 15:57:32.000000000 -0400 |
24437 |
@@ -1,14 +1,71 @@ |
24438 |
#include <linux/module.h> |
24439 |
#include <linux/spinlock.h> |
24440 |
@@ -17920,9 +17819,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/extable.c linux-2.6.38.3/arch/x86/mm/extab |
24441 |
extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; |
24442 |
extern u32 pnp_bios_is_utter_crap; |
24443 |
pnp_bios_is_utter_crap = 1; |
24444 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/fault.c linux-2.6.38.3/arch/x86/mm/fault.c |
24445 |
---- linux-2.6.38.3/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
24446 |
-+++ linux-2.6.38.3/arch/x86/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
24447 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/fault.c linux-2.6.38.4/arch/x86/mm/fault.c |
24448 |
+--- linux-2.6.38.4/arch/x86/mm/fault.c 2011-03-14 21:20:32.000000000 -0400 |
24449 |
++++ linux-2.6.38.4/arch/x86/mm/fault.c 2011-04-17 15:57:32.000000000 -0400 |
24450 |
@@ -12,10 +12,18 @@ |
24451 |
#include <linux/mmiotrace.h> /* kmmio_handler, ... */ |
24452 |
#include <linux/perf_event.h> /* perf_sw_event */ |
24453 |
@@ -18592,9 +18491,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/fault.c linux-2.6.38.3/arch/x86/mm/fault.c |
24454 |
+ |
24455 |
+ return ret ? -EFAULT : 0; |
24456 |
+} |
24457 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/gup.c linux-2.6.38.3/arch/x86/mm/gup.c |
24458 |
---- linux-2.6.38.3/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400 |
24459 |
-+++ linux-2.6.38.3/arch/x86/mm/gup.c 2011-04-17 15:57:32.000000000 -0400 |
24460 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/gup.c linux-2.6.38.4/arch/x86/mm/gup.c |
24461 |
+--- linux-2.6.38.4/arch/x86/mm/gup.c 2011-03-14 21:20:32.000000000 -0400 |
24462 |
++++ linux-2.6.38.4/arch/x86/mm/gup.c 2011-04-17 15:57:32.000000000 -0400 |
24463 |
@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long |
24464 |
addr = start; |
24465 |
len = (unsigned long) nr_pages << PAGE_SHIFT; |
24466 |
@@ -18604,9 +18503,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/gup.c linux-2.6.38.3/arch/x86/mm/gup.c |
24467 |
(void __user *)start, len))) |
24468 |
return 0; |
24469 |
|
24470 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/highmem_32.c linux-2.6.38.3/arch/x86/mm/highmem_32.c |
24471 |
---- linux-2.6.38.3/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.000000000 -0400 |
24472 |
-+++ linux-2.6.38.3/arch/x86/mm/highmem_32.c 2011-04-17 15:57:32.000000000 -0400 |
24473 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/highmem_32.c linux-2.6.38.4/arch/x86/mm/highmem_32.c |
24474 |
+--- linux-2.6.38.4/arch/x86/mm/highmem_32.c 2011-03-14 21:20:32.000000000 -0400 |
24475 |
++++ linux-2.6.38.4/arch/x86/mm/highmem_32.c 2011-04-17 15:57:32.000000000 -0400 |
24476 |
@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page |
24477 |
idx = type + KM_TYPE_NR*smp_processor_id(); |
24478 |
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
24479 |
@@ -18618,9 +18517,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/highmem_32.c linux-2.6.38.3/arch/x86/mm/hi |
24480 |
|
24481 |
return (void *)vaddr; |
24482 |
} |
24483 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/hugetlbpage.c linux-2.6.38.3/arch/x86/mm/hugetlbpage.c |
24484 |
---- linux-2.6.38.3/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 |
24485 |
-+++ linux-2.6.38.3/arch/x86/mm/hugetlbpage.c 2011-04-17 15:57:32.000000000 -0400 |
24486 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/hugetlbpage.c linux-2.6.38.4/arch/x86/mm/hugetlbpage.c |
24487 |
+--- linux-2.6.38.4/arch/x86/mm/hugetlbpage.c 2011-03-14 21:20:32.000000000 -0400 |
24488 |
++++ linux-2.6.38.4/arch/x86/mm/hugetlbpage.c 2011-04-17 15:57:32.000000000 -0400 |
24489 |
@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe |
24490 |
struct hstate *h = hstate_file(file); |
24491 |
struct mm_struct *mm = current->mm; |
24492 |
@@ -18828,9 +18727,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/hugetlbpage.c linux-2.6.38.3/arch/x86/mm/h |
24493 |
return addr; |
24494 |
} |
24495 |
if (mm->get_unmapped_area == arch_get_unmapped_area) |
24496 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/init_32.c linux-2.6.38.3/arch/x86/mm/init_32.c |
24497 |
---- linux-2.6.38.3/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400 |
24498 |
-+++ linux-2.6.38.3/arch/x86/mm/init_32.c 2011-04-17 15:57:32.000000000 -0400 |
24499 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/init_32.c linux-2.6.38.4/arch/x86/mm/init_32.c |
24500 |
+--- linux-2.6.38.4/arch/x86/mm/init_32.c 2011-03-14 21:20:32.000000000 -0400 |
24501 |
++++ linux-2.6.38.4/arch/x86/mm/init_32.c 2011-04-17 15:57:32.000000000 -0400 |
24502 |
@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void) |
24503 |
} |
24504 |
|
24505 |
@@ -19105,9 +19004,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/init_32.c linux-2.6.38.3/arch/x86/mm/init_ |
24506 |
set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); |
24507 |
printk(KERN_INFO "Write protecting the kernel text: %luk\n", |
24508 |
size >> 10); |
24509 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/init_64.c linux-2.6.38.3/arch/x86/mm/init_64.c |
24510 |
---- linux-2.6.38.3/arch/x86/mm/init_64.c 2011-04-18 17:27:18.000000000 -0400 |
24511 |
-+++ linux-2.6.38.3/arch/x86/mm/init_64.c 2011-04-17 16:53:16.000000000 -0400 |
24512 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/init_64.c linux-2.6.38.4/arch/x86/mm/init_64.c |
24513 |
+--- linux-2.6.38.4/arch/x86/mm/init_64.c 2011-04-18 17:27:18.000000000 -0400 |
24514 |
++++ linux-2.6.38.4/arch/x86/mm/init_64.c 2011-04-17 16:53:16.000000000 -0400 |
24515 |
@@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa |
24516 |
* around without checking the pgd every time. |
24517 |
*/ |
24518 |
@@ -19219,9 +19118,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/init_64.c linux-2.6.38.3/arch/x86/mm/init_ |
24519 |
return "[vdso]"; |
24520 |
if (vma == &gate_vma) |
24521 |
return "[vsyscall]"; |
24522 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/init.c linux-2.6.38.3/arch/x86/mm/init.c |
24523 |
---- linux-2.6.38.3/arch/x86/mm/init.c 2011-04-18 17:27:18.000000000 -0400 |
24524 |
-+++ linux-2.6.38.3/arch/x86/mm/init.c 2011-04-17 16:53:16.000000000 -0400 |
24525 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/init.c linux-2.6.38.4/arch/x86/mm/init.c |
24526 |
+--- linux-2.6.38.4/arch/x86/mm/init.c 2011-04-18 17:27:18.000000000 -0400 |
24527 |
++++ linux-2.6.38.4/arch/x86/mm/init.c 2011-04-17 16:53:16.000000000 -0400 |
24528 |
@@ -72,11 +72,7 @@ static void __init find_early_table_spac |
24529 |
* cause a hotspot and fill up ZONE_DMA. The page tables |
24530 |
* need roughly 0.5KB per GB. |
24531 |
@@ -19340,9 +19239,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/init.c linux-2.6.38.3/arch/x86/mm/init.c |
24532 |
free_init_pages("unused kernel memory", |
24533 |
(unsigned long)(&__init_begin), |
24534 |
(unsigned long)(&__init_end)); |
24535 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/iomap_32.c linux-2.6.38.3/arch/x86/mm/iomap_32.c |
24536 |
---- linux-2.6.38.3/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 -0400 |
24537 |
-+++ linux-2.6.38.3/arch/x86/mm/iomap_32.c 2011-04-17 15:57:32.000000000 -0400 |
24538 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/iomap_32.c linux-2.6.38.4/arch/x86/mm/iomap_32.c |
24539 |
+--- linux-2.6.38.4/arch/x86/mm/iomap_32.c 2011-03-14 21:20:32.000000000 -0400 |
24540 |
++++ linux-2.6.38.4/arch/x86/mm/iomap_32.c 2011-04-17 15:57:32.000000000 -0400 |
24541 |
@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long |
24542 |
type = kmap_atomic_idx_push(); |
24543 |
idx = type + KM_TYPE_NR * smp_processor_id(); |
24544 |
@@ -19355,9 +19254,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/iomap_32.c linux-2.6.38.3/arch/x86/mm/ioma |
24545 |
arch_flush_lazy_mmu_mode(); |
24546 |
|
24547 |
return (void *)vaddr; |
24548 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/ioremap.c linux-2.6.38.3/arch/x86/mm/ioremap.c |
24549 |
---- linux-2.6.38.3/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -0400 |
24550 |
-+++ linux-2.6.38.3/arch/x86/mm/ioremap.c 2011-04-17 15:57:32.000000000 -0400 |
24551 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/ioremap.c linux-2.6.38.4/arch/x86/mm/ioremap.c |
24552 |
+--- linux-2.6.38.4/arch/x86/mm/ioremap.c 2011-03-14 21:20:32.000000000 -0400 |
24553 |
++++ linux-2.6.38.4/arch/x86/mm/ioremap.c 2011-04-17 15:57:32.000000000 -0400 |
24554 |
@@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re |
24555 |
for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) { |
24556 |
int is_ram = page_is_ram(pfn); |
24557 |
@@ -19386,9 +19285,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/ioremap.c linux-2.6.38.3/arch/x86/mm/iorem |
24558 |
|
24559 |
/* |
24560 |
* The boot-ioremap range spans multiple pmds, for which |
24561 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c |
24562 |
---- linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32.000000000 -0400 |
24563 |
-+++ linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:57:32.000000000 -0400 |
24564 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c |
24565 |
+--- linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-14 21:20:32.000000000 -0400 |
24566 |
++++ linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:57:32.000000000 -0400 |
24567 |
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg |
24568 |
* memory (e.g. tracked pages)? For now, we need this to avoid |
24569 |
* invoking kmemcheck for PnP BIOS calls. |
24570 |
@@ -19401,9 +19300,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.3/arch/ |
24571 |
return false; |
24572 |
|
24573 |
pte = kmemcheck_pte_lookup(address); |
24574 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/mmap.c linux-2.6.38.3/arch/x86/mm/mmap.c |
24575 |
---- linux-2.6.38.3/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
24576 |
-+++ linux-2.6.38.3/arch/x86/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
24577 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/mmap.c linux-2.6.38.4/arch/x86/mm/mmap.c |
24578 |
+--- linux-2.6.38.4/arch/x86/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
24579 |
++++ linux-2.6.38.4/arch/x86/mm/mmap.c 2011-04-17 15:57:32.000000000 -0400 |
24580 |
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size |
24581 |
* Leave an at least ~128 MB hole with possible stack randomization. |
24582 |
*/ |
24583 |
@@ -19485,9 +19384,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/mmap.c linux-2.6.38.3/arch/x86/mm/mmap.c |
24584 |
mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
24585 |
mm->unmap_area = arch_unmap_area_topdown; |
24586 |
} |
24587 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/numa_32.c linux-2.6.38.3/arch/x86/mm/numa_32.c |
24588 |
---- linux-2.6.38.3/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -0400 |
24589 |
-+++ linux-2.6.38.3/arch/x86/mm/numa_32.c 2011-04-17 15:57:32.000000000 -0400 |
24590 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/numa_32.c linux-2.6.38.4/arch/x86/mm/numa_32.c |
24591 |
+--- linux-2.6.38.4/arch/x86/mm/numa_32.c 2011-03-14 21:20:32.000000000 -0400 |
24592 |
++++ linux-2.6.38.4/arch/x86/mm/numa_32.c 2011-04-17 15:57:32.000000000 -0400 |
24593 |
@@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int |
24594 |
} |
24595 |
#endif |
24596 |
@@ -19496,9 +19395,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/numa_32.c linux-2.6.38.3/arch/x86/mm/numa_ |
24597 |
extern unsigned long highend_pfn, highstart_pfn; |
24598 |
|
24599 |
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) |
24600 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr.c linux-2.6.38.3/arch/x86/mm/pageattr.c |
24601 |
---- linux-2.6.38.3/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 -0400 |
24602 |
-+++ linux-2.6.38.3/arch/x86/mm/pageattr.c 2011-04-17 15:57:32.000000000 -0400 |
24603 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr.c linux-2.6.38.4/arch/x86/mm/pageattr.c |
24604 |
+--- linux-2.6.38.4/arch/x86/mm/pageattr.c 2011-03-14 21:20:32.000000000 -0400 |
24605 |
++++ linux-2.6.38.4/arch/x86/mm/pageattr.c 2011-04-17 15:57:32.000000000 -0400 |
24606 |
@@ -261,7 +261,7 @@ static inline pgprot_t static_protection |
24607 |
*/ |
24608 |
#ifdef CONFIG_PCI_BIOS |
24609 |
@@ -19583,9 +19482,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr.c linux-2.6.38.3/arch/x86/mm/page |
24610 |
} |
24611 |
|
24612 |
static int |
24613 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr-test.c linux-2.6.38.3/arch/x86/mm/pageattr-test.c |
24614 |
---- linux-2.6.38.3/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.000000000 -0400 |
24615 |
-+++ linux-2.6.38.3/arch/x86/mm/pageattr-test.c 2011-04-17 15:57:32.000000000 -0400 |
24616 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr-test.c linux-2.6.38.4/arch/x86/mm/pageattr-test.c |
24617 |
+--- linux-2.6.38.4/arch/x86/mm/pageattr-test.c 2011-03-14 21:20:32.000000000 -0400 |
24618 |
++++ linux-2.6.38.4/arch/x86/mm/pageattr-test.c 2011-04-17 15:57:32.000000000 -0400 |
24619 |
@@ -36,7 +36,7 @@ enum { |
24620 |
|
24621 |
static int pte_testbit(pte_t pte) |
24622 |
@@ -19595,9 +19494,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pageattr-test.c linux-2.6.38.3/arch/x86/mm |
24623 |
} |
24624 |
|
24625 |
struct split_state { |
24626 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/pat.c linux-2.6.38.3/arch/x86/mm/pat.c |
24627 |
---- linux-2.6.38.3/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400 |
24628 |
-+++ linux-2.6.38.3/arch/x86/mm/pat.c 2011-04-17 15:57:32.000000000 -0400 |
24629 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/pat.c linux-2.6.38.4/arch/x86/mm/pat.c |
24630 |
+--- linux-2.6.38.4/arch/x86/mm/pat.c 2011-03-14 21:20:32.000000000 -0400 |
24631 |
++++ linux-2.6.38.4/arch/x86/mm/pat.c 2011-04-17 15:57:32.000000000 -0400 |
24632 |
@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end) |
24633 |
|
24634 |
if (!entry) { |
24635 |
@@ -19645,9 +19544,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pat.c linux-2.6.38.3/arch/x86/mm/pat.c |
24636 |
cattr_name(want_flags), |
24637 |
(unsigned long long)paddr, |
24638 |
(unsigned long long)(paddr + size), |
24639 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable_32.c linux-2.6.38.3/arch/x86/mm/pgtable_32.c |
24640 |
---- linux-2.6.38.3/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.000000000 -0400 |
24641 |
-+++ linux-2.6.38.3/arch/x86/mm/pgtable_32.c 2011-04-17 15:57:32.000000000 -0400 |
24642 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable_32.c linux-2.6.38.4/arch/x86/mm/pgtable_32.c |
24643 |
+--- linux-2.6.38.4/arch/x86/mm/pgtable_32.c 2011-03-14 21:20:32.000000000 -0400 |
24644 |
++++ linux-2.6.38.4/arch/x86/mm/pgtable_32.c 2011-04-17 15:57:32.000000000 -0400 |
24645 |
@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, |
24646 |
return; |
24647 |
} |
24648 |
@@ -19662,9 +19561,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable_32.c linux-2.6.38.3/arch/x86/mm/pg |
24649 |
|
24650 |
/* |
24651 |
* It's enough to flush this one mapping. |
24652 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable.c linux-2.6.38.3/arch/x86/mm/pgtable.c |
24653 |
---- linux-2.6.38.3/arch/x86/mm/pgtable.c 2011-04-18 17:27:13.000000000 -0400 |
24654 |
-+++ linux-2.6.38.3/arch/x86/mm/pgtable.c 2011-04-17 15:57:32.000000000 -0400 |
24655 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtable.c |
24656 |
+--- linux-2.6.38.4/arch/x86/mm/pgtable.c 2011-04-18 17:27:13.000000000 -0400 |
24657 |
++++ linux-2.6.38.4/arch/x86/mm/pgtable.c 2011-04-17 15:57:32.000000000 -0400 |
24658 |
@@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p |
24659 |
list_del(&page->lru); |
24660 |
} |
24661 |
@@ -19916,9 +19815,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/pgtable.c linux-2.6.38.3/arch/x86/mm/pgtab |
24662 |
pgd_dtor(pgd); |
24663 |
paravirt_pgd_free(mm, pgd); |
24664 |
free_page((unsigned long)pgd); |
24665 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/setup_nx.c linux-2.6.38.3/arch/x86/mm/setup_nx.c |
24666 |
---- linux-2.6.38.3/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 -0400 |
24667 |
-+++ linux-2.6.38.3/arch/x86/mm/setup_nx.c 2011-04-17 15:57:32.000000000 -0400 |
24668 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/setup_nx.c linux-2.6.38.4/arch/x86/mm/setup_nx.c |
24669 |
+--- linux-2.6.38.4/arch/x86/mm/setup_nx.c 2011-03-14 21:20:32.000000000 -0400 |
24670 |
++++ linux-2.6.38.4/arch/x86/mm/setup_nx.c 2011-04-17 15:57:32.000000000 -0400 |
24671 |
@@ -5,8 +5,10 @@ |
24672 |
#include <asm/pgtable.h> |
24673 |
#include <asm/proto.h> |
24674 |
@@ -19948,18 +19847,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/setup_nx.c linux-2.6.38.3/arch/x86/mm/setu |
24675 |
__supported_pte_mask &= ~_PAGE_NX; |
24676 |
} |
24677 |
|
24678 |
-diff -urNp linux-2.6.38.3/arch/x86/mm/tlb.c linux-2.6.38.3/arch/x86/mm/tlb.c |
24679 |
---- linux-2.6.38.3/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400 |
24680 |
-+++ linux-2.6.38.3/arch/x86/mm/tlb.c 2011-04-17 15:57:32.000000000 -0400 |
24681 |
-@@ -14,7 +14,7 @@ |
24682 |
- #include <asm/uv/uv.h> |
24683 |
- |
24684 |
- DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) |
24685 |
-- = { &init_mm, 0, }; |
24686 |
-+ = { &init_mm, 0 }; |
24687 |
- |
24688 |
- /* |
24689 |
- * Smarter SMP flushing macros. |
24690 |
+diff -urNp linux-2.6.38.4/arch/x86/mm/tlb.c linux-2.6.38.4/arch/x86/mm/tlb.c |
24691 |
+--- linux-2.6.38.4/arch/x86/mm/tlb.c 2011-03-14 21:20:32.000000000 -0400 |
24692 |
++++ linux-2.6.38.4/arch/x86/mm/tlb.c 2011-04-23 12:47:27.000000000 -0400 |
24693 |
@@ -65,7 +65,11 @@ void leave_mm(int cpu) |
24694 |
BUG(); |
24695 |
cpumask_clear_cpu(cpu, |
24696 |
@@ -19972,9 +19862,9 @@ diff -urNp linux-2.6.38.3/arch/x86/mm/tlb.c linux-2.6.38.3/arch/x86/mm/tlb.c |
24697 |
} |
24698 |
EXPORT_SYMBOL_GPL(leave_mm); |
24699 |
|
24700 |
-diff -urNp linux-2.6.38.3/arch/x86/oprofile/backtrace.c linux-2.6.38.3/arch/x86/oprofile/backtrace.c |
24701 |
---- linux-2.6.38.3/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000000000 -0400 |
24702 |
-+++ linux-2.6.38.3/arch/x86/oprofile/backtrace.c 2011-04-17 15:57:32.000000000 -0400 |
24703 |
+diff -urNp linux-2.6.38.4/arch/x86/oprofile/backtrace.c linux-2.6.38.4/arch/x86/oprofile/backtrace.c |
24704 |
+--- linux-2.6.38.4/arch/x86/oprofile/backtrace.c 2011-03-14 21:20:32.000000000 -0400 |
24705 |
++++ linux-2.6.38.4/arch/x86/oprofile/backtrace.c 2011-04-17 15:57:32.000000000 -0400 |
24706 |
@@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram |
24707 |
struct stack_frame_ia32 *fp; |
24708 |
|
24709 |
@@ -19993,9 +19883,9 @@ diff -urNp linux-2.6.38.3/arch/x86/oprofile/backtrace.c linux-2.6.38.3/arch/x86/ |
24710 |
unsigned long stack = kernel_stack_pointer(regs); |
24711 |
if (depth) |
24712 |
dump_trace(NULL, regs, (unsigned long *)stack, |
24713 |
-diff -urNp linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c |
24714 |
---- linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.000000000 -0400 |
24715 |
-+++ linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:57:32.000000000 -0400 |
24716 |
+diff -urNp linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c |
24717 |
+--- linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c 2011-03-14 21:20:32.000000000 -0400 |
24718 |
++++ linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:57:32.000000000 -0400 |
24719 |
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo |
24720 |
#endif |
24721 |
} |
24722 |
@@ -20005,9 +19895,9 @@ diff -urNp linux-2.6.38.3/arch/x86/oprofile/op_model_p4.c linux-2.6.38.3/arch/x8 |
24723 |
{ |
24724 |
#ifdef CONFIG_SMP |
24725 |
return smp_num_siblings == 2 ? 2 : 1; |
24726 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/ce4100.c linux-2.6.38.3/arch/x86/pci/ce4100.c |
24727 |
---- linux-2.6.38.3/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -0400 |
24728 |
-+++ linux-2.6.38.3/arch/x86/pci/ce4100.c 2011-04-17 15:57:32.000000000 -0400 |
24729 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/ce4100.c linux-2.6.38.4/arch/x86/pci/ce4100.c |
24730 |
+--- linux-2.6.38.4/arch/x86/pci/ce4100.c 2011-03-14 21:20:32.000000000 -0400 |
24731 |
++++ linux-2.6.38.4/arch/x86/pci/ce4100.c 2011-04-17 15:57:32.000000000 -0400 |
24732 |
@@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned in |
24733 |
return pci_direct_conf1.write(seg, bus, devfn, reg, len, value); |
24734 |
} |
24735 |
@@ -20017,9 +19907,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/ce4100.c linux-2.6.38.3/arch/x86/pci/ce41 |
24736 |
.read = ce4100_conf_read, |
24737 |
.write = ce4100_conf_write, |
24738 |
}; |
24739 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/common.c linux-2.6.38.3/arch/x86/pci/common.c |
24740 |
---- linux-2.6.38.3/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -0400 |
24741 |
-+++ linux-2.6.38.3/arch/x86/pci/common.c 2011-04-17 15:57:32.000000000 -0400 |
24742 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/common.c linux-2.6.38.4/arch/x86/pci/common.c |
24743 |
+--- linux-2.6.38.4/arch/x86/pci/common.c 2011-03-14 21:20:32.000000000 -0400 |
24744 |
++++ linux-2.6.38.4/arch/x86/pci/common.c 2011-04-23 12:47:27.000000000 -0400 |
24745 |
@@ -33,8 +33,8 @@ int noioapicreroute = 1; |
24746 |
int pcibios_last_bus = -1; |
24747 |
unsigned long pirq_table_addr; |
24748 |
@@ -20031,18 +19921,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/common.c linux-2.6.38.3/arch/x86/pci/comm |
24749 |
|
24750 |
int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, |
24751 |
int reg, int len, u32 *val) |
24752 |
-@@ -423,7 +423,7 @@ static const struct dmi_system_id __devi |
24753 |
- DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), |
24754 |
- }, |
24755 |
- }, |
24756 |
-- {} |
24757 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} |
24758 |
- }; |
24759 |
- |
24760 |
- void __init dmi_check_pciprobe(void) |
24761 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/direct.c linux-2.6.38.3/arch/x86/pci/direct.c |
24762 |
---- linux-2.6.38.3/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -0400 |
24763 |
-+++ linux-2.6.38.3/arch/x86/pci/direct.c 2011-04-17 15:57:32.000000000 -0400 |
24764 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/direct.c linux-2.6.38.4/arch/x86/pci/direct.c |
24765 |
+--- linux-2.6.38.4/arch/x86/pci/direct.c 2011-03-14 21:20:32.000000000 -0400 |
24766 |
++++ linux-2.6.38.4/arch/x86/pci/direct.c 2011-04-17 15:57:32.000000000 -0400 |
24767 |
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int |
24768 |
|
24769 |
#undef PCI_CONF1_ADDRESS |
24770 |
@@ -20070,51 +19951,21 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/direct.c linux-2.6.38.3/arch/x86/pci/dire |
24771 |
{ |
24772 |
u32 x = 0; |
24773 |
int year, devfn; |
24774 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/fixup.c linux-2.6.38.3/arch/x86/pci/fixup.c |
24775 |
---- linux-2.6.38.3/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0400 |
24776 |
-+++ linux-2.6.38.3/arch/x86/pci/fixup.c 2011-04-17 15:57:32.000000000 -0400 |
24777 |
-@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi |
24778 |
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), |
24779 |
- }, |
24780 |
- }, |
24781 |
-- {} |
24782 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
24783 |
- }; |
24784 |
- |
24785 |
- /* |
24786 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/fixup.c linux-2.6.38.4/arch/x86/pci/fixup.c |
24787 |
+--- linux-2.6.38.4/arch/x86/pci/fixup.c 2011-03-14 21:20:32.000000000 -0400 |
24788 |
++++ linux-2.6.38.4/arch/x86/pci/fixup.c 2011-04-23 12:47:27.000000000 -0400 |
24789 |
@@ -435,7 +435,7 @@ static const struct dmi_system_id __devi |
24790 |
DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), |
24791 |
}, |
24792 |
}, |
24793 |
- { } |
24794 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
24795 |
++ {} |
24796 |
}; |
24797 |
|
24798 |
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) |
24799 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/irq.c linux-2.6.38.3/arch/x86/pci/irq.c |
24800 |
---- linux-2.6.38.3/arch/x86/pci/irq.c 2011-03-14 21:20:32.000000000 -0400 |
24801 |
-+++ linux-2.6.38.3/arch/x86/pci/irq.c 2011-04-17 15:57:32.000000000 -0400 |
24802 |
-@@ -542,7 +542,7 @@ static __init int intel_router_probe(str |
24803 |
- static struct pci_device_id __initdata pirq_440gx[] = { |
24804 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, |
24805 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) }, |
24806 |
-- { }, |
24807 |
-+ { PCI_DEVICE(0, 0) } |
24808 |
- }; |
24809 |
- |
24810 |
- /* 440GX has a proprietary PIRQ router -- don't use it */ |
24811 |
-@@ -1115,7 +1115,7 @@ static struct dmi_system_id __initdata p |
24812 |
- DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), |
24813 |
- }, |
24814 |
- }, |
24815 |
-- { } |
24816 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
24817 |
- }; |
24818 |
- |
24819 |
- void __init pcibios_irq_init(void) |
24820 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_32.c linux-2.6.38.3/arch/x86/pci/mmconfig_32.c |
24821 |
---- linux-2.6.38.3/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000000 -0400 |
24822 |
-+++ linux-2.6.38.3/arch/x86/pci/mmconfig_32.c 2011-04-17 15:57:32.000000000 -0400 |
24823 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_32.c linux-2.6.38.4/arch/x86/pci/mmconfig_32.c |
24824 |
+--- linux-2.6.38.4/arch/x86/pci/mmconfig_32.c 2011-03-14 21:20:32.000000000 -0400 |
24825 |
++++ linux-2.6.38.4/arch/x86/pci/mmconfig_32.c 2011-04-17 15:57:32.000000000 -0400 |
24826 |
@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int |
24827 |
return 0; |
24828 |
} |
24829 |
@@ -20124,9 +19975,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_32.c linux-2.6.38.3/arch/x86/pci |
24830 |
.read = pci_mmcfg_read, |
24831 |
.write = pci_mmcfg_write, |
24832 |
}; |
24833 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_64.c linux-2.6.38.3/arch/x86/pci/mmconfig_64.c |
24834 |
---- linux-2.6.38.3/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000000 -0400 |
24835 |
-+++ linux-2.6.38.3/arch/x86/pci/mmconfig_64.c 2011-04-17 15:57:32.000000000 -0400 |
24836 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_64.c linux-2.6.38.4/arch/x86/pci/mmconfig_64.c |
24837 |
+--- linux-2.6.38.4/arch/x86/pci/mmconfig_64.c 2011-03-14 21:20:32.000000000 -0400 |
24838 |
++++ linux-2.6.38.4/arch/x86/pci/mmconfig_64.c 2011-04-17 15:57:32.000000000 -0400 |
24839 |
@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int |
24840 |
return 0; |
24841 |
} |
24842 |
@@ -20136,9 +19987,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/mmconfig_64.c linux-2.6.38.3/arch/x86/pci |
24843 |
.read = pci_mmcfg_read, |
24844 |
.write = pci_mmcfg_write, |
24845 |
}; |
24846 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/numaq_32.c linux-2.6.38.3/arch/x86/pci/numaq_32.c |
24847 |
---- linux-2.6.38.3/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000 -0400 |
24848 |
-+++ linux-2.6.38.3/arch/x86/pci/numaq_32.c 2011-04-17 15:57:32.000000000 -0400 |
24849 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/numaq_32.c linux-2.6.38.4/arch/x86/pci/numaq_32.c |
24850 |
+--- linux-2.6.38.4/arch/x86/pci/numaq_32.c 2011-03-14 21:20:32.000000000 -0400 |
24851 |
++++ linux-2.6.38.4/arch/x86/pci/numaq_32.c 2011-04-17 15:57:32.000000000 -0400 |
24852 |
@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i |
24853 |
|
24854 |
#undef PCI_CONF1_MQ_ADDRESS |
24855 |
@@ -20148,9 +19999,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/numaq_32.c linux-2.6.38.3/arch/x86/pci/nu |
24856 |
.read = pci_conf1_mq_read, |
24857 |
.write = pci_conf1_mq_write |
24858 |
}; |
24859 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/olpc.c linux-2.6.38.3/arch/x86/pci/olpc.c |
24860 |
---- linux-2.6.38.3/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -0400 |
24861 |
-+++ linux-2.6.38.3/arch/x86/pci/olpc.c 2011-04-17 15:57:32.000000000 -0400 |
24862 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/olpc.c linux-2.6.38.4/arch/x86/pci/olpc.c |
24863 |
+--- linux-2.6.38.4/arch/x86/pci/olpc.c 2011-03-14 21:20:32.000000000 -0400 |
24864 |
++++ linux-2.6.38.4/arch/x86/pci/olpc.c 2011-04-17 15:57:32.000000000 -0400 |
24865 |
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s |
24866 |
return 0; |
24867 |
} |
24868 |
@@ -20160,9 +20011,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/olpc.c linux-2.6.38.3/arch/x86/pci/olpc.c |
24869 |
.read = pci_olpc_read, |
24870 |
.write = pci_olpc_write, |
24871 |
}; |
24872 |
-diff -urNp linux-2.6.38.3/arch/x86/pci/pcbios.c linux-2.6.38.3/arch/x86/pci/pcbios.c |
24873 |
---- linux-2.6.38.3/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -0400 |
24874 |
-+++ linux-2.6.38.3/arch/x86/pci/pcbios.c 2011-04-17 15:57:32.000000000 -0400 |
24875 |
+diff -urNp linux-2.6.38.4/arch/x86/pci/pcbios.c linux-2.6.38.4/arch/x86/pci/pcbios.c |
24876 |
+--- linux-2.6.38.4/arch/x86/pci/pcbios.c 2011-03-14 21:20:32.000000000 -0400 |
24877 |
++++ linux-2.6.38.4/arch/x86/pci/pcbios.c 2011-04-17 15:57:32.000000000 -0400 |
24878 |
@@ -79,50 +79,93 @@ union bios32 { |
24879 |
static struct { |
24880 |
unsigned long address; |
24881 |
@@ -20485,9 +20336,9 @@ diff -urNp linux-2.6.38.3/arch/x86/pci/pcbios.c linux-2.6.38.3/arch/x86/pci/pcbi |
24882 |
return !(ret & 0xff00); |
24883 |
} |
24884 |
EXPORT_SYMBOL(pcibios_set_irq_routing); |
24885 |
-diff -urNp linux-2.6.38.3/arch/x86/platform/efi/efi_32.c linux-2.6.38.3/arch/x86/platform/efi/efi_32.c |
24886 |
---- linux-2.6.38.3/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.000000000 -0400 |
24887 |
-+++ linux-2.6.38.3/arch/x86/platform/efi/efi_32.c 2011-04-17 15:57:32.000000000 -0400 |
24888 |
+diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_32.c linux-2.6.38.4/arch/x86/platform/efi/efi_32.c |
24889 |
+--- linux-2.6.38.4/arch/x86/platform/efi/efi_32.c 2011-03-14 21:20:32.000000000 -0400 |
24890 |
++++ linux-2.6.38.4/arch/x86/platform/efi/efi_32.c 2011-04-17 15:57:32.000000000 -0400 |
24891 |
@@ -38,70 +38,37 @@ |
24892 |
*/ |
24893 |
|
24894 |
@@ -20568,9 +20419,9 @@ diff -urNp linux-2.6.38.3/arch/x86/platform/efi/efi_32.c linux-2.6.38.3/arch/x86 |
24895 |
|
24896 |
/* |
24897 |
* After the lock is released, the original page table is restored. |
24898 |
-diff -urNp linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S |
24899 |
---- linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:32.000000000 -0400 |
24900 |
-+++ linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S 2011-04-17 15:57:32.000000000 -0400 |
24901 |
+diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S |
24902 |
+--- linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S 2011-03-14 21:20:32.000000000 -0400 |
24903 |
++++ linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S 2011-04-17 15:57:32.000000000 -0400 |
24904 |
@@ -6,6 +6,7 @@ |
24905 |
*/ |
24906 |
|
24907 |
@@ -20669,9 +20520,9 @@ diff -urNp linux-2.6.38.3/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.3/arc |
24908 |
saved_return_addr: |
24909 |
.long 0 |
24910 |
efi_rt_function_ptr: |
24911 |
-diff -urNp linux-2.6.38.3/arch/x86/power/cpu.c linux-2.6.38.3/arch/x86/power/cpu.c |
24912 |
---- linux-2.6.38.3/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0400 |
24913 |
-+++ linux-2.6.38.3/arch/x86/power/cpu.c 2011-04-17 15:57:32.000000000 -0400 |
24914 |
+diff -urNp linux-2.6.38.4/arch/x86/power/cpu.c linux-2.6.38.4/arch/x86/power/cpu.c |
24915 |
+--- linux-2.6.38.4/arch/x86/power/cpu.c 2011-03-14 21:20:32.000000000 -0400 |
24916 |
++++ linux-2.6.38.4/arch/x86/power/cpu.c 2011-04-17 15:57:32.000000000 -0400 |
24917 |
@@ -130,7 +130,7 @@ static void do_fpu_end(void) |
24918 |
static void fix_processor_context(void) |
24919 |
{ |
24920 |
@@ -20691,9 +20542,9 @@ diff -urNp linux-2.6.38.3/arch/x86/power/cpu.c linux-2.6.38.3/arch/x86/power/cpu |
24921 |
|
24922 |
syscall_init(); /* This sets MSR_*STAR and related */ |
24923 |
#endif |
24924 |
-diff -urNp linux-2.6.38.3/arch/x86/vdso/Makefile linux-2.6.38.3/arch/x86/vdso/Makefile |
24925 |
---- linux-2.6.38.3/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 -0400 |
24926 |
-+++ linux-2.6.38.3/arch/x86/vdso/Makefile 2011-04-17 15:57:32.000000000 -0400 |
24927 |
+diff -urNp linux-2.6.38.4/arch/x86/vdso/Makefile linux-2.6.38.4/arch/x86/vdso/Makefile |
24928 |
+--- linux-2.6.38.4/arch/x86/vdso/Makefile 2011-03-14 21:20:32.000000000 -0400 |
24929 |
++++ linux-2.6.38.4/arch/x86/vdso/Makefile 2011-04-17 15:57:32.000000000 -0400 |
24930 |
@@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO $@ |
24931 |
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ |
24932 |
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' |
24933 |
@@ -20703,9 +20554,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/Makefile linux-2.6.38.3/arch/x86/vdso/Ma |
24934 |
GCOV_PROFILE := n |
24935 |
|
24936 |
# |
24937 |
-diff -urNp linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c |
24938 |
---- linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.000000000 -0400 |
24939 |
-+++ linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:57:32.000000000 -0400 |
24940 |
+diff -urNp linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c |
24941 |
+--- linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c 2011-03-14 21:20:32.000000000 -0400 |
24942 |
++++ linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:57:32.000000000 -0400 |
24943 |
@@ -22,24 +22,48 @@ |
24944 |
#include <asm/hpet.h> |
24945 |
#include <asm/unistd.h> |
24946 |
@@ -20804,9 +20655,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vclock_gettime.c linux-2.6.38.3/arch/x86 |
24947 |
} |
24948 |
int gettimeofday(struct timeval *, struct timezone *) |
24949 |
__attribute__((weak, alias("__vdso_gettimeofday"))); |
24950 |
-diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c |
24951 |
---- linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.000000000 -0400 |
24952 |
-+++ linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c 2011-04-17 15:57:32.000000000 -0400 |
24953 |
+diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c |
24954 |
+--- linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c 2011-03-14 21:20:32.000000000 -0400 |
24955 |
++++ linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c 2011-04-17 15:57:32.000000000 -0400 |
24956 |
@@ -25,6 +25,7 @@ |
24957 |
#include <asm/tlbflush.h> |
24958 |
#include <asm/vdso.h> |
24959 |
@@ -20889,9 +20740,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso32-setup.c linux-2.6.38.3/arch/x86/v |
24960 |
return &gate_vma; |
24961 |
return NULL; |
24962 |
} |
24963 |
-diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso.lds.S linux-2.6.38.3/arch/x86/vdso/vdso.lds.S |
24964 |
---- linux-2.6.38.3/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.000000000 -0400 |
24965 |
-+++ linux-2.6.38.3/arch/x86/vdso/vdso.lds.S 2011-04-17 15:57:32.000000000 -0400 |
24966 |
+diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso.lds.S linux-2.6.38.4/arch/x86/vdso/vdso.lds.S |
24967 |
+--- linux-2.6.38.4/arch/x86/vdso/vdso.lds.S 2011-03-14 21:20:32.000000000 -0400 |
24968 |
++++ linux-2.6.38.4/arch/x86/vdso/vdso.lds.S 2011-04-17 15:57:32.000000000 -0400 |
24969 |
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; |
24970 |
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; |
24971 |
#include "vextern.h" |
24972 |
@@ -20902,9 +20753,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vdso.lds.S linux-2.6.38.3/arch/x86/vdso/ |
24973 |
+VEXTERN(fallback_time) |
24974 |
+VEXTERN(getcpu) |
24975 |
+#undef VEXTERN |
24976 |
-diff -urNp linux-2.6.38.3/arch/x86/vdso/vextern.h linux-2.6.38.3/arch/x86/vdso/vextern.h |
24977 |
---- linux-2.6.38.3/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000 -0400 |
24978 |
-+++ linux-2.6.38.3/arch/x86/vdso/vextern.h 2011-04-17 15:57:32.000000000 -0400 |
24979 |
+diff -urNp linux-2.6.38.4/arch/x86/vdso/vextern.h linux-2.6.38.4/arch/x86/vdso/vextern.h |
24980 |
+--- linux-2.6.38.4/arch/x86/vdso/vextern.h 2011-03-14 21:20:32.000000000 -0400 |
24981 |
++++ linux-2.6.38.4/arch/x86/vdso/vextern.h 2011-04-17 15:57:32.000000000 -0400 |
24982 |
@@ -11,6 +11,5 @@ |
24983 |
put into vextern.h and be referenced as a pointer with vdso prefix. |
24984 |
The main kernel later fills in the values. */ |
24985 |
@@ -20912,9 +20763,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vextern.h linux-2.6.38.3/arch/x86/vdso/v |
24986 |
-VEXTERN(jiffies) |
24987 |
VEXTERN(vgetcpu_mode) |
24988 |
VEXTERN(vsyscall_gtod_data) |
24989 |
-diff -urNp linux-2.6.38.3/arch/x86/vdso/vma.c linux-2.6.38.3/arch/x86/vdso/vma.c |
24990 |
---- linux-2.6.38.3/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -0400 |
24991 |
-+++ linux-2.6.38.3/arch/x86/vdso/vma.c 2011-04-17 15:57:32.000000000 -0400 |
24992 |
+diff -urNp linux-2.6.38.4/arch/x86/vdso/vma.c linux-2.6.38.4/arch/x86/vdso/vma.c |
24993 |
+--- linux-2.6.38.4/arch/x86/vdso/vma.c 2011-03-14 21:20:32.000000000 -0400 |
24994 |
++++ linux-2.6.38.4/arch/x86/vdso/vma.c 2011-04-17 15:57:32.000000000 -0400 |
24995 |
@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void) |
24996 |
if (!vbase) |
24997 |
goto oom; |
24998 |
@@ -20953,9 +20804,9 @@ diff -urNp linux-2.6.38.3/arch/x86/vdso/vma.c linux-2.6.38.3/arch/x86/vdso/vma.c |
24999 |
- return 0; |
25000 |
-} |
25001 |
-__setup("vdso=", vdso_setup); |
25002 |
-diff -urNp linux-2.6.38.3/arch/x86/xen/enlighten.c linux-2.6.38.3/arch/x86/xen/enlighten.c |
25003 |
---- linux-2.6.38.3/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.000000000 -0400 |
25004 |
-+++ linux-2.6.38.3/arch/x86/xen/enlighten.c 2011-04-17 15:57:32.000000000 -0400 |
25005 |
+diff -urNp linux-2.6.38.4/arch/x86/xen/enlighten.c linux-2.6.38.4/arch/x86/xen/enlighten.c |
25006 |
+--- linux-2.6.38.4/arch/x86/xen/enlighten.c 2011-03-14 21:20:32.000000000 -0400 |
25007 |
++++ linux-2.6.38.4/arch/x86/xen/enlighten.c 2011-04-17 15:57:32.000000000 -0400 |
25008 |
@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); |
25009 |
|
25010 |
struct shared_info xen_dummy_shared_info; |
25011 |
@@ -20998,9 +20849,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/enlighten.c linux-2.6.38.3/arch/x86/xen/e |
25012 |
xen_smp_init(); |
25013 |
|
25014 |
#ifdef CONFIG_ACPI_NUMA |
25015 |
-diff -urNp linux-2.6.38.3/arch/x86/xen/mmu.c linux-2.6.38.3/arch/x86/xen/mmu.c |
25016 |
---- linux-2.6.38.3/arch/x86/xen/mmu.c 2011-04-18 17:27:16.000000000 -0400 |
25017 |
-+++ linux-2.6.38.3/arch/x86/xen/mmu.c 2011-04-17 15:57:32.000000000 -0400 |
25018 |
+diff -urNp linux-2.6.38.4/arch/x86/xen/mmu.c linux-2.6.38.4/arch/x86/xen/mmu.c |
25019 |
+--- linux-2.6.38.4/arch/x86/xen/mmu.c 2011-04-18 17:27:16.000000000 -0400 |
25020 |
++++ linux-2.6.38.4/arch/x86/xen/mmu.c 2011-04-17 15:57:32.000000000 -0400 |
25021 |
@@ -1721,6 +1721,8 @@ __init pgd_t *xen_setup_kernel_pagetable |
25022 |
convert_pfn_mfn(init_level4_pgt); |
25023 |
convert_pfn_mfn(level3_ident_pgt); |
25024 |
@@ -21021,9 +20872,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/mmu.c linux-2.6.38.3/arch/x86/xen/mmu.c |
25025 |
set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); |
25026 |
set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); |
25027 |
|
25028 |
-diff -urNp linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c |
25029 |
---- linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.000000000 -0400 |
25030 |
-+++ linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c 2011-04-17 15:57:32.000000000 -0400 |
25031 |
+diff -urNp linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c |
25032 |
+--- linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c 2011-03-14 21:20:32.000000000 -0400 |
25033 |
++++ linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c 2011-04-17 15:57:32.000000000 -0400 |
25034 |
@@ -10,7 +10,7 @@ |
25035 |
|
25036 |
int xen_swiotlb __read_mostly; |
25037 |
@@ -21033,9 +20884,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.3/arch/x86 |
25038 |
.mapping_error = xen_swiotlb_dma_mapping_error, |
25039 |
.alloc_coherent = xen_swiotlb_alloc_coherent, |
25040 |
.free_coherent = xen_swiotlb_free_coherent, |
25041 |
-diff -urNp linux-2.6.38.3/arch/x86/xen/smp.c linux-2.6.38.3/arch/x86/xen/smp.c |
25042 |
---- linux-2.6.38.3/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -0400 |
25043 |
-+++ linux-2.6.38.3/arch/x86/xen/smp.c 2011-04-17 15:57:32.000000000 -0400 |
25044 |
+diff -urNp linux-2.6.38.4/arch/x86/xen/smp.c linux-2.6.38.4/arch/x86/xen/smp.c |
25045 |
+--- linux-2.6.38.4/arch/x86/xen/smp.c 2011-03-14 21:20:32.000000000 -0400 |
25046 |
++++ linux-2.6.38.4/arch/x86/xen/smp.c 2011-04-17 15:57:32.000000000 -0400 |
25047 |
@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_ |
25048 |
{ |
25049 |
BUG_ON(smp_processor_id() != 0); |
25050 |
@@ -21080,9 +20931,33 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/smp.c linux-2.6.38.3/arch/x86/xen/smp.c |
25051 |
#endif |
25052 |
xen_setup_runstate_info(cpu); |
25053 |
xen_setup_timer(cpu); |
25054 |
-diff -urNp linux-2.6.38.3/arch/x86/xen/xen-head.S linux-2.6.38.3/arch/x86/xen/xen-head.S |
25055 |
---- linux-2.6.38.3/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000 -0400 |
25056 |
-+++ linux-2.6.38.3/arch/x86/xen/xen-head.S 2011-04-17 15:57:32.000000000 -0400 |
25057 |
+diff -urNp linux-2.6.38.4/arch/x86/xen/xen-asm_32.S linux-2.6.38.4/arch/x86/xen/xen-asm_32.S |
25058 |
+--- linux-2.6.38.4/arch/x86/xen/xen-asm_32.S 2011-03-14 21:20:32.000000000 -0400 |
25059 |
++++ linux-2.6.38.4/arch/x86/xen/xen-asm_32.S 2011-04-22 19:11:04.000000000 -0400 |
25060 |
+@@ -83,14 +83,14 @@ ENTRY(xen_iret) |
25061 |
+ ESP_OFFSET=4 # bytes pushed onto stack |
25062 |
+ |
25063 |
+ /* |
25064 |
+- * Store vcpu_info pointer for easy access. Do it this way to |
25065 |
+- * avoid having to reload %fs |
25066 |
++ * Store vcpu_info pointer for easy access. |
25067 |
+ */ |
25068 |
+ #ifdef CONFIG_SMP |
25069 |
+- GET_THREAD_INFO(%eax) |
25070 |
+- movl TI_cpu(%eax), %eax |
25071 |
+- movl __per_cpu_offset(,%eax,4), %eax |
25072 |
+- mov xen_vcpu(%eax), %eax |
25073 |
++ push %fs |
25074 |
++ mov $(__KERNEL_PERCPU), %eax |
25075 |
++ mov %eax, %fs |
25076 |
++ mov PER_CPU_VAR(xen_vcpu), %eax |
25077 |
++ pop %fs |
25078 |
+ #else |
25079 |
+ movl xen_vcpu, %eax |
25080 |
+ #endif |
25081 |
+diff -urNp linux-2.6.38.4/arch/x86/xen/xen-head.S linux-2.6.38.4/arch/x86/xen/xen-head.S |
25082 |
+--- linux-2.6.38.4/arch/x86/xen/xen-head.S 2011-03-14 21:20:32.000000000 -0400 |
25083 |
++++ linux-2.6.38.4/arch/x86/xen/xen-head.S 2011-04-17 15:57:32.000000000 -0400 |
25084 |
@@ -19,6 +19,17 @@ ENTRY(startup_xen) |
25085 |
#ifdef CONFIG_X86_32 |
25086 |
mov %esi,xen_start_info |
25087 |
@@ -21101,9 +20976,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/xen-head.S linux-2.6.38.3/arch/x86/xen/xe |
25088 |
#else |
25089 |
mov %rsi,xen_start_info |
25090 |
mov $init_thread_union+THREAD_SIZE,%rsp |
25091 |
-diff -urNp linux-2.6.38.3/arch/x86/xen/xen-ops.h linux-2.6.38.3/arch/x86/xen/xen-ops.h |
25092 |
---- linux-2.6.38.3/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 -0400 |
25093 |
-+++ linux-2.6.38.3/arch/x86/xen/xen-ops.h 2011-04-17 15:57:32.000000000 -0400 |
25094 |
+diff -urNp linux-2.6.38.4/arch/x86/xen/xen-ops.h linux-2.6.38.4/arch/x86/xen/xen-ops.h |
25095 |
+--- linux-2.6.38.4/arch/x86/xen/xen-ops.h 2011-03-14 21:20:32.000000000 -0400 |
25096 |
++++ linux-2.6.38.4/arch/x86/xen/xen-ops.h 2011-04-17 15:57:32.000000000 -0400 |
25097 |
@@ -10,8 +10,6 @@ |
25098 |
extern const char xen_hypervisor_callback[]; |
25099 |
extern const char xen_failsafe_callback[]; |
25100 |
@@ -21113,9 +20988,9 @@ diff -urNp linux-2.6.38.3/arch/x86/xen/xen-ops.h linux-2.6.38.3/arch/x86/xen/xen |
25101 |
struct trap_info; |
25102 |
void xen_copy_trap_info(struct trap_info *traps); |
25103 |
|
25104 |
-diff -urNp linux-2.6.38.3/block/blk-iopoll.c linux-2.6.38.3/block/blk-iopoll.c |
25105 |
---- linux-2.6.38.3/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -0400 |
25106 |
-+++ linux-2.6.38.3/block/blk-iopoll.c 2011-04-17 15:57:32.000000000 -0400 |
25107 |
+diff -urNp linux-2.6.38.4/block/blk-iopoll.c linux-2.6.38.4/block/blk-iopoll.c |
25108 |
+--- linux-2.6.38.4/block/blk-iopoll.c 2011-03-14 21:20:32.000000000 -0400 |
25109 |
++++ linux-2.6.38.4/block/blk-iopoll.c 2011-04-17 15:57:32.000000000 -0400 |
25110 |
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo |
25111 |
} |
25112 |
EXPORT_SYMBOL(blk_iopoll_complete); |
25113 |
@@ -21125,9 +21000,9 @@ diff -urNp linux-2.6.38.3/block/blk-iopoll.c linux-2.6.38.3/block/blk-iopoll.c |
25114 |
{ |
25115 |
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); |
25116 |
int rearm = 0, budget = blk_iopoll_budget; |
25117 |
-diff -urNp linux-2.6.38.3/block/blk-map.c linux-2.6.38.3/block/blk-map.c |
25118 |
---- linux-2.6.38.3/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400 |
25119 |
-+++ linux-2.6.38.3/block/blk-map.c 2011-04-17 15:57:32.000000000 -0400 |
25120 |
+diff -urNp linux-2.6.38.4/block/blk-map.c linux-2.6.38.4/block/blk-map.c |
25121 |
+--- linux-2.6.38.4/block/blk-map.c 2011-03-14 21:20:32.000000000 -0400 |
25122 |
++++ linux-2.6.38.4/block/blk-map.c 2011-04-17 15:57:32.000000000 -0400 |
25123 |
@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue |
25124 |
if (!len || !kbuf) |
25125 |
return -EINVAL; |
25126 |
@@ -21137,9 +21012,9 @@ diff -urNp linux-2.6.38.3/block/blk-map.c linux-2.6.38.3/block/blk-map.c |
25127 |
if (do_copy) |
25128 |
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); |
25129 |
else |
25130 |
-diff -urNp linux-2.6.38.3/block/blk-softirq.c linux-2.6.38.3/block/blk-softirq.c |
25131 |
---- linux-2.6.38.3/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -0400 |
25132 |
-+++ linux-2.6.38.3/block/blk-softirq.c 2011-04-17 15:57:32.000000000 -0400 |
25133 |
+diff -urNp linux-2.6.38.4/block/blk-softirq.c linux-2.6.38.4/block/blk-softirq.c |
25134 |
+--- linux-2.6.38.4/block/blk-softirq.c 2011-03-14 21:20:32.000000000 -0400 |
25135 |
++++ linux-2.6.38.4/block/blk-softirq.c 2011-04-17 15:57:32.000000000 -0400 |
25136 |
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, |
25137 |
* Softirq action handler - move entries to local list and loop over them |
25138 |
* while passing them to the queue registered handler. |
25139 |
@@ -21149,9 +21024,9 @@ diff -urNp linux-2.6.38.3/block/blk-softirq.c linux-2.6.38.3/block/blk-softirq.c |
25140 |
{ |
25141 |
struct list_head *cpu_list, local_list; |
25142 |
|
25143 |
-diff -urNp linux-2.6.38.3/block/bsg.c linux-2.6.38.3/block/bsg.c |
25144 |
---- linux-2.6.38.3/block/bsg.c 2011-03-14 21:20:32.000000000 -0400 |
25145 |
-+++ linux-2.6.38.3/block/bsg.c 2011-04-17 15:57:32.000000000 -0400 |
25146 |
+diff -urNp linux-2.6.38.4/block/bsg.c linux-2.6.38.4/block/bsg.c |
25147 |
+--- linux-2.6.38.4/block/bsg.c 2011-03-14 21:20:32.000000000 -0400 |
25148 |
++++ linux-2.6.38.4/block/bsg.c 2011-04-17 15:57:32.000000000 -0400 |
25149 |
@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r |
25150 |
struct sg_io_v4 *hdr, struct bsg_device *bd, |
25151 |
fmode_t has_write_perm) |
25152 |
@@ -21179,9 +21054,9 @@ diff -urNp linux-2.6.38.3/block/bsg.c linux-2.6.38.3/block/bsg.c |
25153 |
if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { |
25154 |
if (blk_verify_command(rq->cmd, has_write_perm)) |
25155 |
return -EPERM; |
25156 |
-diff -urNp linux-2.6.38.3/block/scsi_ioctl.c linux-2.6.38.3/block/scsi_ioctl.c |
25157 |
---- linux-2.6.38.3/block/scsi_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
25158 |
-+++ linux-2.6.38.3/block/scsi_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
25159 |
+diff -urNp linux-2.6.38.4/block/scsi_ioctl.c linux-2.6.38.4/block/scsi_ioctl.c |
25160 |
+--- linux-2.6.38.4/block/scsi_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
25161 |
++++ linux-2.6.38.4/block/scsi_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
25162 |
@@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command); |
25163 |
static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, |
25164 |
struct sg_io_hdr *hdr, fmode_t mode) |
25165 |
@@ -21233,21 +21108,9 @@ diff -urNp linux-2.6.38.3/block/scsi_ioctl.c linux-2.6.38.3/block/scsi_ioctl.c |
25166 |
if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) |
25167 |
goto error; |
25168 |
|
25169 |
-diff -urNp linux-2.6.38.3/crypto/lrw.c linux-2.6.38.3/crypto/lrw.c |
25170 |
---- linux-2.6.38.3/crypto/lrw.c 2011-03-14 21:20:32.000000000 -0400 |
25171 |
-+++ linux-2.6.38.3/crypto/lrw.c 2011-04-17 15:57:32.000000000 -0400 |
25172 |
-@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par |
25173 |
- struct priv *ctx = crypto_tfm_ctx(parent); |
25174 |
- struct crypto_cipher *child = ctx->child; |
25175 |
- int err, i; |
25176 |
-- be128 tmp = { 0 }; |
25177 |
-+ be128 tmp = { 0, 0 }; |
25178 |
- int bsize = crypto_cipher_blocksize(child); |
25179 |
- |
25180 |
- crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); |
25181 |
-diff -urNp linux-2.6.38.3/Documentation/dontdiff linux-2.6.38.3/Documentation/dontdiff |
25182 |
---- linux-2.6.38.3/Documentation/dontdiff 2011-03-14 21:20:32.000000000 -0400 |
25183 |
-+++ linux-2.6.38.3/Documentation/dontdiff 2011-04-17 15:57:32.000000000 -0400 |
25184 |
+diff -urNp linux-2.6.38.4/Documentation/dontdiff linux-2.6.38.4/Documentation/dontdiff |
25185 |
+--- linux-2.6.38.4/Documentation/dontdiff 2011-03-14 21:20:32.000000000 -0400 |
25186 |
++++ linux-2.6.38.4/Documentation/dontdiff 2011-04-17 15:57:32.000000000 -0400 |
25187 |
@@ -3,6 +3,7 @@ |
25188 |
*.bin |
25189 |
*.cpio |
25190 |
@@ -21373,9 +21236,9 @@ diff -urNp linux-2.6.38.3/Documentation/dontdiff linux-2.6.38.3/Documentation/do |
25191 |
wakeup.bin |
25192 |
wakeup.elf |
25193 |
wakeup.lds |
25194 |
-diff -urNp linux-2.6.38.3/Documentation/filesystems/sysfs.txt linux-2.6.38.3/Documentation/filesystems/sysfs.txt |
25195 |
---- linux-2.6.38.3/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:32.000000000 -0400 |
25196 |
-+++ linux-2.6.38.3/Documentation/filesystems/sysfs.txt 2011-04-17 15:57:32.000000000 -0400 |
25197 |
+diff -urNp linux-2.6.38.4/Documentation/filesystems/sysfs.txt linux-2.6.38.4/Documentation/filesystems/sysfs.txt |
25198 |
+--- linux-2.6.38.4/Documentation/filesystems/sysfs.txt 2011-03-14 21:20:32.000000000 -0400 |
25199 |
++++ linux-2.6.38.4/Documentation/filesystems/sysfs.txt 2011-04-17 15:57:32.000000000 -0400 |
25200 |
@@ -123,8 +123,8 @@ set of sysfs operations for forwarding r |
25201 |
show and store methods of the attribute owners. |
25202 |
|
25203 |
@@ -21387,9 +21250,9 @@ diff -urNp linux-2.6.38.3/Documentation/filesystems/sysfs.txt linux-2.6.38.3/Doc |
25204 |
}; |
25205 |
|
25206 |
[ Subsystems should have already defined a struct kobj_type as a |
25207 |
-diff -urNp linux-2.6.38.3/Documentation/kernel-parameters.txt linux-2.6.38.3/Documentation/kernel-parameters.txt |
25208 |
---- linux-2.6.38.3/Documentation/kernel-parameters.txt 2011-03-14 21:20:32.000000000 -0400 |
25209 |
-+++ linux-2.6.38.3/Documentation/kernel-parameters.txt 2011-04-17 15:57:32.000000000 -0400 |
25210 |
+diff -urNp linux-2.6.38.4/Documentation/kernel-parameters.txt linux-2.6.38.4/Documentation/kernel-parameters.txt |
25211 |
+--- linux-2.6.38.4/Documentation/kernel-parameters.txt 2011-03-14 21:20:32.000000000 -0400 |
25212 |
++++ linux-2.6.38.4/Documentation/kernel-parameters.txt 2011-04-17 15:57:32.000000000 -0400 |
25213 |
@@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes |
25214 |
the specified number of seconds. This is to be used if |
25215 |
your oopses keep scrolling off the screen. |
25216 |
@@ -21404,9 +21267,9 @@ diff -urNp linux-2.6.38.3/Documentation/kernel-parameters.txt linux-2.6.38.3/Doc |
25217 |
pcbit= [HW,ISDN] |
25218 |
|
25219 |
pcd. [PARIDE] |
25220 |
-diff -urNp linux-2.6.38.3/drivers/acpi/battery.c linux-2.6.38.3/drivers/acpi/battery.c |
25221 |
---- linux-2.6.38.3/drivers/acpi/battery.c 2011-03-14 21:20:32.000000000 -0400 |
25222 |
-+++ linux-2.6.38.3/drivers/acpi/battery.c 2011-04-17 15:57:32.000000000 -0400 |
25223 |
+diff -urNp linux-2.6.38.4/drivers/acpi/battery.c linux-2.6.38.4/drivers/acpi/battery.c |
25224 |
+--- linux-2.6.38.4/drivers/acpi/battery.c 2011-03-14 21:20:32.000000000 -0400 |
25225 |
++++ linux-2.6.38.4/drivers/acpi/battery.c 2011-04-17 15:57:32.000000000 -0400 |
25226 |
@@ -862,7 +862,7 @@ DECLARE_FILE_FUNCTIONS(alarm); |
25227 |
} |
25228 |
|
25229 |
@@ -21416,21 +21279,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/battery.c linux-2.6.38.3/drivers/acpi/bat |
25230 |
mode_t mode; |
25231 |
const char *name; |
25232 |
} acpi_battery_file[] = { |
25233 |
-diff -urNp linux-2.6.38.3/drivers/acpi/blacklist.c linux-2.6.38.3/drivers/acpi/blacklist.c |
25234 |
---- linux-2.6.38.3/drivers/acpi/blacklist.c 2011-03-14 21:20:32.000000000 -0400 |
25235 |
-+++ linux-2.6.38.3/drivers/acpi/blacklist.c 2011-04-17 15:57:32.000000000 -0400 |
25236 |
-@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b |
25237 |
- {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, |
25238 |
- "Incorrect _ADR", 1}, |
25239 |
- |
25240 |
-- {""} |
25241 |
-+ {"", "", 0, NULL, all_versions, NULL, 0} |
25242 |
- }; |
25243 |
- |
25244 |
- #if CONFIG_ACPI_BLACKLIST_YEAR |
25245 |
-diff -urNp linux-2.6.38.3/drivers/acpi/dock.c linux-2.6.38.3/drivers/acpi/dock.c |
25246 |
---- linux-2.6.38.3/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -0400 |
25247 |
-+++ linux-2.6.38.3/drivers/acpi/dock.c 2011-04-17 15:57:32.000000000 -0400 |
25248 |
+diff -urNp linux-2.6.38.4/drivers/acpi/dock.c linux-2.6.38.4/drivers/acpi/dock.c |
25249 |
+--- linux-2.6.38.4/drivers/acpi/dock.c 2011-03-14 21:20:32.000000000 -0400 |
25250 |
++++ linux-2.6.38.4/drivers/acpi/dock.c 2011-04-17 15:57:32.000000000 -0400 |
25251 |
@@ -77,7 +77,7 @@ struct dock_dependent_device { |
25252 |
struct list_head list; |
25253 |
struct list_head hotplug_list; |
25254 |
@@ -21449,9 +21300,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/dock.c linux-2.6.38.3/drivers/acpi/dock.c |
25255 |
void *context) |
25256 |
{ |
25257 |
struct dock_dependent_device *dd; |
25258 |
-diff -urNp linux-2.6.38.3/drivers/acpi/ec_sys.c linux-2.6.38.3/drivers/acpi/ec_sys.c |
25259 |
---- linux-2.6.38.3/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -0400 |
25260 |
-+++ linux-2.6.38.3/drivers/acpi/ec_sys.c 2011-04-17 15:57:32.000000000 -0400 |
25261 |
+diff -urNp linux-2.6.38.4/drivers/acpi/ec_sys.c linux-2.6.38.4/drivers/acpi/ec_sys.c |
25262 |
+--- linux-2.6.38.4/drivers/acpi/ec_sys.c 2011-03-14 21:20:32.000000000 -0400 |
25263 |
++++ linux-2.6.38.4/drivers/acpi/ec_sys.c 2011-04-17 15:57:32.000000000 -0400 |
25264 |
@@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f |
25265 |
return count; |
25266 |
} |
25267 |
@@ -21461,9 +21312,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/ec_sys.c linux-2.6.38.3/drivers/acpi/ec_s |
25268 |
.owner = THIS_MODULE, |
25269 |
.open = acpi_ec_open_io, |
25270 |
.read = acpi_ec_read_io, |
25271 |
-diff -urNp linux-2.6.38.3/drivers/acpi/power_meter.c linux-2.6.38.3/drivers/acpi/power_meter.c |
25272 |
---- linux-2.6.38.3/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000000 -0400 |
25273 |
-+++ linux-2.6.38.3/drivers/acpi/power_meter.c 2011-04-17 15:57:32.000000000 -0400 |
25274 |
+diff -urNp linux-2.6.38.4/drivers/acpi/power_meter.c linux-2.6.38.4/drivers/acpi/power_meter.c |
25275 |
+--- linux-2.6.38.4/drivers/acpi/power_meter.c 2011-03-14 21:20:32.000000000 -0400 |
25276 |
++++ linux-2.6.38.4/drivers/acpi/power_meter.c 2011-04-17 15:57:32.000000000 -0400 |
25277 |
@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d |
25278 |
return res; |
25279 |
|
25280 |
@@ -21473,9 +21324,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/power_meter.c linux-2.6.38.3/drivers/acpi |
25281 |
|
25282 |
mutex_lock(&resource->lock); |
25283 |
resource->trip[attr->index - 7] = temp; |
25284 |
-diff -urNp linux-2.6.38.3/drivers/acpi/proc.c linux-2.6.38.3/drivers/acpi/proc.c |
25285 |
---- linux-2.6.38.3/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -0400 |
25286 |
-+++ linux-2.6.38.3/drivers/acpi/proc.c 2011-04-17 15:57:32.000000000 -0400 |
25287 |
+diff -urNp linux-2.6.38.4/drivers/acpi/proc.c linux-2.6.38.4/drivers/acpi/proc.c |
25288 |
+--- linux-2.6.38.4/drivers/acpi/proc.c 2011-03-14 21:20:32.000000000 -0400 |
25289 |
++++ linux-2.6.38.4/drivers/acpi/proc.c 2011-04-17 15:57:32.000000000 -0400 |
25290 |
@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f |
25291 |
size_t count, loff_t * ppos) |
25292 |
{ |
25293 |
@@ -21510,9 +21361,9 @@ diff -urNp linux-2.6.38.3/drivers/acpi/proc.c linux-2.6.38.3/drivers/acpi/proc.c |
25294 |
if (device_can_wakeup(&dev->dev)) { |
25295 |
bool enable = !device_may_wakeup(&dev->dev); |
25296 |
device_set_wakeup_enable(&dev->dev, enable); |
25297 |
-diff -urNp linux-2.6.38.3/drivers/acpi/processor_driver.c linux-2.6.38.3/drivers/acpi/processor_driver.c |
25298 |
---- linux-2.6.38.3/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.000000000 -0400 |
25299 |
-+++ linux-2.6.38.3/drivers/acpi/processor_driver.c 2011-04-17 15:57:32.000000000 -0400 |
25300 |
+diff -urNp linux-2.6.38.4/drivers/acpi/processor_driver.c linux-2.6.38.4/drivers/acpi/processor_driver.c |
25301 |
+--- linux-2.6.38.4/drivers/acpi/processor_driver.c 2011-03-14 21:20:32.000000000 -0400 |
25302 |
++++ linux-2.6.38.4/drivers/acpi/processor_driver.c 2011-04-17 15:57:32.000000000 -0400 |
25303 |
@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add( |
25304 |
return 0; |
25305 |
#endif |
25306 |
@@ -21522,21 +21373,21 @@ diff -urNp linux-2.6.38.3/drivers/acpi/processor_driver.c linux-2.6.38.3/drivers |
25307 |
|
25308 |
/* |
25309 |
* Buggy BIOS check |
25310 |
-diff -urNp linux-2.6.38.3/drivers/acpi/processor_idle.c linux-2.6.38.3/drivers/acpi/processor_idle.c |
25311 |
---- linux-2.6.38.3/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000000000 -0400 |
25312 |
-+++ linux-2.6.38.3/drivers/acpi/processor_idle.c 2011-04-17 15:57:32.000000000 -0400 |
25313 |
+diff -urNp linux-2.6.38.4/drivers/acpi/processor_idle.c linux-2.6.38.4/drivers/acpi/processor_idle.c |
25314 |
+--- linux-2.6.38.4/drivers/acpi/processor_idle.c 2011-03-14 21:20:32.000000000 -0400 |
25315 |
++++ linux-2.6.38.4/drivers/acpi/processor_idle.c 2011-04-23 12:47:27.000000000 -0400 |
25316 |
@@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdat |
25317 |
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), |
25318 |
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, |
25319 |
(void *)1}, |
25320 |
- {}, |
25321 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}, |
25322 |
++ {} |
25323 |
}; |
25324 |
|
25325 |
|
25326 |
-diff -urNp linux-2.6.38.3/drivers/ata/acard-ahci.c linux-2.6.38.3/drivers/ata/acard-ahci.c |
25327 |
---- linux-2.6.38.3/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.000000000 -0400 |
25328 |
-+++ linux-2.6.38.3/drivers/ata/acard-ahci.c 2011-04-17 15:57:32.000000000 -0400 |
25329 |
+diff -urNp linux-2.6.38.4/drivers/ata/acard-ahci.c linux-2.6.38.4/drivers/ata/acard-ahci.c |
25330 |
+--- linux-2.6.38.4/drivers/ata/acard-ahci.c 2011-03-14 21:20:32.000000000 -0400 |
25331 |
++++ linux-2.6.38.4/drivers/ata/acard-ahci.c 2011-04-17 15:57:32.000000000 -0400 |
25332 |
@@ -87,7 +87,7 @@ static struct scsi_host_template acard_a |
25333 |
AHCI_SHT("acard-ahci"), |
25334 |
}; |
25335 |
@@ -21546,9 +21397,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/acard-ahci.c linux-2.6.38.3/drivers/ata/ac |
25336 |
.inherits = &ahci_ops, |
25337 |
.qc_prep = acard_ahci_qc_prep, |
25338 |
.qc_fill_rtf = acard_ahci_qc_fill_rtf, |
25339 |
-diff -urNp linux-2.6.38.3/drivers/ata/ahci.c linux-2.6.38.3/drivers/ata/ahci.c |
25340 |
---- linux-2.6.38.3/drivers/ata/ahci.c 2011-04-18 17:27:13.000000000 -0400 |
25341 |
-+++ linux-2.6.38.3/drivers/ata/ahci.c 2011-04-17 15:57:32.000000000 -0400 |
25342 |
+diff -urNp linux-2.6.38.4/drivers/ata/ahci.c linux-2.6.38.4/drivers/ata/ahci.c |
25343 |
+--- linux-2.6.38.4/drivers/ata/ahci.c 2011-04-18 17:27:13.000000000 -0400 |
25344 |
++++ linux-2.6.38.4/drivers/ata/ahci.c 2011-04-23 12:47:27.000000000 -0400 |
25345 |
@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh |
25346 |
AHCI_SHT("ahci"), |
25347 |
}; |
25348 |
@@ -21570,18 +21421,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ahci.c linux-2.6.38.3/drivers/ata/ahci.c |
25349 |
.inherits = &ahci_ops, |
25350 |
.softreset = ahci_sb600_softreset, |
25351 |
.pmp_softreset = ahci_sb600_softreset, |
25352 |
-@@ -394,7 +394,7 @@ static const struct pci_device_id ahci_p |
25353 |
- { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
25354 |
- PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, |
25355 |
- |
25356 |
-- { } /* terminate list */ |
25357 |
-+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ |
25358 |
- }; |
25359 |
- |
25360 |
- |
25361 |
-diff -urNp linux-2.6.38.3/drivers/ata/ahci.h linux-2.6.38.3/drivers/ata/ahci.h |
25362 |
---- linux-2.6.38.3/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -0400 |
25363 |
-+++ linux-2.6.38.3/drivers/ata/ahci.h 2011-04-17 15:57:32.000000000 -0400 |
25364 |
+diff -urNp linux-2.6.38.4/drivers/ata/ahci.h linux-2.6.38.4/drivers/ata/ahci.h |
25365 |
+--- linux-2.6.38.4/drivers/ata/ahci.h 2011-03-14 21:20:32.000000000 -0400 |
25366 |
++++ linux-2.6.38.4/drivers/ata/ahci.h 2011-04-17 15:57:32.000000000 -0400 |
25367 |
@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde |
25368 |
.shost_attrs = ahci_shost_attrs, \ |
25369 |
.sdev_attrs = ahci_sdev_attrs |
25370 |
@@ -21591,9 +21433,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ahci.h linux-2.6.38.3/drivers/ata/ahci.h |
25371 |
|
25372 |
void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, |
25373 |
u32 opts); |
25374 |
-diff -urNp linux-2.6.38.3/drivers/ata/ata_generic.c linux-2.6.38.3/drivers/ata/ata_generic.c |
25375 |
---- linux-2.6.38.3/drivers/ata/ata_generic.c 2011-03-14 21:20:32.000000000 -0400 |
25376 |
-+++ linux-2.6.38.3/drivers/ata/ata_generic.c 2011-04-17 15:57:32.000000000 -0400 |
25377 |
+diff -urNp linux-2.6.38.4/drivers/ata/ata_generic.c linux-2.6.38.4/drivers/ata/ata_generic.c |
25378 |
+--- linux-2.6.38.4/drivers/ata/ata_generic.c 2011-03-14 21:20:32.000000000 -0400 |
25379 |
++++ linux-2.6.38.4/drivers/ata/ata_generic.c 2011-04-17 15:57:32.000000000 -0400 |
25380 |
@@ -101,7 +101,7 @@ static struct scsi_host_template generic |
25381 |
ATA_BMDMA_SHT(DRV_NAME), |
25382 |
}; |
25383 |
@@ -21603,18 +21445,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ata_generic.c linux-2.6.38.3/drivers/ata/a |
25384 |
.inherits = &ata_bmdma_port_ops, |
25385 |
.cable_detect = ata_cable_unknown, |
25386 |
.set_mode = generic_set_mode, |
25387 |
-diff -urNp linux-2.6.38.3/drivers/ata/ata_piix.c linux-2.6.38.3/drivers/ata/ata_piix.c |
25388 |
---- linux-2.6.38.3/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 -0400 |
25389 |
-+++ linux-2.6.38.3/drivers/ata/ata_piix.c 2011-04-17 15:57:32.000000000 -0400 |
25390 |
-@@ -309,7 +309,7 @@ static const struct pci_device_id piix_p |
25391 |
- { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, |
25392 |
- /* SATA Controller IDE (PBG) */ |
25393 |
- { 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, |
25394 |
-- { } /* terminate list */ |
25395 |
-+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ |
25396 |
- }; |
25397 |
- |
25398 |
- static struct pci_driver piix_pci_driver = { |
25399 |
+diff -urNp linux-2.6.38.4/drivers/ata/ata_piix.c linux-2.6.38.4/drivers/ata/ata_piix.c |
25400 |
+--- linux-2.6.38.4/drivers/ata/ata_piix.c 2011-03-14 21:20:32.000000000 -0400 |
25401 |
++++ linux-2.6.38.4/drivers/ata/ata_piix.c 2011-04-23 12:47:28.000000000 -0400 |
25402 |
@@ -327,12 +327,12 @@ static struct scsi_host_template piix_sh |
25403 |
ATA_BMDMA_SHT(DRV_NAME), |
25404 |
}; |
25405 |
@@ -21654,27 +21487,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/ata_piix.c linux-2.6.38.3/drivers/ata/ata_ |
25406 |
.inherits = &piix_sata_ops, |
25407 |
.hardreset = sata_std_hardreset, |
25408 |
.scr_read = piix_sidpr_scr_read, |
25409 |
-@@ -638,7 +638,7 @@ static const struct ich_laptop ich_lapto |
25410 |
- { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ |
25411 |
- { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ |
25412 |
- /* end marker */ |
25413 |
-- { 0, } |
25414 |
-+ { 0, 0, 0 } |
25415 |
- }; |
25416 |
- |
25417 |
- /** |
25418 |
-@@ -1130,7 +1130,7 @@ static int piix_broken_suspend(void) |
25419 |
- }, |
25420 |
- }, |
25421 |
- |
25422 |
-- { } /* terminate list */ |
25423 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } /* terminate list */ |
25424 |
- }; |
25425 |
- static const char *oemstrs[] = { |
25426 |
- "Tecra M3,", |
25427 |
-diff -urNp linux-2.6.38.3/drivers/ata/libahci.c linux-2.6.38.3/drivers/ata/libahci.c |
25428 |
---- linux-2.6.38.3/drivers/ata/libahci.c 2011-03-14 21:20:32.000000000 -0400 |
25429 |
-+++ linux-2.6.38.3/drivers/ata/libahci.c 2011-04-17 15:57:32.000000000 -0400 |
25430 |
+diff -urNp linux-2.6.38.4/drivers/ata/libahci.c linux-2.6.38.4/drivers/ata/libahci.c |
25431 |
+--- linux-2.6.38.4/drivers/ata/libahci.c 2011-03-14 21:20:32.000000000 -0400 |
25432 |
++++ linux-2.6.38.4/drivers/ata/libahci.c 2011-04-17 15:57:32.000000000 -0400 |
25433 |
@@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs |
25434 |
}; |
25435 |
EXPORT_SYMBOL_GPL(ahci_sdev_attrs); |
25436 |
@@ -21684,9 +21499,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libahci.c linux-2.6.38.3/drivers/ata/libah |
25437 |
.inherits = &sata_pmp_port_ops, |
25438 |
|
25439 |
.qc_defer = ahci_pmp_qc_defer, |
25440 |
-diff -urNp linux-2.6.38.3/drivers/ata/libata-acpi.c linux-2.6.38.3/drivers/ata/libata-acpi.c |
25441 |
---- linux-2.6.38.3/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.000000000 -0400 |
25442 |
-+++ linux-2.6.38.3/drivers/ata/libata-acpi.c 2011-04-17 15:57:32.000000000 -0400 |
25443 |
+diff -urNp linux-2.6.38.4/drivers/ata/libata-acpi.c linux-2.6.38.4/drivers/ata/libata-acpi.c |
25444 |
+--- linux-2.6.38.4/drivers/ata/libata-acpi.c 2011-03-14 21:20:32.000000000 -0400 |
25445 |
++++ linux-2.6.38.4/drivers/ata/libata-acpi.c 2011-04-17 15:57:32.000000000 -0400 |
25446 |
@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han |
25447 |
ata_acpi_uevent(dev->link->ap, dev, event); |
25448 |
} |
25449 |
@@ -21702,36 +21517,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-acpi.c linux-2.6.38.3/drivers/ata/l |
25450 |
.handler = ata_acpi_ap_notify_dock, |
25451 |
.uevent = ata_acpi_ap_uevent, |
25452 |
}; |
25453 |
-diff -urNp linux-2.6.38.3/drivers/ata/libata-core.c linux-2.6.38.3/drivers/ata/libata-core.c |
25454 |
---- linux-2.6.38.3/drivers/ata/libata-core.c 2011-03-14 21:20:32.000000000 -0400 |
25455 |
-+++ linux-2.6.38.3/drivers/ata/libata-core.c 2011-04-17 15:57:32.000000000 -0400 |
25456 |
-@@ -897,7 +897,7 @@ static const struct ata_xfer_ent { |
25457 |
- { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, |
25458 |
- { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, |
25459 |
- { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 }, |
25460 |
-- { -1, }, |
25461 |
-+ { -1, 0, 0 } |
25462 |
- }; |
25463 |
- |
25464 |
- /** |
25465 |
-@@ -2885,7 +2885,7 @@ static const struct ata_timing ata_timin |
25466 |
- { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, |
25467 |
- { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, |
25468 |
- |
25469 |
-- { 0xFF } |
25470 |
-+ { 0xFF, 0, 0, 0, 0, 0, 0, 0, 0 } |
25471 |
- }; |
25472 |
- |
25473 |
- #define ENOUGH(v, unit) (((v)-1)/(unit)+1) |
25474 |
-@@ -4141,7 +4141,7 @@ static const struct ata_blacklist_entry |
25475 |
- { "PIONEER DVD-RW DVR-212D", "1.28", ATA_HORKAGE_NOSETXFER }, |
25476 |
- |
25477 |
- /* End Marker */ |
25478 |
-- { } |
25479 |
-+ { NULL, NULL, 0 } |
25480 |
- }; |
25481 |
- |
25482 |
- /** |
25483 |
+diff -urNp linux-2.6.38.4/drivers/ata/libata-core.c linux-2.6.38.4/drivers/ata/libata-core.c |
25484 |
+--- linux-2.6.38.4/drivers/ata/libata-core.c 2011-03-14 21:20:32.000000000 -0400 |
25485 |
++++ linux-2.6.38.4/drivers/ata/libata-core.c 2011-04-23 12:47:28.000000000 -0400 |
25486 |
@@ -4746,7 +4746,7 @@ void ata_qc_free(struct ata_queued_cmd * |
25487 |
struct ata_port *ap; |
25488 |
unsigned int tag; |
25489 |
@@ -21796,9 +21584,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-core.c linux-2.6.38.3/drivers/ata/l |
25490 |
.qc_prep = ata_noop_qc_prep, |
25491 |
.qc_issue = ata_dummy_qc_issue, |
25492 |
.error_handler = ata_dummy_error_handler, |
25493 |
-diff -urNp linux-2.6.38.3/drivers/ata/libata-eh.c linux-2.6.38.3/drivers/ata/libata-eh.c |
25494 |
---- linux-2.6.38.3/drivers/ata/libata-eh.c 2011-04-18 17:27:13.000000000 -0400 |
25495 |
-+++ linux-2.6.38.3/drivers/ata/libata-eh.c 2011-04-17 15:57:32.000000000 -0400 |
25496 |
+diff -urNp linux-2.6.38.4/drivers/ata/libata-eh.c linux-2.6.38.4/drivers/ata/libata-eh.c |
25497 |
+--- linux-2.6.38.4/drivers/ata/libata-eh.c 2011-04-18 17:27:13.000000000 -0400 |
25498 |
++++ linux-2.6.38.4/drivers/ata/libata-eh.c 2011-04-17 15:57:32.000000000 -0400 |
25499 |
@@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_ |
25500 |
*/ |
25501 |
void ata_std_error_handler(struct ata_port *ap) |
25502 |
@@ -21808,9 +21596,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-eh.c linux-2.6.38.3/drivers/ata/lib |
25503 |
ata_reset_fn_t hardreset = ops->hardreset; |
25504 |
|
25505 |
/* ignore built-in hardreset if SCR access is not available */ |
25506 |
-diff -urNp linux-2.6.38.3/drivers/ata/libata-pmp.c linux-2.6.38.3/drivers/ata/libata-pmp.c |
25507 |
---- linux-2.6.38.3/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.000000000 -0400 |
25508 |
-+++ linux-2.6.38.3/drivers/ata/libata-pmp.c 2011-04-17 15:57:32.000000000 -0400 |
25509 |
+diff -urNp linux-2.6.38.4/drivers/ata/libata-pmp.c linux-2.6.38.4/drivers/ata/libata-pmp.c |
25510 |
+--- linux-2.6.38.4/drivers/ata/libata-pmp.c 2011-03-14 21:20:32.000000000 -0400 |
25511 |
++++ linux-2.6.38.4/drivers/ata/libata-pmp.c 2011-04-17 15:57:32.000000000 -0400 |
25512 |
@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str |
25513 |
*/ |
25514 |
static int sata_pmp_eh_recover(struct ata_port *ap) |
25515 |
@@ -21820,9 +21608,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/libata-pmp.c linux-2.6.38.3/drivers/ata/li |
25516 |
int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; |
25517 |
struct ata_link *pmp_link = &ap->link; |
25518 |
struct ata_device *pmp_dev = pmp_link->device; |
25519 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_acpi.c linux-2.6.38.3/drivers/ata/pata_acpi.c |
25520 |
---- linux-2.6.38.3/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000 -0400 |
25521 |
-+++ linux-2.6.38.3/drivers/ata/pata_acpi.c 2011-04-17 15:57:32.000000000 -0400 |
25522 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_acpi.c linux-2.6.38.4/drivers/ata/pata_acpi.c |
25523 |
+--- linux-2.6.38.4/drivers/ata/pata_acpi.c 2011-03-14 21:20:32.000000000 -0400 |
25524 |
++++ linux-2.6.38.4/drivers/ata/pata_acpi.c 2011-04-17 15:57:32.000000000 -0400 |
25525 |
@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s |
25526 |
ATA_BMDMA_SHT(DRV_NAME), |
25527 |
}; |
25528 |
@@ -21832,9 +21620,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_acpi.c linux-2.6.38.3/drivers/ata/pat |
25529 |
.inherits = &ata_bmdma_port_ops, |
25530 |
.qc_issue = pacpi_qc_issue, |
25531 |
.cable_detect = pacpi_cable_detect, |
25532 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_ali.c linux-2.6.38.3/drivers/ata/pata_ali.c |
25533 |
---- linux-2.6.38.3/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 -0400 |
25534 |
-+++ linux-2.6.38.3/drivers/ata/pata_ali.c 2011-04-17 15:57:32.000000000 -0400 |
25535 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_ali.c linux-2.6.38.4/drivers/ata/pata_ali.c |
25536 |
+--- linux-2.6.38.4/drivers/ata/pata_ali.c 2011-03-14 21:20:32.000000000 -0400 |
25537 |
++++ linux-2.6.38.4/drivers/ata/pata_ali.c 2011-04-17 15:57:32.000000000 -0400 |
25538 |
@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht |
25539 |
* Port operations for PIO only ALi |
25540 |
*/ |
25541 |
@@ -21880,9 +21668,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ali.c linux-2.6.38.3/drivers/ata/pata |
25542 |
.inherits = &ali_dma_base_ops, |
25543 |
.check_atapi_dma = ali_check_atapi_dma, |
25544 |
.dev_config = ali_warn_atapi_dma, |
25545 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_amd.c linux-2.6.38.3/drivers/ata/pata_amd.c |
25546 |
---- linux-2.6.38.3/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 -0400 |
25547 |
-+++ linux-2.6.38.3/drivers/ata/pata_amd.c 2011-04-17 15:57:32.000000000 -0400 |
25548 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_amd.c linux-2.6.38.4/drivers/ata/pata_amd.c |
25549 |
+--- linux-2.6.38.4/drivers/ata/pata_amd.c 2011-03-14 21:20:32.000000000 -0400 |
25550 |
++++ linux-2.6.38.4/drivers/ata/pata_amd.c 2011-04-17 15:57:32.000000000 -0400 |
25551 |
@@ -397,28 +397,28 @@ static const struct ata_port_operations |
25552 |
.prereset = amd_pre_reset, |
25553 |
}; |
25554 |
@@ -21932,9 +21720,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_amd.c linux-2.6.38.3/drivers/ata/pata |
25555 |
.inherits = &nv_base_port_ops, |
25556 |
.set_piomode = nv133_set_piomode, |
25557 |
.set_dmamode = nv133_set_dmamode, |
25558 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_artop.c linux-2.6.38.3/drivers/ata/pata_artop.c |
25559 |
---- linux-2.6.38.3/drivers/ata/pata_artop.c 2011-03-14 21:20:32.000000000 -0400 |
25560 |
-+++ linux-2.6.38.3/drivers/ata/pata_artop.c 2011-04-17 15:57:32.000000000 -0400 |
25561 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_artop.c linux-2.6.38.4/drivers/ata/pata_artop.c |
25562 |
+--- linux-2.6.38.4/drivers/ata/pata_artop.c 2011-03-14 21:20:32.000000000 -0400 |
25563 |
++++ linux-2.6.38.4/drivers/ata/pata_artop.c 2011-04-17 15:57:32.000000000 -0400 |
25564 |
@@ -312,7 +312,7 @@ static struct scsi_host_template artop_s |
25565 |
ATA_BMDMA_SHT(DRV_NAME), |
25566 |
}; |
25567 |
@@ -21953,9 +21741,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_artop.c linux-2.6.38.3/drivers/ata/pa |
25568 |
.inherits = &ata_bmdma_port_ops, |
25569 |
.cable_detect = artop6260_cable_detect, |
25570 |
.set_piomode = artop6260_set_piomode, |
25571 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_at32.c linux-2.6.38.3/drivers/ata/pata_at32.c |
25572 |
---- linux-2.6.38.3/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000 -0400 |
25573 |
-+++ linux-2.6.38.3/drivers/ata/pata_at32.c 2011-04-17 15:57:32.000000000 -0400 |
25574 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_at32.c linux-2.6.38.4/drivers/ata/pata_at32.c |
25575 |
+--- linux-2.6.38.4/drivers/ata/pata_at32.c 2011-03-14 21:20:32.000000000 -0400 |
25576 |
++++ linux-2.6.38.4/drivers/ata/pata_at32.c 2011-04-17 15:57:32.000000000 -0400 |
25577 |
@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh |
25578 |
ATA_PIO_SHT(DRV_NAME), |
25579 |
}; |
25580 |
@@ -21965,9 +21753,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_at32.c linux-2.6.38.3/drivers/ata/pat |
25581 |
.inherits = &ata_sff_port_ops, |
25582 |
.cable_detect = ata_cable_40wire, |
25583 |
.set_piomode = pata_at32_set_piomode, |
25584 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_at91.c linux-2.6.38.3/drivers/ata/pata_at91.c |
25585 |
---- linux-2.6.38.3/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000 -0400 |
25586 |
-+++ linux-2.6.38.3/drivers/ata/pata_at91.c 2011-04-17 15:57:32.000000000 -0400 |
25587 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_at91.c linux-2.6.38.4/drivers/ata/pata_at91.c |
25588 |
+--- linux-2.6.38.4/drivers/ata/pata_at91.c 2011-03-14 21:20:32.000000000 -0400 |
25589 |
++++ linux-2.6.38.4/drivers/ata/pata_at91.c 2011-04-17 15:57:32.000000000 -0400 |
25590 |
@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at |
25591 |
ATA_PIO_SHT(DRV_NAME), |
25592 |
}; |
25593 |
@@ -21977,9 +21765,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_at91.c linux-2.6.38.3/drivers/ata/pat |
25594 |
.inherits = &ata_sff_port_ops, |
25595 |
|
25596 |
.sff_data_xfer = pata_at91_data_xfer_noirq, |
25597 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_atiixp.c linux-2.6.38.3/drivers/ata/pata_atiixp.c |
25598 |
---- linux-2.6.38.3/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.000000000 -0400 |
25599 |
-+++ linux-2.6.38.3/drivers/ata/pata_atiixp.c 2011-04-17 15:57:32.000000000 -0400 |
25600 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_atiixp.c linux-2.6.38.4/drivers/ata/pata_atiixp.c |
25601 |
+--- linux-2.6.38.4/drivers/ata/pata_atiixp.c 2011-03-14 21:20:32.000000000 -0400 |
25602 |
++++ linux-2.6.38.4/drivers/ata/pata_atiixp.c 2011-04-17 15:57:32.000000000 -0400 |
25603 |
@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_ |
25604 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
25605 |
}; |
25606 |
@@ -21989,9 +21777,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_atiixp.c linux-2.6.38.3/drivers/ata/p |
25607 |
.inherits = &ata_bmdma_port_ops, |
25608 |
|
25609 |
.qc_prep = ata_bmdma_dumb_qc_prep, |
25610 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_atp867x.c linux-2.6.38.3/drivers/ata/pata_atp867x.c |
25611 |
---- linux-2.6.38.3/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000000 -0400 |
25612 |
-+++ linux-2.6.38.3/drivers/ata/pata_atp867x.c 2011-04-17 15:57:32.000000000 -0400 |
25613 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_atp867x.c linux-2.6.38.4/drivers/ata/pata_atp867x.c |
25614 |
+--- linux-2.6.38.4/drivers/ata/pata_atp867x.c 2011-03-14 21:20:32.000000000 -0400 |
25615 |
++++ linux-2.6.38.4/drivers/ata/pata_atp867x.c 2011-04-17 15:57:32.000000000 -0400 |
25616 |
@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x |
25617 |
ATA_BMDMA_SHT(DRV_NAME), |
25618 |
}; |
25619 |
@@ -22001,9 +21789,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_atp867x.c linux-2.6.38.3/drivers/ata/ |
25620 |
.inherits = &ata_bmdma_port_ops, |
25621 |
.cable_detect = atp867x_cable_detect, |
25622 |
.set_piomode = atp867x_set_piomode, |
25623 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_bf54x.c linux-2.6.38.3/drivers/ata/pata_bf54x.c |
25624 |
---- linux-2.6.38.3/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.000000000 -0400 |
25625 |
-+++ linux-2.6.38.3/drivers/ata/pata_bf54x.c 2011-04-17 15:57:32.000000000 -0400 |
25626 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_bf54x.c linux-2.6.38.4/drivers/ata/pata_bf54x.c |
25627 |
+--- linux-2.6.38.4/drivers/ata/pata_bf54x.c 2011-03-14 21:20:32.000000000 -0400 |
25628 |
++++ linux-2.6.38.4/drivers/ata/pata_bf54x.c 2011-04-17 15:57:32.000000000 -0400 |
25629 |
@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh |
25630 |
.dma_boundary = ATA_DMA_BOUNDARY, |
25631 |
}; |
25632 |
@@ -22013,9 +21801,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_bf54x.c linux-2.6.38.3/drivers/ata/pa |
25633 |
.inherits = &ata_bmdma_port_ops, |
25634 |
|
25635 |
.set_piomode = bfin_set_piomode, |
25636 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd640.c linux-2.6.38.3/drivers/ata/pata_cmd640.c |
25637 |
---- linux-2.6.38.3/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.000000000 -0400 |
25638 |
-+++ linux-2.6.38.3/drivers/ata/pata_cmd640.c 2011-04-17 15:57:32.000000000 -0400 |
25639 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd640.c linux-2.6.38.4/drivers/ata/pata_cmd640.c |
25640 |
+--- linux-2.6.38.4/drivers/ata/pata_cmd640.c 2011-03-14 21:20:32.000000000 -0400 |
25641 |
++++ linux-2.6.38.4/drivers/ata/pata_cmd640.c 2011-04-17 15:57:32.000000000 -0400 |
25642 |
@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_ |
25643 |
ATA_PIO_SHT(DRV_NAME), |
25644 |
}; |
25645 |
@@ -22025,9 +21813,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd640.c linux-2.6.38.3/drivers/ata/p |
25646 |
.inherits = &ata_sff_port_ops, |
25647 |
/* In theory xfer_noirq is not needed once we kill the prefetcher */ |
25648 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
25649 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd64x.c linux-2.6.38.3/drivers/ata/pata_cmd64x.c |
25650 |
---- linux-2.6.38.3/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.000000000 -0400 |
25651 |
-+++ linux-2.6.38.3/drivers/ata/pata_cmd64x.c 2011-04-17 15:57:32.000000000 -0400 |
25652 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd64x.c linux-2.6.38.4/drivers/ata/pata_cmd64x.c |
25653 |
+--- linux-2.6.38.4/drivers/ata/pata_cmd64x.c 2011-03-14 21:20:32.000000000 -0400 |
25654 |
++++ linux-2.6.38.4/drivers/ata/pata_cmd64x.c 2011-04-17 15:57:32.000000000 -0400 |
25655 |
@@ -268,18 +268,18 @@ static const struct ata_port_operations |
25656 |
.set_dmamode = cmd64x_set_dmamode, |
25657 |
}; |
25658 |
@@ -22050,9 +21838,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cmd64x.c linux-2.6.38.3/drivers/ata/p |
25659 |
.inherits = &cmd64x_base_ops, |
25660 |
.bmdma_stop = cmd648_bmdma_stop, |
25661 |
.cable_detect = cmd648_cable_detect, |
25662 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5520.c linux-2.6.38.3/drivers/ata/pata_cs5520.c |
25663 |
---- linux-2.6.38.3/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.000000000 -0400 |
25664 |
-+++ linux-2.6.38.3/drivers/ata/pata_cs5520.c 2011-04-17 15:57:32.000000000 -0400 |
25665 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5520.c linux-2.6.38.4/drivers/ata/pata_cs5520.c |
25666 |
+--- linux-2.6.38.4/drivers/ata/pata_cs5520.c 2011-03-14 21:20:32.000000000 -0400 |
25667 |
++++ linux-2.6.38.4/drivers/ata/pata_cs5520.c 2011-04-17 15:57:32.000000000 -0400 |
25668 |
@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_ |
25669 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
25670 |
}; |
25671 |
@@ -22062,9 +21850,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5520.c linux-2.6.38.3/drivers/ata/p |
25672 |
.inherits = &ata_bmdma_port_ops, |
25673 |
.qc_prep = ata_bmdma_dumb_qc_prep, |
25674 |
.cable_detect = ata_cable_40wire, |
25675 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5530.c linux-2.6.38.3/drivers/ata/pata_cs5530.c |
25676 |
---- linux-2.6.38.3/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.000000000 -0400 |
25677 |
-+++ linux-2.6.38.3/drivers/ata/pata_cs5530.c 2011-04-17 15:57:32.000000000 -0400 |
25678 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5530.c linux-2.6.38.4/drivers/ata/pata_cs5530.c |
25679 |
+--- linux-2.6.38.4/drivers/ata/pata_cs5530.c 2011-03-14 21:20:32.000000000 -0400 |
25680 |
++++ linux-2.6.38.4/drivers/ata/pata_cs5530.c 2011-04-17 15:57:32.000000000 -0400 |
25681 |
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ |
25682 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
25683 |
}; |
25684 |
@@ -22074,9 +21862,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5530.c linux-2.6.38.3/drivers/ata/p |
25685 |
.inherits = &ata_bmdma_port_ops, |
25686 |
|
25687 |
.qc_prep = ata_bmdma_dumb_qc_prep, |
25688 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5535.c linux-2.6.38.3/drivers/ata/pata_cs5535.c |
25689 |
---- linux-2.6.38.3/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.000000000 -0400 |
25690 |
-+++ linux-2.6.38.3/drivers/ata/pata_cs5535.c 2011-04-17 15:57:32.000000000 -0400 |
25691 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5535.c linux-2.6.38.4/drivers/ata/pata_cs5535.c |
25692 |
+--- linux-2.6.38.4/drivers/ata/pata_cs5535.c 2011-03-14 21:20:32.000000000 -0400 |
25693 |
++++ linux-2.6.38.4/drivers/ata/pata_cs5535.c 2011-04-17 15:57:32.000000000 -0400 |
25694 |
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ |
25695 |
ATA_BMDMA_SHT(DRV_NAME), |
25696 |
}; |
25697 |
@@ -22086,9 +21874,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5535.c linux-2.6.38.3/drivers/ata/p |
25698 |
.inherits = &ata_bmdma_port_ops, |
25699 |
.cable_detect = cs5535_cable_detect, |
25700 |
.set_piomode = cs5535_set_piomode, |
25701 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5536.c linux-2.6.38.3/drivers/ata/pata_cs5536.c |
25702 |
---- linux-2.6.38.3/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.000000000 -0400 |
25703 |
-+++ linux-2.6.38.3/drivers/ata/pata_cs5536.c 2011-04-17 15:57:32.000000000 -0400 |
25704 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5536.c linux-2.6.38.4/drivers/ata/pata_cs5536.c |
25705 |
+--- linux-2.6.38.4/drivers/ata/pata_cs5536.c 2011-03-14 21:20:32.000000000 -0400 |
25706 |
++++ linux-2.6.38.4/drivers/ata/pata_cs5536.c 2011-04-17 15:57:32.000000000 -0400 |
25707 |
@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_ |
25708 |
ATA_BMDMA_SHT(DRV_NAME), |
25709 |
}; |
25710 |
@@ -22098,9 +21886,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cs5536.c linux-2.6.38.3/drivers/ata/p |
25711 |
.inherits = &ata_bmdma32_port_ops, |
25712 |
.cable_detect = cs5536_cable_detect, |
25713 |
.set_piomode = cs5536_set_piomode, |
25714 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_cypress.c linux-2.6.38.3/drivers/ata/pata_cypress.c |
25715 |
---- linux-2.6.38.3/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000000 -0400 |
25716 |
-+++ linux-2.6.38.3/drivers/ata/pata_cypress.c 2011-04-17 15:57:32.000000000 -0400 |
25717 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_cypress.c linux-2.6.38.4/drivers/ata/pata_cypress.c |
25718 |
+--- linux-2.6.38.4/drivers/ata/pata_cypress.c 2011-03-14 21:20:32.000000000 -0400 |
25719 |
++++ linux-2.6.38.4/drivers/ata/pata_cypress.c 2011-04-17 15:57:32.000000000 -0400 |
25720 |
@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69 |
25721 |
ATA_BMDMA_SHT(DRV_NAME), |
25722 |
}; |
25723 |
@@ -22110,9 +21898,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_cypress.c linux-2.6.38.3/drivers/ata/ |
25724 |
.inherits = &ata_bmdma_port_ops, |
25725 |
.cable_detect = ata_cable_40wire, |
25726 |
.set_piomode = cy82c693_set_piomode, |
25727 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_efar.c linux-2.6.38.3/drivers/ata/pata_efar.c |
25728 |
---- linux-2.6.38.3/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000 -0400 |
25729 |
-+++ linux-2.6.38.3/drivers/ata/pata_efar.c 2011-04-17 15:57:32.000000000 -0400 |
25730 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_efar.c linux-2.6.38.4/drivers/ata/pata_efar.c |
25731 |
+--- linux-2.6.38.4/drivers/ata/pata_efar.c 2011-03-14 21:20:32.000000000 -0400 |
25732 |
++++ linux-2.6.38.4/drivers/ata/pata_efar.c 2011-04-17 15:57:32.000000000 -0400 |
25733 |
@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh |
25734 |
ATA_BMDMA_SHT(DRV_NAME), |
25735 |
}; |
25736 |
@@ -22122,9 +21910,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_efar.c linux-2.6.38.3/drivers/ata/pat |
25737 |
.inherits = &ata_bmdma_port_ops, |
25738 |
.cable_detect = efar_cable_detect, |
25739 |
.set_piomode = efar_set_piomode, |
25740 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt366.c linux-2.6.38.3/drivers/ata/pata_hpt366.c |
25741 |
---- linux-2.6.38.3/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.000000000 -0400 |
25742 |
-+++ linux-2.6.38.3/drivers/ata/pata_hpt366.c 2011-04-17 15:57:32.000000000 -0400 |
25743 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt366.c linux-2.6.38.4/drivers/ata/pata_hpt366.c |
25744 |
+--- linux-2.6.38.4/drivers/ata/pata_hpt366.c 2011-03-14 21:20:32.000000000 -0400 |
25745 |
++++ linux-2.6.38.4/drivers/ata/pata_hpt366.c 2011-04-17 15:57:32.000000000 -0400 |
25746 |
@@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_ |
25747 |
* Configuration for HPT366/68 |
25748 |
*/ |
25749 |
@@ -22134,9 +21922,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt366.c linux-2.6.38.3/drivers/ata/p |
25750 |
.inherits = &ata_bmdma_port_ops, |
25751 |
.cable_detect = hpt36x_cable_detect, |
25752 |
.mode_filter = hpt366_filter, |
25753 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt37x.c linux-2.6.38.3/drivers/ata/pata_hpt37x.c |
25754 |
---- linux-2.6.38.3/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.000000000 -0400 |
25755 |
-+++ linux-2.6.38.3/drivers/ata/pata_hpt37x.c 2011-04-17 15:57:32.000000000 -0400 |
25756 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt37x.c linux-2.6.38.4/drivers/ata/pata_hpt37x.c |
25757 |
+--- linux-2.6.38.4/drivers/ata/pata_hpt37x.c 2011-03-14 21:20:32.000000000 -0400 |
25758 |
++++ linux-2.6.38.4/drivers/ata/pata_hpt37x.c 2011-04-17 15:57:32.000000000 -0400 |
25759 |
@@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_ |
25760 |
* Configuration for HPT370 |
25761 |
*/ |
25762 |
@@ -22182,9 +21970,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt37x.c linux-2.6.38.3/drivers/ata/p |
25763 |
.inherits = &hpt372_port_ops, |
25764 |
.cable_detect = hpt374_fn1_cable_detect, |
25765 |
}; |
25766 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c |
25767 |
---- linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000000 -0400 |
25768 |
-+++ linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:57:32.000000000 -0400 |
25769 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c |
25770 |
+--- linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c 2011-03-14 21:20:32.000000000 -0400 |
25771 |
++++ linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c 2011-04-17 15:57:32.000000000 -0400 |
25772 |
@@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n |
25773 |
* Configuration for HPT302N/371N. |
25774 |
*/ |
25775 |
@@ -22203,9 +21991,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x2n.c linux-2.6.38.3/drivers/ata/ |
25776 |
.inherits = &hpt3xxn_port_ops, |
25777 |
.mode_filter = &hpt372n_filter, |
25778 |
}; |
25779 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x3.c linux-2.6.38.3/drivers/ata/pata_hpt3x3.c |
25780 |
---- linux-2.6.38.3/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.000000000 -0400 |
25781 |
-+++ linux-2.6.38.3/drivers/ata/pata_hpt3x3.c 2011-04-17 15:57:32.000000000 -0400 |
25782 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x3.c linux-2.6.38.4/drivers/ata/pata_hpt3x3.c |
25783 |
+--- linux-2.6.38.4/drivers/ata/pata_hpt3x3.c 2011-03-14 21:20:32.000000000 -0400 |
25784 |
++++ linux-2.6.38.4/drivers/ata/pata_hpt3x3.c 2011-04-17 15:57:32.000000000 -0400 |
25785 |
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ |
25786 |
ATA_BMDMA_SHT(DRV_NAME), |
25787 |
}; |
25788 |
@@ -22215,9 +22003,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_hpt3x3.c linux-2.6.38.3/drivers/ata/p |
25789 |
.inherits = &ata_bmdma_port_ops, |
25790 |
.cable_detect = ata_cable_40wire, |
25791 |
.set_piomode = hpt3x3_set_piomode, |
25792 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_icside.c linux-2.6.38.3/drivers/ata/pata_icside.c |
25793 |
---- linux-2.6.38.3/drivers/ata/pata_icside.c 2011-03-14 21:20:32.000000000 -0400 |
25794 |
-+++ linux-2.6.38.3/drivers/ata/pata_icside.c 2011-04-17 15:57:32.000000000 -0400 |
25795 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_icside.c linux-2.6.38.4/drivers/ata/pata_icside.c |
25796 |
+--- linux-2.6.38.4/drivers/ata/pata_icside.c 2011-03-14 21:20:32.000000000 -0400 |
25797 |
++++ linux-2.6.38.4/drivers/ata/pata_icside.c 2011-04-17 15:57:32.000000000 -0400 |
25798 |
@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct |
25799 |
} |
25800 |
} |
25801 |
@@ -22227,9 +22015,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_icside.c linux-2.6.38.3/drivers/ata/p |
25802 |
.inherits = &ata_bmdma_port_ops, |
25803 |
/* no need to build any PRD tables for DMA */ |
25804 |
.qc_prep = ata_noop_qc_prep, |
25805 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_isapnp.c linux-2.6.38.3/drivers/ata/pata_isapnp.c |
25806 |
---- linux-2.6.38.3/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.000000000 -0400 |
25807 |
-+++ linux-2.6.38.3/drivers/ata/pata_isapnp.c 2011-04-17 15:57:32.000000000 -0400 |
25808 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_isapnp.c linux-2.6.38.4/drivers/ata/pata_isapnp.c |
25809 |
+--- linux-2.6.38.4/drivers/ata/pata_isapnp.c 2011-03-14 21:20:32.000000000 -0400 |
25810 |
++++ linux-2.6.38.4/drivers/ata/pata_isapnp.c 2011-04-17 15:57:32.000000000 -0400 |
25811 |
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ |
25812 |
ATA_PIO_SHT(DRV_NAME), |
25813 |
}; |
25814 |
@@ -22245,9 +22033,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_isapnp.c linux-2.6.38.3/drivers/ata/p |
25815 |
.inherits = &ata_sff_port_ops, |
25816 |
.cable_detect = ata_cable_40wire, |
25817 |
/* No altstatus so we don't want to use the lost interrupt poll */ |
25818 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_it8213.c linux-2.6.38.3/drivers/ata/pata_it8213.c |
25819 |
---- linux-2.6.38.3/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.000000000 -0400 |
25820 |
-+++ linux-2.6.38.3/drivers/ata/pata_it8213.c 2011-04-17 15:57:32.000000000 -0400 |
25821 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_it8213.c linux-2.6.38.4/drivers/ata/pata_it8213.c |
25822 |
+--- linux-2.6.38.4/drivers/ata/pata_it8213.c 2011-03-14 21:20:32.000000000 -0400 |
25823 |
++++ linux-2.6.38.4/drivers/ata/pata_it8213.c 2011-04-17 15:57:32.000000000 -0400 |
25824 |
@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_ |
25825 |
}; |
25826 |
|
25827 |
@@ -22257,9 +22045,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_it8213.c linux-2.6.38.3/drivers/ata/p |
25828 |
.inherits = &ata_bmdma_port_ops, |
25829 |
.cable_detect = it8213_cable_detect, |
25830 |
.set_piomode = it8213_set_piomode, |
25831 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_it821x.c linux-2.6.38.3/drivers/ata/pata_it821x.c |
25832 |
---- linux-2.6.38.3/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.000000000 -0400 |
25833 |
-+++ linux-2.6.38.3/drivers/ata/pata_it821x.c 2011-04-17 15:57:32.000000000 -0400 |
25834 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_it821x.c linux-2.6.38.4/drivers/ata/pata_it821x.c |
25835 |
+--- linux-2.6.38.4/drivers/ata/pata_it821x.c 2011-03-14 21:20:32.000000000 -0400 |
25836 |
++++ linux-2.6.38.4/drivers/ata/pata_it821x.c 2011-04-17 15:57:32.000000000 -0400 |
25837 |
@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_ |
25838 |
ATA_BMDMA_SHT(DRV_NAME), |
25839 |
}; |
25840 |
@@ -22287,9 +22075,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_it821x.c linux-2.6.38.3/drivers/ata/p |
25841 |
.inherits = &ata_bmdma_port_ops, |
25842 |
|
25843 |
.check_atapi_dma= it821x_check_atapi_dma, |
25844 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c |
25845 |
---- linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.000000000 -0400 |
25846 |
-+++ linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:57:32.000000000 -0400 |
25847 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c |
25848 |
+--- linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c 2011-03-14 21:20:32.000000000 -0400 |
25849 |
++++ linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:57:32.000000000 -0400 |
25850 |
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ |
25851 |
ATA_PIO_SHT(DRV_NAME), |
25852 |
}; |
25853 |
@@ -22299,9 +22087,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.3/drivers/at |
25854 |
.inherits = &ata_sff_port_ops, |
25855 |
.sff_data_xfer = ixp4xx_mmio_data_xfer, |
25856 |
.cable_detect = ata_cable_40wire, |
25857 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_jmicron.c linux-2.6.38.3/drivers/ata/pata_jmicron.c |
25858 |
---- linux-2.6.38.3/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000000 -0400 |
25859 |
-+++ linux-2.6.38.3/drivers/ata/pata_jmicron.c 2011-04-17 15:57:32.000000000 -0400 |
25860 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_jmicron.c linux-2.6.38.4/drivers/ata/pata_jmicron.c |
25861 |
+--- linux-2.6.38.4/drivers/ata/pata_jmicron.c 2011-03-14 21:20:32.000000000 -0400 |
25862 |
++++ linux-2.6.38.4/drivers/ata/pata_jmicron.c 2011-04-17 15:57:32.000000000 -0400 |
25863 |
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron |
25864 |
ATA_BMDMA_SHT(DRV_NAME), |
25865 |
}; |
25866 |
@@ -22311,9 +22099,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_jmicron.c linux-2.6.38.3/drivers/ata/ |
25867 |
.inherits = &ata_bmdma_port_ops, |
25868 |
.prereset = jmicron_pre_reset, |
25869 |
}; |
25870 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_legacy.c linux-2.6.38.3/drivers/ata/pata_legacy.c |
25871 |
---- linux-2.6.38.3/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.000000000 -0400 |
25872 |
-+++ linux-2.6.38.3/drivers/ata/pata_legacy.c 2011-04-17 15:57:32.000000000 -0400 |
25873 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_legacy.c linux-2.6.38.4/drivers/ata/pata_legacy.c |
25874 |
+--- linux-2.6.38.4/drivers/ata/pata_legacy.c 2011-03-14 21:20:32.000000000 -0400 |
25875 |
++++ linux-2.6.38.4/drivers/ata/pata_legacy.c 2011-04-17 15:57:32.000000000 -0400 |
25876 |
@@ -116,7 +116,7 @@ struct legacy_probe { |
25877 |
|
25878 |
struct legacy_controller { |
25879 |
@@ -22425,9 +22213,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_legacy.c linux-2.6.38.3/drivers/ata/p |
25880 |
struct legacy_data *ld = &legacy_data[probe->slot]; |
25881 |
struct ata_host *host = NULL; |
25882 |
struct ata_port *ap; |
25883 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_macio.c linux-2.6.38.3/drivers/ata/pata_macio.c |
25884 |
---- linux-2.6.38.3/drivers/ata/pata_macio.c 2011-03-14 21:20:32.000000000 -0400 |
25885 |
-+++ linux-2.6.38.3/drivers/ata/pata_macio.c 2011-04-17 15:57:32.000000000 -0400 |
25886 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_macio.c linux-2.6.38.4/drivers/ata/pata_macio.c |
25887 |
+--- linux-2.6.38.4/drivers/ata/pata_macio.c 2011-03-14 21:20:32.000000000 -0400 |
25888 |
++++ linux-2.6.38.4/drivers/ata/pata_macio.c 2011-04-17 15:57:32.000000000 -0400 |
25889 |
@@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma |
25890 |
.slave_configure = pata_macio_slave_config, |
25891 |
}; |
25892 |
@@ -22439,9 +22227,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_macio.c linux-2.6.38.3/drivers/ata/pa |
25893 |
.freeze = pata_macio_freeze, |
25894 |
.set_piomode = pata_macio_set_timings, |
25895 |
.set_dmamode = pata_macio_set_timings, |
25896 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_marvell.c linux-2.6.38.3/drivers/ata/pata_marvell.c |
25897 |
---- linux-2.6.38.3/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000000 -0400 |
25898 |
-+++ linux-2.6.38.3/drivers/ata/pata_marvell.c 2011-04-17 15:57:32.000000000 -0400 |
25899 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_marvell.c linux-2.6.38.4/drivers/ata/pata_marvell.c |
25900 |
+--- linux-2.6.38.4/drivers/ata/pata_marvell.c 2011-03-14 21:20:32.000000000 -0400 |
25901 |
++++ linux-2.6.38.4/drivers/ata/pata_marvell.c 2011-04-17 15:57:32.000000000 -0400 |
25902 |
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell |
25903 |
ATA_BMDMA_SHT(DRV_NAME), |
25904 |
}; |
25905 |
@@ -22451,9 +22239,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_marvell.c linux-2.6.38.3/drivers/ata/ |
25906 |
.inherits = &ata_bmdma_port_ops, |
25907 |
.cable_detect = marvell_cable_detect, |
25908 |
.prereset = marvell_pre_reset, |
25909 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_mpc52xx.c linux-2.6.38.3/drivers/ata/pata_mpc52xx.c |
25910 |
---- linux-2.6.38.3/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000000 -0400 |
25911 |
-+++ linux-2.6.38.3/drivers/ata/pata_mpc52xx.c 2011-04-17 15:57:32.000000000 -0400 |
25912 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_mpc52xx.c linux-2.6.38.4/drivers/ata/pata_mpc52xx.c |
25913 |
+--- linux-2.6.38.4/drivers/ata/pata_mpc52xx.c 2011-03-14 21:20:32.000000000 -0400 |
25914 |
++++ linux-2.6.38.4/drivers/ata/pata_mpc52xx.c 2011-04-17 15:57:32.000000000 -0400 |
25915 |
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx |
25916 |
ATA_PIO_SHT(DRV_NAME), |
25917 |
}; |
25918 |
@@ -22463,9 +22251,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_mpc52xx.c linux-2.6.38.3/drivers/ata/ |
25919 |
.inherits = &ata_bmdma_port_ops, |
25920 |
.sff_dev_select = mpc52xx_ata_dev_select, |
25921 |
.set_piomode = mpc52xx_ata_set_piomode, |
25922 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_mpiix.c linux-2.6.38.3/drivers/ata/pata_mpiix.c |
25923 |
---- linux-2.6.38.3/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.000000000 -0400 |
25924 |
-+++ linux-2.6.38.3/drivers/ata/pata_mpiix.c 2011-04-17 15:57:32.000000000 -0400 |
25925 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_mpiix.c linux-2.6.38.4/drivers/ata/pata_mpiix.c |
25926 |
+--- linux-2.6.38.4/drivers/ata/pata_mpiix.c 2011-03-14 21:20:32.000000000 -0400 |
25927 |
++++ linux-2.6.38.4/drivers/ata/pata_mpiix.c 2011-04-17 15:57:32.000000000 -0400 |
25928 |
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s |
25929 |
ATA_PIO_SHT(DRV_NAME), |
25930 |
}; |
25931 |
@@ -22475,9 +22263,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_mpiix.c linux-2.6.38.3/drivers/ata/pa |
25932 |
.inherits = &ata_sff_port_ops, |
25933 |
.qc_issue = mpiix_qc_issue, |
25934 |
.cable_detect = ata_cable_40wire, |
25935 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_netcell.c linux-2.6.38.3/drivers/ata/pata_netcell.c |
25936 |
---- linux-2.6.38.3/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000000 -0400 |
25937 |
-+++ linux-2.6.38.3/drivers/ata/pata_netcell.c 2011-04-17 15:57:32.000000000 -0400 |
25938 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_netcell.c linux-2.6.38.4/drivers/ata/pata_netcell.c |
25939 |
+--- linux-2.6.38.4/drivers/ata/pata_netcell.c 2011-03-14 21:20:32.000000000 -0400 |
25940 |
++++ linux-2.6.38.4/drivers/ata/pata_netcell.c 2011-04-17 15:57:32.000000000 -0400 |
25941 |
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell |
25942 |
ATA_BMDMA_SHT(DRV_NAME), |
25943 |
}; |
25944 |
@@ -22487,9 +22275,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_netcell.c linux-2.6.38.3/drivers/ata/ |
25945 |
.inherits = &ata_bmdma_port_ops, |
25946 |
.cable_detect = ata_cable_80wire, |
25947 |
.read_id = netcell_read_id, |
25948 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_ninja32.c linux-2.6.38.3/drivers/ata/pata_ninja32.c |
25949 |
---- linux-2.6.38.3/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000000 -0400 |
25950 |
-+++ linux-2.6.38.3/drivers/ata/pata_ninja32.c 2011-04-17 15:57:32.000000000 -0400 |
25951 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_ninja32.c linux-2.6.38.4/drivers/ata/pata_ninja32.c |
25952 |
+--- linux-2.6.38.4/drivers/ata/pata_ninja32.c 2011-03-14 21:20:32.000000000 -0400 |
25953 |
++++ linux-2.6.38.4/drivers/ata/pata_ninja32.c 2011-04-17 15:57:32.000000000 -0400 |
25954 |
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 |
25955 |
ATA_BMDMA_SHT(DRV_NAME), |
25956 |
}; |
25957 |
@@ -22499,9 +22287,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ninja32.c linux-2.6.38.3/drivers/ata/ |
25958 |
.inherits = &ata_bmdma_port_ops, |
25959 |
.sff_dev_select = ninja32_dev_select, |
25960 |
.cable_detect = ata_cable_40wire, |
25961 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_ns87410.c linux-2.6.38.3/drivers/ata/pata_ns87410.c |
25962 |
---- linux-2.6.38.3/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000000 -0400 |
25963 |
-+++ linux-2.6.38.3/drivers/ata/pata_ns87410.c 2011-04-17 15:57:32.000000000 -0400 |
25964 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87410.c linux-2.6.38.4/drivers/ata/pata_ns87410.c |
25965 |
+--- linux-2.6.38.4/drivers/ata/pata_ns87410.c 2011-03-14 21:20:32.000000000 -0400 |
25966 |
++++ linux-2.6.38.4/drivers/ata/pata_ns87410.c 2011-04-17 15:57:32.000000000 -0400 |
25967 |
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 |
25968 |
ATA_PIO_SHT(DRV_NAME), |
25969 |
}; |
25970 |
@@ -22511,9 +22299,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ns87410.c linux-2.6.38.3/drivers/ata/ |
25971 |
.inherits = &ata_sff_port_ops, |
25972 |
.qc_issue = ns87410_qc_issue, |
25973 |
.cable_detect = ata_cable_40wire, |
25974 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_ns87415.c linux-2.6.38.3/drivers/ata/pata_ns87415.c |
25975 |
---- linux-2.6.38.3/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000000 -0400 |
25976 |
-+++ linux-2.6.38.3/drivers/ata/pata_ns87415.c 2011-04-17 15:57:32.000000000 -0400 |
25977 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87415.c linux-2.6.38.4/drivers/ata/pata_ns87415.c |
25978 |
+--- linux-2.6.38.4/drivers/ata/pata_ns87415.c 2011-03-14 21:20:32.000000000 -0400 |
25979 |
++++ linux-2.6.38.4/drivers/ata/pata_ns87415.c 2011-04-17 15:57:32.000000000 -0400 |
25980 |
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at |
25981 |
} |
25982 |
#endif /* 87560 SuperIO Support */ |
25983 |
@@ -22532,9 +22320,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_ns87415.c linux-2.6.38.3/drivers/ata/ |
25984 |
.inherits = &ns87415_pata_ops, |
25985 |
.sff_tf_read = ns87560_tf_read, |
25986 |
.sff_check_status = ns87560_check_status, |
25987 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_octeon_cf.c linux-2.6.38.3/drivers/ata/pata_octeon_cf.c |
25988 |
---- linux-2.6.38.3/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.000000000 -0400 |
25989 |
-+++ linux-2.6.38.3/drivers/ata/pata_octeon_cf.c 2011-04-17 15:57:32.000000000 -0400 |
25990 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_octeon_cf.c linux-2.6.38.4/drivers/ata/pata_octeon_cf.c |
25991 |
+--- linux-2.6.38.4/drivers/ata/pata_octeon_cf.c 2011-03-14 21:20:32.000000000 -0400 |
25992 |
++++ linux-2.6.38.4/drivers/ata/pata_octeon_cf.c 2011-04-17 15:57:32.000000000 -0400 |
25993 |
@@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s |
25994 |
return 0; |
25995 |
} |
25996 |
@@ -22544,9 +22332,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_octeon_cf.c linux-2.6.38.3/drivers/at |
25997 |
.inherits = &ata_sff_port_ops, |
25998 |
.check_atapi_dma = octeon_cf_check_atapi_dma, |
25999 |
.qc_prep = ata_noop_qc_prep, |
26000 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_oldpiix.c linux-2.6.38.3/drivers/ata/pata_oldpiix.c |
26001 |
---- linux-2.6.38.3/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000000 -0400 |
26002 |
-+++ linux-2.6.38.3/drivers/ata/pata_oldpiix.c 2011-04-17 15:57:32.000000000 -0400 |
26003 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_oldpiix.c linux-2.6.38.4/drivers/ata/pata_oldpiix.c |
26004 |
+--- linux-2.6.38.4/drivers/ata/pata_oldpiix.c 2011-03-14 21:20:32.000000000 -0400 |
26005 |
++++ linux-2.6.38.4/drivers/ata/pata_oldpiix.c 2011-04-17 15:57:32.000000000 -0400 |
26006 |
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix |
26007 |
ATA_BMDMA_SHT(DRV_NAME), |
26008 |
}; |
26009 |
@@ -22556,9 +22344,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_oldpiix.c linux-2.6.38.3/drivers/ata/ |
26010 |
.inherits = &ata_bmdma_port_ops, |
26011 |
.qc_issue = oldpiix_qc_issue, |
26012 |
.cable_detect = ata_cable_40wire, |
26013 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_opti.c linux-2.6.38.3/drivers/ata/pata_opti.c |
26014 |
---- linux-2.6.38.3/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000 -0400 |
26015 |
-+++ linux-2.6.38.3/drivers/ata/pata_opti.c 2011-04-17 15:57:32.000000000 -0400 |
26016 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_opti.c linux-2.6.38.4/drivers/ata/pata_opti.c |
26017 |
+--- linux-2.6.38.4/drivers/ata/pata_opti.c 2011-03-14 21:20:32.000000000 -0400 |
26018 |
++++ linux-2.6.38.4/drivers/ata/pata_opti.c 2011-04-17 15:57:32.000000000 -0400 |
26019 |
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh |
26020 |
ATA_PIO_SHT(DRV_NAME), |
26021 |
}; |
26022 |
@@ -22568,9 +22356,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_opti.c linux-2.6.38.3/drivers/ata/pat |
26023 |
.inherits = &ata_sff_port_ops, |
26024 |
.cable_detect = ata_cable_40wire, |
26025 |
.set_piomode = opti_set_piomode, |
26026 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_optidma.c linux-2.6.38.3/drivers/ata/pata_optidma.c |
26027 |
---- linux-2.6.38.3/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000000 -0400 |
26028 |
-+++ linux-2.6.38.3/drivers/ata/pata_optidma.c 2011-04-17 15:57:32.000000000 -0400 |
26029 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_optidma.c linux-2.6.38.4/drivers/ata/pata_optidma.c |
26030 |
+--- linux-2.6.38.4/drivers/ata/pata_optidma.c 2011-03-14 21:20:32.000000000 -0400 |
26031 |
++++ linux-2.6.38.4/drivers/ata/pata_optidma.c 2011-04-17 15:57:32.000000000 -0400 |
26032 |
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma |
26033 |
ATA_BMDMA_SHT(DRV_NAME), |
26034 |
}; |
26035 |
@@ -22589,9 +22377,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_optidma.c linux-2.6.38.3/drivers/ata/ |
26036 |
.inherits = &optidma_port_ops, |
26037 |
.set_piomode = optiplus_set_pio_mode, |
26038 |
.set_dmamode = optiplus_set_dma_mode, |
26039 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_palmld.c linux-2.6.38.3/drivers/ata/pata_palmld.c |
26040 |
---- linux-2.6.38.3/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.000000000 -0400 |
26041 |
-+++ linux-2.6.38.3/drivers/ata/pata_palmld.c 2011-04-17 15:57:32.000000000 -0400 |
26042 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_palmld.c linux-2.6.38.4/drivers/ata/pata_palmld.c |
26043 |
+--- linux-2.6.38.4/drivers/ata/pata_palmld.c 2011-03-14 21:20:32.000000000 -0400 |
26044 |
++++ linux-2.6.38.4/drivers/ata/pata_palmld.c 2011-04-17 15:57:32.000000000 -0400 |
26045 |
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ |
26046 |
ATA_PIO_SHT(DRV_NAME), |
26047 |
}; |
26048 |
@@ -22601,9 +22389,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_palmld.c linux-2.6.38.3/drivers/ata/p |
26049 |
.inherits = &ata_sff_port_ops, |
26050 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
26051 |
.cable_detect = ata_cable_40wire, |
26052 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_pcmcia.c linux-2.6.38.3/drivers/ata/pata_pcmcia.c |
26053 |
---- linux-2.6.38.3/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.000000000 -0400 |
26054 |
-+++ linux-2.6.38.3/drivers/ata/pata_pcmcia.c 2011-04-17 15:57:32.000000000 -0400 |
26055 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_pcmcia.c linux-2.6.38.4/drivers/ata/pata_pcmcia.c |
26056 |
+--- linux-2.6.38.4/drivers/ata/pata_pcmcia.c 2011-03-14 21:20:32.000000000 -0400 |
26057 |
++++ linux-2.6.38.4/drivers/ata/pata_pcmcia.c 2011-04-17 15:57:32.000000000 -0400 |
26058 |
@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_ |
26059 |
ATA_PIO_SHT(DRV_NAME), |
26060 |
}; |
26061 |
@@ -22630,9 +22418,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pcmcia.c linux-2.6.38.3/drivers/ata/p |
26062 |
|
26063 |
/* Set up attributes in order to probe card and get resources */ |
26064 |
pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO | |
26065 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc2027x.c linux-2.6.38.3/drivers/ata/pata_pdc2027x.c |
26066 |
---- linux-2.6.38.3/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.000000000 -0400 |
26067 |
-+++ linux-2.6.38.3/drivers/ata/pata_pdc2027x.c 2011-04-17 15:57:32.000000000 -0400 |
26068 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc2027x.c linux-2.6.38.4/drivers/ata/pata_pdc2027x.c |
26069 |
+--- linux-2.6.38.4/drivers/ata/pata_pdc2027x.c 2011-03-14 21:20:32.000000000 -0400 |
26070 |
++++ linux-2.6.38.4/drivers/ata/pata_pdc2027x.c 2011-04-17 15:57:32.000000000 -0400 |
26071 |
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 |
26072 |
ATA_BMDMA_SHT(DRV_NAME), |
26073 |
}; |
26074 |
@@ -22650,9 +22438,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc2027x.c linux-2.6.38.3/drivers/ata |
26075 |
.inherits = &pdc2027x_pata100_ops, |
26076 |
.mode_filter = pdc2027x_mode_filter, |
26077 |
.set_piomode = pdc2027x_set_piomode, |
26078 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c |
26079 |
---- linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.000000000 -0400 |
26080 |
-+++ linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:57:32.000000000 -0400 |
26081 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c |
26082 |
+--- linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c 2011-03-14 21:20:32.000000000 -0400 |
26083 |
++++ linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:57:32.000000000 -0400 |
26084 |
@@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x |
26085 |
ATA_BMDMA_SHT(DRV_NAME), |
26086 |
}; |
26087 |
@@ -22671,9 +22459,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.3/drivers |
26088 |
.inherits = &pdc2024x_port_ops, |
26089 |
|
26090 |
.check_atapi_dma = pdc2026x_check_atapi_dma, |
26091 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_piccolo.c linux-2.6.38.3/drivers/ata/pata_piccolo.c |
26092 |
---- linux-2.6.38.3/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000000 -0400 |
26093 |
-+++ linux-2.6.38.3/drivers/ata/pata_piccolo.c 2011-04-17 15:57:32.000000000 -0400 |
26094 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_piccolo.c linux-2.6.38.4/drivers/ata/pata_piccolo.c |
26095 |
+--- linux-2.6.38.4/drivers/ata/pata_piccolo.c 2011-03-14 21:20:32.000000000 -0400 |
26096 |
++++ linux-2.6.38.4/drivers/ata/pata_piccolo.c 2011-04-17 15:57:32.000000000 -0400 |
26097 |
@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh |
26098 |
ATA_BMDMA_SHT(DRV_NAME), |
26099 |
}; |
26100 |
@@ -22683,9 +22471,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_piccolo.c linux-2.6.38.3/drivers/ata/ |
26101 |
.inherits = &ata_bmdma_port_ops, |
26102 |
.cable_detect = ata_cable_unknown, |
26103 |
.set_piomode = tosh_set_piomode, |
26104 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_platform.c linux-2.6.38.3/drivers/ata/pata_platform.c |
26105 |
---- linux-2.6.38.3/drivers/ata/pata_platform.c 2011-03-14 21:20:32.000000000 -0400 |
26106 |
-+++ linux-2.6.38.3/drivers/ata/pata_platform.c 2011-04-17 15:57:32.000000000 -0400 |
26107 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_platform.c linux-2.6.38.4/drivers/ata/pata_platform.c |
26108 |
+--- linux-2.6.38.4/drivers/ata/pata_platform.c 2011-03-14 21:20:32.000000000 -0400 |
26109 |
++++ linux-2.6.38.4/drivers/ata/pata_platform.c 2011-04-17 15:57:32.000000000 -0400 |
26110 |
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl |
26111 |
ATA_PIO_SHT(DRV_NAME), |
26112 |
}; |
26113 |
@@ -22695,9 +22483,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_platform.c linux-2.6.38.3/drivers/ata |
26114 |
.inherits = &ata_sff_port_ops, |
26115 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
26116 |
.cable_detect = ata_cable_unknown, |
26117 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_pxa.c linux-2.6.38.3/drivers/ata/pata_pxa.c |
26118 |
---- linux-2.6.38.3/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 -0400 |
26119 |
-+++ linux-2.6.38.3/drivers/ata/pata_pxa.c 2011-04-17 15:57:32.000000000 -0400 |
26120 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_pxa.c linux-2.6.38.4/drivers/ata/pata_pxa.c |
26121 |
+--- linux-2.6.38.4/drivers/ata/pata_pxa.c 2011-03-14 21:20:32.000000000 -0400 |
26122 |
++++ linux-2.6.38.4/drivers/ata/pata_pxa.c 2011-04-17 15:57:32.000000000 -0400 |
26123 |
@@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata |
26124 |
ATA_BMDMA_SHT(DRV_NAME), |
26125 |
}; |
26126 |
@@ -22707,9 +22495,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_pxa.c linux-2.6.38.3/drivers/ata/pata |
26127 |
.inherits = &ata_bmdma_port_ops, |
26128 |
.cable_detect = ata_cable_40wire, |
26129 |
|
26130 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_qdi.c linux-2.6.38.3/drivers/ata/pata_qdi.c |
26131 |
---- linux-2.6.38.3/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 -0400 |
26132 |
-+++ linux-2.6.38.3/drivers/ata/pata_qdi.c 2011-04-17 15:57:32.000000000 -0400 |
26133 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_qdi.c linux-2.6.38.4/drivers/ata/pata_qdi.c |
26134 |
+--- linux-2.6.38.4/drivers/ata/pata_qdi.c 2011-03-14 21:20:32.000000000 -0400 |
26135 |
++++ linux-2.6.38.4/drivers/ata/pata_qdi.c 2011-04-17 15:57:32.000000000 -0400 |
26136 |
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht |
26137 |
ATA_PIO_SHT(DRV_NAME), |
26138 |
}; |
26139 |
@@ -22728,9 +22516,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_qdi.c linux-2.6.38.3/drivers/ata/pata |
26140 |
.inherits = &qdi6500_port_ops, |
26141 |
.set_piomode = qdi6580_set_piomode, |
26142 |
}; |
26143 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_radisys.c linux-2.6.38.3/drivers/ata/pata_radisys.c |
26144 |
---- linux-2.6.38.3/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000000 -0400 |
26145 |
-+++ linux-2.6.38.3/drivers/ata/pata_radisys.c 2011-04-17 15:57:32.000000000 -0400 |
26146 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_radisys.c linux-2.6.38.4/drivers/ata/pata_radisys.c |
26147 |
+--- linux-2.6.38.4/drivers/ata/pata_radisys.c 2011-03-14 21:20:32.000000000 -0400 |
26148 |
++++ linux-2.6.38.4/drivers/ata/pata_radisys.c 2011-04-17 15:57:32.000000000 -0400 |
26149 |
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys |
26150 |
ATA_BMDMA_SHT(DRV_NAME), |
26151 |
}; |
26152 |
@@ -22740,9 +22528,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_radisys.c linux-2.6.38.3/drivers/ata/ |
26153 |
.inherits = &ata_bmdma_port_ops, |
26154 |
.qc_issue = radisys_qc_issue, |
26155 |
.cable_detect = ata_cable_unknown, |
26156 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_rb532_cf.c linux-2.6.38.3/drivers/ata/pata_rb532_cf.c |
26157 |
---- linux-2.6.38.3/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.000000000 -0400 |
26158 |
-+++ linux-2.6.38.3/drivers/ata/pata_rb532_cf.c 2011-04-17 15:57:32.000000000 -0400 |
26159 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_rb532_cf.c linux-2.6.38.4/drivers/ata/pata_rb532_cf.c |
26160 |
+--- linux-2.6.38.4/drivers/ata/pata_rb532_cf.c 2011-03-14 21:20:32.000000000 -0400 |
26161 |
++++ linux-2.6.38.4/drivers/ata/pata_rb532_cf.c 2011-04-17 15:57:32.000000000 -0400 |
26162 |
@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle |
26163 |
return IRQ_HANDLED; |
26164 |
} |
26165 |
@@ -22752,9 +22540,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_rb532_cf.c linux-2.6.38.3/drivers/ata |
26166 |
.inherits = &ata_sff_port_ops, |
26167 |
.sff_data_xfer = ata_sff_data_xfer32, |
26168 |
}; |
26169 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_rdc.c linux-2.6.38.3/drivers/ata/pata_rdc.c |
26170 |
---- linux-2.6.38.3/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 -0400 |
26171 |
-+++ linux-2.6.38.3/drivers/ata/pata_rdc.c 2011-04-17 15:57:32.000000000 -0400 |
26172 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_rdc.c linux-2.6.38.4/drivers/ata/pata_rdc.c |
26173 |
+--- linux-2.6.38.4/drivers/ata/pata_rdc.c 2011-03-14 21:20:32.000000000 -0400 |
26174 |
++++ linux-2.6.38.4/drivers/ata/pata_rdc.c 2011-04-17 15:57:32.000000000 -0400 |
26175 |
@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p |
26176 |
pci_write_config_byte(dev, 0x48, udma_enable); |
26177 |
} |
26178 |
@@ -22764,9 +22552,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_rdc.c linux-2.6.38.3/drivers/ata/pata |
26179 |
.inherits = &ata_bmdma32_port_ops, |
26180 |
.cable_detect = rdc_pata_cable_detect, |
26181 |
.set_piomode = rdc_set_piomode, |
26182 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_rz1000.c linux-2.6.38.3/drivers/ata/pata_rz1000.c |
26183 |
---- linux-2.6.38.3/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.000000000 -0400 |
26184 |
-+++ linux-2.6.38.3/drivers/ata/pata_rz1000.c 2011-04-17 15:57:32.000000000 -0400 |
26185 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_rz1000.c linux-2.6.38.4/drivers/ata/pata_rz1000.c |
26186 |
+--- linux-2.6.38.4/drivers/ata/pata_rz1000.c 2011-03-14 21:20:32.000000000 -0400 |
26187 |
++++ linux-2.6.38.4/drivers/ata/pata_rz1000.c 2011-04-17 15:57:32.000000000 -0400 |
26188 |
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ |
26189 |
ATA_PIO_SHT(DRV_NAME), |
26190 |
}; |
26191 |
@@ -22776,9 +22564,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_rz1000.c linux-2.6.38.3/drivers/ata/p |
26192 |
.inherits = &ata_sff_port_ops, |
26193 |
.cable_detect = ata_cable_40wire, |
26194 |
.set_mode = rz1000_set_mode, |
26195 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_samsung_cf.c linux-2.6.38.3/drivers/ata/pata_samsung_cf.c |
26196 |
---- linux-2.6.38.3/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000000000 -0400 |
26197 |
-+++ linux-2.6.38.3/drivers/ata/pata_samsung_cf.c 2011-04-17 15:57:32.000000000 -0400 |
26198 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_samsung_cf.c linux-2.6.38.4/drivers/ata/pata_samsung_cf.c |
26199 |
+--- linux-2.6.38.4/drivers/ata/pata_samsung_cf.c 2011-03-14 21:20:32.000000000 -0400 |
26200 |
++++ linux-2.6.38.4/drivers/ata/pata_samsung_cf.c 2011-04-17 15:57:32.000000000 -0400 |
26201 |
@@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3 |
26202 |
ATA_PIO_SHT(DRV_NAME), |
26203 |
}; |
26204 |
@@ -22797,9 +22585,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_samsung_cf.c linux-2.6.38.3/drivers/a |
26205 |
.inherits = &ata_sff_port_ops, |
26206 |
.set_piomode = pata_s3c_set_piomode, |
26207 |
}; |
26208 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_sc1200.c linux-2.6.38.3/drivers/ata/pata_sc1200.c |
26209 |
---- linux-2.6.38.3/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.000000000 -0400 |
26210 |
-+++ linux-2.6.38.3/drivers/ata/pata_sc1200.c 2011-04-17 15:57:32.000000000 -0400 |
26211 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_sc1200.c linux-2.6.38.4/drivers/ata/pata_sc1200.c |
26212 |
+--- linux-2.6.38.4/drivers/ata/pata_sc1200.c 2011-03-14 21:20:32.000000000 -0400 |
26213 |
++++ linux-2.6.38.4/drivers/ata/pata_sc1200.c 2011-04-17 15:57:32.000000000 -0400 |
26214 |
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ |
26215 |
.sg_tablesize = LIBATA_DUMB_MAX_PRD, |
26216 |
}; |
26217 |
@@ -22809,9 +22597,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sc1200.c linux-2.6.38.3/drivers/ata/p |
26218 |
.inherits = &ata_bmdma_port_ops, |
26219 |
.qc_prep = ata_bmdma_dumb_qc_prep, |
26220 |
.qc_issue = sc1200_qc_issue, |
26221 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_scc.c linux-2.6.38.3/drivers/ata/pata_scc.c |
26222 |
---- linux-2.6.38.3/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 -0400 |
26223 |
-+++ linux-2.6.38.3/drivers/ata/pata_scc.c 2011-04-17 15:57:32.000000000 -0400 |
26224 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_scc.c linux-2.6.38.4/drivers/ata/pata_scc.c |
26225 |
+--- linux-2.6.38.4/drivers/ata/pata_scc.c 2011-03-14 21:20:32.000000000 -0400 |
26226 |
++++ linux-2.6.38.4/drivers/ata/pata_scc.c 2011-04-17 15:57:32.000000000 -0400 |
26227 |
@@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht |
26228 |
ATA_BMDMA_SHT(DRV_NAME), |
26229 |
}; |
26230 |
@@ -22821,9 +22609,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_scc.c linux-2.6.38.3/drivers/ata/pata |
26231 |
.inherits = &ata_bmdma_port_ops, |
26232 |
|
26233 |
.set_piomode = scc_set_piomode, |
26234 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_sch.c linux-2.6.38.3/drivers/ata/pata_sch.c |
26235 |
---- linux-2.6.38.3/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 -0400 |
26236 |
-+++ linux-2.6.38.3/drivers/ata/pata_sch.c 2011-04-17 15:57:32.000000000 -0400 |
26237 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_sch.c linux-2.6.38.4/drivers/ata/pata_sch.c |
26238 |
+--- linux-2.6.38.4/drivers/ata/pata_sch.c 2011-03-14 21:20:32.000000000 -0400 |
26239 |
++++ linux-2.6.38.4/drivers/ata/pata_sch.c 2011-04-17 15:57:32.000000000 -0400 |
26240 |
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht |
26241 |
ATA_BMDMA_SHT(DRV_NAME), |
26242 |
}; |
26243 |
@@ -22833,9 +22621,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sch.c linux-2.6.38.3/drivers/ata/pata |
26244 |
.inherits = &ata_bmdma_port_ops, |
26245 |
.cable_detect = ata_cable_unknown, |
26246 |
.set_piomode = sch_set_piomode, |
26247 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_serverworks.c linux-2.6.38.3/drivers/ata/pata_serverworks.c |
26248 |
---- linux-2.6.38.3/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.000000000 -0400 |
26249 |
-+++ linux-2.6.38.3/drivers/ata/pata_serverworks.c 2011-04-17 15:57:32.000000000 -0400 |
26250 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_serverworks.c linux-2.6.38.4/drivers/ata/pata_serverworks.c |
26251 |
+--- linux-2.6.38.4/drivers/ata/pata_serverworks.c 2011-03-14 21:20:32.000000000 -0400 |
26252 |
++++ linux-2.6.38.4/drivers/ata/pata_serverworks.c 2011-04-17 15:57:32.000000000 -0400 |
26253 |
@@ -300,7 +300,7 @@ static struct scsi_host_template serverw |
26254 |
ATA_BMDMA_SHT(DRV_NAME), |
26255 |
}; |
26256 |
@@ -22854,9 +22642,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_serverworks.c linux-2.6.38.3/drivers/ |
26257 |
.inherits = &serverworks_osb4_port_ops, |
26258 |
.mode_filter = serverworks_csb_filter, |
26259 |
}; |
26260 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_sil680.c linux-2.6.38.3/drivers/ata/pata_sil680.c |
26261 |
---- linux-2.6.38.3/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.000000000 -0400 |
26262 |
-+++ linux-2.6.38.3/drivers/ata/pata_sil680.c 2011-04-17 15:57:32.000000000 -0400 |
26263 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_sil680.c linux-2.6.38.4/drivers/ata/pata_sil680.c |
26264 |
+--- linux-2.6.38.4/drivers/ata/pata_sil680.c 2011-03-14 21:20:32.000000000 -0400 |
26265 |
++++ linux-2.6.38.4/drivers/ata/pata_sil680.c 2011-04-17 15:57:32.000000000 -0400 |
26266 |
@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_ |
26267 |
ATA_BMDMA_SHT(DRV_NAME), |
26268 |
}; |
26269 |
@@ -22867,9 +22655,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sil680.c linux-2.6.38.3/drivers/ata/p |
26270 |
.inherits = &ata_bmdma32_port_ops, |
26271 |
.sff_exec_command = sil680_sff_exec_command, |
26272 |
.sff_irq_check = sil680_sff_irq_check, |
26273 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_sis.c linux-2.6.38.3/drivers/ata/pata_sis.c |
26274 |
---- linux-2.6.38.3/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 -0400 |
26275 |
-+++ linux-2.6.38.3/drivers/ata/pata_sis.c 2011-04-17 15:57:32.000000000 -0400 |
26276 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_sis.c linux-2.6.38.4/drivers/ata/pata_sis.c |
26277 |
+--- linux-2.6.38.4/drivers/ata/pata_sis.c 2011-03-14 21:20:32.000000000 -0400 |
26278 |
++++ linux-2.6.38.4/drivers/ata/pata_sis.c 2011-04-17 15:57:32.000000000 -0400 |
26279 |
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht |
26280 |
ATA_BMDMA_SHT(DRV_NAME), |
26281 |
}; |
26282 |
@@ -22925,9 +22713,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sis.c linux-2.6.38.3/drivers/ata/pata |
26283 |
.inherits = &sis_base_ops, |
26284 |
.set_piomode = sis_old_set_piomode, |
26285 |
.set_dmamode = sis_old_set_dmamode, |
26286 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_sl82c105.c linux-2.6.38.3/drivers/ata/pata_sl82c105.c |
26287 |
---- linux-2.6.38.3/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.000000000 -0400 |
26288 |
-+++ linux-2.6.38.3/drivers/ata/pata_sl82c105.c 2011-04-17 15:57:32.000000000 -0400 |
26289 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_sl82c105.c linux-2.6.38.4/drivers/ata/pata_sl82c105.c |
26290 |
+--- linux-2.6.38.4/drivers/ata/pata_sl82c105.c 2011-03-14 21:20:32.000000000 -0400 |
26291 |
++++ linux-2.6.38.4/drivers/ata/pata_sl82c105.c 2011-04-17 15:57:32.000000000 -0400 |
26292 |
@@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10 |
26293 |
ATA_BMDMA_SHT(DRV_NAME), |
26294 |
}; |
26295 |
@@ -22937,9 +22725,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_sl82c105.c linux-2.6.38.3/drivers/ata |
26296 |
.inherits = &ata_bmdma_port_ops, |
26297 |
.qc_defer = sl82c105_qc_defer, |
26298 |
.bmdma_start = sl82c105_bmdma_start, |
26299 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_triflex.c linux-2.6.38.3/drivers/ata/pata_triflex.c |
26300 |
---- linux-2.6.38.3/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000000 -0400 |
26301 |
-+++ linux-2.6.38.3/drivers/ata/pata_triflex.c 2011-04-17 15:57:32.000000000 -0400 |
26302 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_triflex.c linux-2.6.38.4/drivers/ata/pata_triflex.c |
26303 |
+--- linux-2.6.38.4/drivers/ata/pata_triflex.c 2011-03-14 21:20:32.000000000 -0400 |
26304 |
++++ linux-2.6.38.4/drivers/ata/pata_triflex.c 2011-04-17 15:57:32.000000000 -0400 |
26305 |
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex |
26306 |
ATA_BMDMA_SHT(DRV_NAME), |
26307 |
}; |
26308 |
@@ -22949,9 +22737,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_triflex.c linux-2.6.38.3/drivers/ata/ |
26309 |
.inherits = &ata_bmdma_port_ops, |
26310 |
.bmdma_start = triflex_bmdma_start, |
26311 |
.bmdma_stop = triflex_bmdma_stop, |
26312 |
-diff -urNp linux-2.6.38.3/drivers/ata/pata_via.c linux-2.6.38.3/drivers/ata/pata_via.c |
26313 |
---- linux-2.6.38.3/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 -0400 |
26314 |
-+++ linux-2.6.38.3/drivers/ata/pata_via.c 2011-04-17 15:57:32.000000000 -0400 |
26315 |
+diff -urNp linux-2.6.38.4/drivers/ata/pata_via.c linux-2.6.38.4/drivers/ata/pata_via.c |
26316 |
+--- linux-2.6.38.4/drivers/ata/pata_via.c 2011-03-14 21:20:32.000000000 -0400 |
26317 |
++++ linux-2.6.38.4/drivers/ata/pata_via.c 2011-04-17 15:57:32.000000000 -0400 |
26318 |
@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht |
26319 |
ATA_BMDMA_SHT(DRV_NAME), |
26320 |
}; |
26321 |
@@ -22970,9 +22758,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pata_via.c linux-2.6.38.3/drivers/ata/pata |
26322 |
.inherits = &via_port_ops, |
26323 |
.sff_data_xfer = ata_sff_data_xfer_noirq, |
26324 |
}; |
26325 |
-diff -urNp linux-2.6.38.3/drivers/ata/pdc_adma.c linux-2.6.38.3/drivers/ata/pdc_adma.c |
26326 |
---- linux-2.6.38.3/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 -0400 |
26327 |
-+++ linux-2.6.38.3/drivers/ata/pdc_adma.c 2011-04-17 15:57:32.000000000 -0400 |
26328 |
+diff -urNp linux-2.6.38.4/drivers/ata/pdc_adma.c linux-2.6.38.4/drivers/ata/pdc_adma.c |
26329 |
+--- linux-2.6.38.4/drivers/ata/pdc_adma.c 2011-03-14 21:20:32.000000000 -0400 |
26330 |
++++ linux-2.6.38.4/drivers/ata/pdc_adma.c 2011-04-17 15:57:32.000000000 -0400 |
26331 |
@@ -146,7 +146,7 @@ static struct scsi_host_template adma_at |
26332 |
.dma_boundary = ADMA_DMA_BOUNDARY, |
26333 |
}; |
26334 |
@@ -22982,9 +22770,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/pdc_adma.c linux-2.6.38.3/drivers/ata/pdc_ |
26335 |
.inherits = &ata_sff_port_ops, |
26336 |
|
26337 |
.lost_interrupt = ATA_OP_NULL, |
26338 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c |
26339 |
---- linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.000000000 -0400 |
26340 |
-+++ linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c 2011-04-17 15:57:32.000000000 -0400 |
26341 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c |
26342 |
+--- linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c 2011-03-14 21:20:32.000000000 -0400 |
26343 |
++++ linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c 2011-04-17 15:57:32.000000000 -0400 |
26344 |
@@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw |
26345 |
.dma_boundary = ATA_DMA_BOUNDARY, |
26346 |
}; |
26347 |
@@ -22994,9 +22782,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_dwc_460ex.c linux-2.6.38.3/drivers/at |
26348 |
.inherits = &ata_sff_port_ops, |
26349 |
|
26350 |
.error_handler = sata_dwc_error_handler, |
26351 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_fsl.c linux-2.6.38.3/drivers/ata/sata_fsl.c |
26352 |
---- linux-2.6.38.3/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 -0400 |
26353 |
-+++ linux-2.6.38.3/drivers/ata/sata_fsl.c 2011-04-17 15:57:32.000000000 -0400 |
26354 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_fsl.c linux-2.6.38.4/drivers/ata/sata_fsl.c |
26355 |
+--- linux-2.6.38.4/drivers/ata/sata_fsl.c 2011-03-14 21:20:32.000000000 -0400 |
26356 |
++++ linux-2.6.38.4/drivers/ata/sata_fsl.c 2011-04-17 15:57:32.000000000 -0400 |
26357 |
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs |
26358 |
.dma_boundary = ATA_DMA_BOUNDARY, |
26359 |
}; |
26360 |
@@ -23006,9 +22794,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_fsl.c linux-2.6.38.3/drivers/ata/sata |
26361 |
.inherits = &sata_pmp_port_ops, |
26362 |
|
26363 |
.qc_defer = ata_std_qc_defer, |
26364 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_inic162x.c linux-2.6.38.3/drivers/ata/sata_inic162x.c |
26365 |
---- linux-2.6.38.3/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.000000000 -0400 |
26366 |
-+++ linux-2.6.38.3/drivers/ata/sata_inic162x.c 2011-04-17 15:57:32.000000000 -0400 |
26367 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_inic162x.c linux-2.6.38.4/drivers/ata/sata_inic162x.c |
26368 |
+--- linux-2.6.38.4/drivers/ata/sata_inic162x.c 2011-03-14 21:20:32.000000000 -0400 |
26369 |
++++ linux-2.6.38.4/drivers/ata/sata_inic162x.c 2011-04-17 15:57:32.000000000 -0400 |
26370 |
@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po |
26371 |
return 0; |
26372 |
} |
26373 |
@@ -23018,9 +22806,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_inic162x.c linux-2.6.38.3/drivers/ata |
26374 |
.inherits = &sata_port_ops, |
26375 |
|
26376 |
.check_atapi_dma = inic_check_atapi_dma, |
26377 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_mv.c linux-2.6.38.3/drivers/ata/sata_mv.c |
26378 |
---- linux-2.6.38.3/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -0400 |
26379 |
-+++ linux-2.6.38.3/drivers/ata/sata_mv.c 2011-04-17 15:57:32.000000000 -0400 |
26380 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_mv.c linux-2.6.38.4/drivers/ata/sata_mv.c |
26381 |
+--- linux-2.6.38.4/drivers/ata/sata_mv.c 2011-03-14 21:20:32.000000000 -0400 |
26382 |
++++ linux-2.6.38.4/drivers/ata/sata_mv.c 2011-04-17 15:57:32.000000000 -0400 |
26383 |
@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht |
26384 |
.dma_boundary = MV_DMA_BOUNDARY, |
26385 |
}; |
26386 |
@@ -23048,9 +22836,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_mv.c linux-2.6.38.3/drivers/ata/sata_ |
26387 |
.inherits = &mv6_ops, |
26388 |
.dev_config = ATA_OP_NULL, |
26389 |
.qc_prep = mv_qc_prep_iie, |
26390 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_nv.c linux-2.6.38.3/drivers/ata/sata_nv.c |
26391 |
---- linux-2.6.38.3/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -0400 |
26392 |
-+++ linux-2.6.38.3/drivers/ata/sata_nv.c 2011-04-17 15:57:32.000000000 -0400 |
26393 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_nv.c linux-2.6.38.4/drivers/ata/sata_nv.c |
26394 |
+--- linux-2.6.38.4/drivers/ata/sata_nv.c 2011-03-14 21:20:32.000000000 -0400 |
26395 |
++++ linux-2.6.38.4/drivers/ata/sata_nv.c 2011-04-17 15:57:32.000000000 -0400 |
26396 |
@@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc |
26397 |
* cases. Define nv_hardreset() which only kicks in for post-boot |
26398 |
* probing and use it for all variants. |
26399 |
@@ -23093,9 +22881,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_nv.c linux-2.6.38.3/drivers/ata/sata_ |
26400 |
.inherits = &nv_generic_ops, |
26401 |
|
26402 |
.qc_defer = ata_std_qc_defer, |
26403 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_promise.c linux-2.6.38.3/drivers/ata/sata_promise.c |
26404 |
---- linux-2.6.38.3/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000000 -0400 |
26405 |
-+++ linux-2.6.38.3/drivers/ata/sata_promise.c 2011-04-17 15:57:32.000000000 -0400 |
26406 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_promise.c linux-2.6.38.4/drivers/ata/sata_promise.c |
26407 |
+--- linux-2.6.38.4/drivers/ata/sata_promise.c 2011-03-14 21:20:32.000000000 -0400 |
26408 |
++++ linux-2.6.38.4/drivers/ata/sata_promise.c 2011-04-17 15:57:32.000000000 -0400 |
26409 |
@@ -196,7 +196,7 @@ static const struct ata_port_operations |
26410 |
.error_handler = pdc_error_handler, |
26411 |
}; |
26412 |
@@ -23122,9 +22910,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_promise.c linux-2.6.38.3/drivers/ata/ |
26413 |
.inherits = &pdc_common_ops, |
26414 |
.cable_detect = pdc_pata_cable_detect, |
26415 |
.freeze = pdc_freeze, |
26416 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_qstor.c linux-2.6.38.3/drivers/ata/sata_qstor.c |
26417 |
---- linux-2.6.38.3/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.000000000 -0400 |
26418 |
-+++ linux-2.6.38.3/drivers/ata/sata_qstor.c 2011-04-17 15:57:32.000000000 -0400 |
26419 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_qstor.c linux-2.6.38.4/drivers/ata/sata_qstor.c |
26420 |
+--- linux-2.6.38.4/drivers/ata/sata_qstor.c 2011-03-14 21:20:32.000000000 -0400 |
26421 |
++++ linux-2.6.38.4/drivers/ata/sata_qstor.c 2011-04-17 15:57:32.000000000 -0400 |
26422 |
@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_ |
26423 |
.dma_boundary = QS_DMA_BOUNDARY, |
26424 |
}; |
26425 |
@@ -23134,9 +22922,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_qstor.c linux-2.6.38.3/drivers/ata/sa |
26426 |
.inherits = &ata_sff_port_ops, |
26427 |
|
26428 |
.check_atapi_dma = qs_check_atapi_dma, |
26429 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_sil24.c linux-2.6.38.3/drivers/ata/sata_sil24.c |
26430 |
---- linux-2.6.38.3/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.000000000 -0400 |
26431 |
-+++ linux-2.6.38.3/drivers/ata/sata_sil24.c 2011-04-17 15:57:32.000000000 -0400 |
26432 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_sil24.c linux-2.6.38.4/drivers/ata/sata_sil24.c |
26433 |
+--- linux-2.6.38.4/drivers/ata/sata_sil24.c 2011-03-14 21:20:32.000000000 -0400 |
26434 |
++++ linux-2.6.38.4/drivers/ata/sata_sil24.c 2011-04-17 15:57:32.000000000 -0400 |
26435 |
@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s |
26436 |
.dma_boundary = ATA_DMA_BOUNDARY, |
26437 |
}; |
26438 |
@@ -23146,9 +22934,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sil24.c linux-2.6.38.3/drivers/ata/sa |
26439 |
.inherits = &sata_pmp_port_ops, |
26440 |
|
26441 |
.qc_defer = sil24_qc_defer, |
26442 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_sil.c linux-2.6.38.3/drivers/ata/sata_sil.c |
26443 |
---- linux-2.6.38.3/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 -0400 |
26444 |
-+++ linux-2.6.38.3/drivers/ata/sata_sil.c 2011-04-17 15:57:32.000000000 -0400 |
26445 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_sil.c linux-2.6.38.4/drivers/ata/sata_sil.c |
26446 |
+--- linux-2.6.38.4/drivers/ata/sata_sil.c 2011-03-14 21:20:32.000000000 -0400 |
26447 |
++++ linux-2.6.38.4/drivers/ata/sata_sil.c 2011-04-17 15:57:32.000000000 -0400 |
26448 |
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht |
26449 |
.sg_tablesize = ATA_MAX_PRD |
26450 |
}; |
26451 |
@@ -23158,9 +22946,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sil.c linux-2.6.38.3/drivers/ata/sata |
26452 |
.inherits = &ata_bmdma32_port_ops, |
26453 |
.dev_config = sil_dev_config, |
26454 |
.set_mode = sil_set_mode, |
26455 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_sis.c linux-2.6.38.3/drivers/ata/sata_sis.c |
26456 |
---- linux-2.6.38.3/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 -0400 |
26457 |
-+++ linux-2.6.38.3/drivers/ata/sata_sis.c 2011-04-17 15:57:32.000000000 -0400 |
26458 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_sis.c linux-2.6.38.4/drivers/ata/sata_sis.c |
26459 |
+--- linux-2.6.38.4/drivers/ata/sata_sis.c 2011-03-14 21:20:32.000000000 -0400 |
26460 |
++++ linux-2.6.38.4/drivers/ata/sata_sis.c 2011-04-17 15:57:32.000000000 -0400 |
26461 |
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht |
26462 |
ATA_BMDMA_SHT(DRV_NAME), |
26463 |
}; |
26464 |
@@ -23170,9 +22958,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sis.c linux-2.6.38.3/drivers/ata/sata |
26465 |
.inherits = &ata_bmdma_port_ops, |
26466 |
.scr_read = sis_scr_read, |
26467 |
.scr_write = sis_scr_write, |
26468 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_svw.c linux-2.6.38.3/drivers/ata/sata_svw.c |
26469 |
---- linux-2.6.38.3/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 -0400 |
26470 |
-+++ linux-2.6.38.3/drivers/ata/sata_svw.c 2011-04-17 15:57:32.000000000 -0400 |
26471 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_svw.c linux-2.6.38.4/drivers/ata/sata_svw.c |
26472 |
+--- linux-2.6.38.4/drivers/ata/sata_svw.c 2011-03-14 21:20:32.000000000 -0400 |
26473 |
++++ linux-2.6.38.4/drivers/ata/sata_svw.c 2011-04-17 15:57:32.000000000 -0400 |
26474 |
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata |
26475 |
}; |
26476 |
|
26477 |
@@ -23182,9 +22970,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_svw.c linux-2.6.38.3/drivers/ata/sata |
26478 |
.inherits = &ata_bmdma_port_ops, |
26479 |
.sff_tf_load = k2_sata_tf_load, |
26480 |
.sff_tf_read = k2_sata_tf_read, |
26481 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_sx4.c linux-2.6.38.3/drivers/ata/sata_sx4.c |
26482 |
---- linux-2.6.38.3/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 -0400 |
26483 |
-+++ linux-2.6.38.3/drivers/ata/sata_sx4.c 2011-04-17 15:57:32.000000000 -0400 |
26484 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_sx4.c linux-2.6.38.4/drivers/ata/sata_sx4.c |
26485 |
+--- linux-2.6.38.4/drivers/ata/sata_sx4.c 2011-03-14 21:20:32.000000000 -0400 |
26486 |
++++ linux-2.6.38.4/drivers/ata/sata_sx4.c 2011-04-17 15:57:32.000000000 -0400 |
26487 |
@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat |
26488 |
}; |
26489 |
|
26490 |
@@ -23194,9 +22982,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_sx4.c linux-2.6.38.3/drivers/ata/sata |
26491 |
.inherits = &ata_sff_port_ops, |
26492 |
|
26493 |
.check_atapi_dma = pdc_check_atapi_dma, |
26494 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_uli.c linux-2.6.38.3/drivers/ata/sata_uli.c |
26495 |
---- linux-2.6.38.3/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 -0400 |
26496 |
-+++ linux-2.6.38.3/drivers/ata/sata_uli.c 2011-04-17 15:57:32.000000000 -0400 |
26497 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_uli.c linux-2.6.38.4/drivers/ata/sata_uli.c |
26498 |
+--- linux-2.6.38.4/drivers/ata/sata_uli.c 2011-03-14 21:20:32.000000000 -0400 |
26499 |
++++ linux-2.6.38.4/drivers/ata/sata_uli.c 2011-04-17 15:57:32.000000000 -0400 |
26500 |
@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht |
26501 |
ATA_BMDMA_SHT(DRV_NAME), |
26502 |
}; |
26503 |
@@ -23206,9 +22994,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_uli.c linux-2.6.38.3/drivers/ata/sata |
26504 |
.inherits = &ata_bmdma_port_ops, |
26505 |
.scr_read = uli_scr_read, |
26506 |
.scr_write = uli_scr_write, |
26507 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_via.c linux-2.6.38.3/drivers/ata/sata_via.c |
26508 |
---- linux-2.6.38.3/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 -0400 |
26509 |
-+++ linux-2.6.38.3/drivers/ata/sata_via.c 2011-04-17 15:57:32.000000000 -0400 |
26510 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_via.c linux-2.6.38.4/drivers/ata/sata_via.c |
26511 |
+--- linux-2.6.38.4/drivers/ata/sata_via.c 2011-03-14 21:20:32.000000000 -0400 |
26512 |
++++ linux-2.6.38.4/drivers/ata/sata_via.c 2011-04-17 15:57:32.000000000 -0400 |
26513 |
@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh |
26514 |
ATA_BMDMA_SHT(DRV_NAME), |
26515 |
}; |
26516 |
@@ -23247,9 +23035,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_via.c linux-2.6.38.3/drivers/ata/sata |
26517 |
.inherits = &svia_base_ops, |
26518 |
.hardreset = sata_std_hardreset, |
26519 |
.scr_read = vt8251_scr_read, |
26520 |
-diff -urNp linux-2.6.38.3/drivers/ata/sata_vsc.c linux-2.6.38.3/drivers/ata/sata_vsc.c |
26521 |
---- linux-2.6.38.3/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 -0400 |
26522 |
-+++ linux-2.6.38.3/drivers/ata/sata_vsc.c 2011-04-17 15:57:32.000000000 -0400 |
26523 |
+diff -urNp linux-2.6.38.4/drivers/ata/sata_vsc.c linux-2.6.38.4/drivers/ata/sata_vsc.c |
26524 |
+--- linux-2.6.38.4/drivers/ata/sata_vsc.c 2011-03-14 21:20:32.000000000 -0400 |
26525 |
++++ linux-2.6.38.4/drivers/ata/sata_vsc.c 2011-04-17 15:57:32.000000000 -0400 |
26526 |
@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat |
26527 |
}; |
26528 |
|
26529 |
@@ -23259,9 +23047,9 @@ diff -urNp linux-2.6.38.3/drivers/ata/sata_vsc.c linux-2.6.38.3/drivers/ata/sata |
26530 |
.inherits = &ata_bmdma_port_ops, |
26531 |
/* The IRQ handling is not quite standard SFF behaviour so we |
26532 |
cannot use the default lost interrupt handler */ |
26533 |
-diff -urNp linux-2.6.38.3/drivers/atm/adummy.c linux-2.6.38.3/drivers/atm/adummy.c |
26534 |
---- linux-2.6.38.3/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0400 |
26535 |
-+++ linux-2.6.38.3/drivers/atm/adummy.c 2011-04-17 15:57:32.000000000 -0400 |
26536 |
+diff -urNp linux-2.6.38.4/drivers/atm/adummy.c linux-2.6.38.4/drivers/atm/adummy.c |
26537 |
+--- linux-2.6.38.4/drivers/atm/adummy.c 2011-03-14 21:20:32.000000000 -0400 |
26538 |
++++ linux-2.6.38.4/drivers/atm/adummy.c 2011-04-17 15:57:32.000000000 -0400 |
26539 |
@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct |
26540 |
vcc->pop(vcc, skb); |
26541 |
else |
26542 |
@@ -23271,9 +23059,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/adummy.c linux-2.6.38.3/drivers/atm/adummy |
26543 |
|
26544 |
return 0; |
26545 |
} |
26546 |
-diff -urNp linux-2.6.38.3/drivers/atm/ambassador.c linux-2.6.38.3/drivers/atm/ambassador.c |
26547 |
---- linux-2.6.38.3/drivers/atm/ambassador.c 2011-03-14 21:20:32.000000000 -0400 |
26548 |
-+++ linux-2.6.38.3/drivers/atm/ambassador.c 2011-04-17 15:57:32.000000000 -0400 |
26549 |
+diff -urNp linux-2.6.38.4/drivers/atm/ambassador.c linux-2.6.38.4/drivers/atm/ambassador.c |
26550 |
+--- linux-2.6.38.4/drivers/atm/ambassador.c 2011-03-14 21:20:32.000000000 -0400 |
26551 |
++++ linux-2.6.38.4/drivers/atm/ambassador.c 2011-04-17 15:57:32.000000000 -0400 |
26552 |
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, |
26553 |
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); |
26554 |
|
26555 |
@@ -23310,9 +23098,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/ambassador.c linux-2.6.38.3/drivers/atm/am |
26556 |
return -ENOMEM; // ? |
26557 |
} |
26558 |
|
26559 |
-diff -urNp linux-2.6.38.3/drivers/atm/atmtcp.c linux-2.6.38.3/drivers/atm/atmtcp.c |
26560 |
---- linux-2.6.38.3/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0400 |
26561 |
-+++ linux-2.6.38.3/drivers/atm/atmtcp.c 2011-04-17 15:57:32.000000000 -0400 |
26562 |
+diff -urNp linux-2.6.38.4/drivers/atm/atmtcp.c linux-2.6.38.4/drivers/atm/atmtcp.c |
26563 |
+--- linux-2.6.38.4/drivers/atm/atmtcp.c 2011-03-14 21:20:32.000000000 -0400 |
26564 |
++++ linux-2.6.38.4/drivers/atm/atmtcp.c 2011-04-17 15:57:32.000000000 -0400 |
26565 |
@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc |
26566 |
if (vcc->pop) vcc->pop(vcc,skb); |
26567 |
else dev_kfree_skb(skb); |
26568 |
@@ -23362,9 +23150,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/atmtcp.c linux-2.6.38.3/drivers/atm/atmtcp |
26569 |
done: |
26570 |
if (vcc->pop) vcc->pop(vcc,skb); |
26571 |
else dev_kfree_skb(skb); |
26572 |
-diff -urNp linux-2.6.38.3/drivers/atm/eni.c linux-2.6.38.3/drivers/atm/eni.c |
26573 |
---- linux-2.6.38.3/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400 |
26574 |
-+++ linux-2.6.38.3/drivers/atm/eni.c 2011-04-17 15:57:32.000000000 -0400 |
26575 |
+diff -urNp linux-2.6.38.4/drivers/atm/eni.c linux-2.6.38.4/drivers/atm/eni.c |
26576 |
+--- linux-2.6.38.4/drivers/atm/eni.c 2011-03-14 21:20:32.000000000 -0400 |
26577 |
++++ linux-2.6.38.4/drivers/atm/eni.c 2011-04-17 15:57:32.000000000 -0400 |
26578 |
@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc) |
26579 |
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", |
26580 |
vcc->dev->number); |
26581 |
@@ -23410,9 +23198,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/eni.c linux-2.6.38.3/drivers/atm/eni.c |
26582 |
wake_up(&eni_dev->tx_wait); |
26583 |
dma_complete++; |
26584 |
} |
26585 |
-diff -urNp linux-2.6.38.3/drivers/atm/firestream.c linux-2.6.38.3/drivers/atm/firestream.c |
26586 |
---- linux-2.6.38.3/drivers/atm/firestream.c 2011-03-14 21:20:32.000000000 -0400 |
26587 |
-+++ linux-2.6.38.3/drivers/atm/firestream.c 2011-04-17 15:57:32.000000000 -0400 |
26588 |
+diff -urNp linux-2.6.38.4/drivers/atm/firestream.c linux-2.6.38.4/drivers/atm/firestream.c |
26589 |
+--- linux-2.6.38.4/drivers/atm/firestream.c 2011-03-14 21:20:32.000000000 -0400 |
26590 |
++++ linux-2.6.38.4/drivers/atm/firestream.c 2011-04-17 15:57:32.000000000 -0400 |
26591 |
@@ -749,7 +749,7 @@ static void process_txdone_queue (struct |
26592 |
} |
26593 |
} |
26594 |
@@ -23446,9 +23234,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/firestream.c linux-2.6.38.3/drivers/atm/fi |
26595 |
break; |
26596 |
default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ |
26597 |
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", |
26598 |
-diff -urNp linux-2.6.38.3/drivers/atm/fore200e.c linux-2.6.38.3/drivers/atm/fore200e.c |
26599 |
---- linux-2.6.38.3/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 -0400 |
26600 |
-+++ linux-2.6.38.3/drivers/atm/fore200e.c 2011-04-17 15:57:32.000000000 -0400 |
26601 |
+diff -urNp linux-2.6.38.4/drivers/atm/fore200e.c linux-2.6.38.4/drivers/atm/fore200e.c |
26602 |
+--- linux-2.6.38.4/drivers/atm/fore200e.c 2011-03-14 21:20:32.000000000 -0400 |
26603 |
++++ linux-2.6.38.4/drivers/atm/fore200e.c 2011-04-17 15:57:32.000000000 -0400 |
26604 |
@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200 |
26605 |
#endif |
26606 |
/* check error condition */ |
26607 |
@@ -23505,9 +23293,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/fore200e.c linux-2.6.38.3/drivers/atm/fore |
26608 |
|
26609 |
fore200e->tx_sat++; |
26610 |
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", |
26611 |
-diff -urNp linux-2.6.38.3/drivers/atm/he.c linux-2.6.38.3/drivers/atm/he.c |
26612 |
---- linux-2.6.38.3/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400 |
26613 |
-+++ linux-2.6.38.3/drivers/atm/he.c 2011-04-17 15:57:32.000000000 -0400 |
26614 |
+diff -urNp linux-2.6.38.4/drivers/atm/he.c linux-2.6.38.4/drivers/atm/he.c |
26615 |
+--- linux-2.6.38.4/drivers/atm/he.c 2011-03-14 21:20:32.000000000 -0400 |
26616 |
++++ linux-2.6.38.4/drivers/atm/he.c 2011-04-17 15:57:32.000000000 -0400 |
26617 |
@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i |
26618 |
|
26619 |
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { |
26620 |
@@ -23589,9 +23377,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/he.c linux-2.6.38.3/drivers/atm/he.c |
26621 |
|
26622 |
return 0; |
26623 |
} |
26624 |
-diff -urNp linux-2.6.38.3/drivers/atm/horizon.c linux-2.6.38.3/drivers/atm/horizon.c |
26625 |
---- linux-2.6.38.3/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -0400 |
26626 |
-+++ linux-2.6.38.3/drivers/atm/horizon.c 2011-04-17 15:57:32.000000000 -0400 |
26627 |
+diff -urNp linux-2.6.38.4/drivers/atm/horizon.c linux-2.6.38.4/drivers/atm/horizon.c |
26628 |
+--- linux-2.6.38.4/drivers/atm/horizon.c 2011-03-14 21:20:32.000000000 -0400 |
26629 |
++++ linux-2.6.38.4/drivers/atm/horizon.c 2011-04-17 15:57:32.000000000 -0400 |
26630 |
@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, |
26631 |
{ |
26632 |
struct atm_vcc * vcc = ATM_SKB(skb)->vcc; |
26633 |
@@ -23610,9 +23398,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/horizon.c linux-2.6.38.3/drivers/atm/horiz |
26634 |
|
26635 |
// free the skb |
26636 |
hrz_kfree_skb (skb); |
26637 |
-diff -urNp linux-2.6.38.3/drivers/atm/idt77252.c linux-2.6.38.3/drivers/atm/idt77252.c |
26638 |
---- linux-2.6.38.3/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 -0400 |
26639 |
-+++ linux-2.6.38.3/drivers/atm/idt77252.c 2011-04-17 15:57:32.000000000 -0400 |
26640 |
+diff -urNp linux-2.6.38.4/drivers/atm/idt77252.c linux-2.6.38.4/drivers/atm/idt77252.c |
26641 |
+--- linux-2.6.38.4/drivers/atm/idt77252.c 2011-03-14 21:20:32.000000000 -0400 |
26642 |
++++ linux-2.6.38.4/drivers/atm/idt77252.c 2011-04-17 15:57:32.000000000 -0400 |
26643 |
@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str |
26644 |
else |
26645 |
dev_kfree_skb(skb); |
26646 |
@@ -23767,9 +23555,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/idt77252.c linux-2.6.38.3/drivers/atm/idt7 |
26647 |
return -ENOMEM; |
26648 |
} |
26649 |
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); |
26650 |
-diff -urNp linux-2.6.38.3/drivers/atm/iphase.c linux-2.6.38.3/drivers/atm/iphase.c |
26651 |
---- linux-2.6.38.3/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0400 |
26652 |
-+++ linux-2.6.38.3/drivers/atm/iphase.c 2011-04-17 15:57:32.000000000 -0400 |
26653 |
+diff -urNp linux-2.6.38.4/drivers/atm/iphase.c linux-2.6.38.4/drivers/atm/iphase.c |
26654 |
+--- linux-2.6.38.4/drivers/atm/iphase.c 2011-03-14 21:20:32.000000000 -0400 |
26655 |
++++ linux-2.6.38.4/drivers/atm/iphase.c 2011-04-17 15:57:32.000000000 -0400 |
26656 |
@@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev) |
26657 |
status = (u_short) (buf_desc_ptr->desc_mode); |
26658 |
if (status & (RX_CER | RX_PTE | RX_OFL)) |
26659 |
@@ -23866,9 +23654,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/iphase.c linux-2.6.38.3/drivers/atm/iphase |
26660 |
if (iavcc->vc_desc_cnt > 10) { |
26661 |
vcc->tx_quota = vcc->tx_quota * 3 / 4; |
26662 |
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); |
26663 |
-diff -urNp linux-2.6.38.3/drivers/atm/lanai.c linux-2.6.38.3/drivers/atm/lanai.c |
26664 |
---- linux-2.6.38.3/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -0400 |
26665 |
-+++ linux-2.6.38.3/drivers/atm/lanai.c 2011-04-17 15:57:32.000000000 -0400 |
26666 |
+diff -urNp linux-2.6.38.4/drivers/atm/lanai.c linux-2.6.38.4/drivers/atm/lanai.c |
26667 |
+--- linux-2.6.38.4/drivers/atm/lanai.c 2011-03-14 21:20:32.000000000 -0400 |
26668 |
++++ linux-2.6.38.4/drivers/atm/lanai.c 2011-04-17 15:57:32.000000000 -0400 |
26669 |
@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l |
26670 |
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); |
26671 |
lanai_endtx(lanai, lvcc); |
26672 |
@@ -23923,9 +23711,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/lanai.c linux-2.6.38.3/drivers/atm/lanai.c |
26673 |
lvcc->stats.x.aal5.service_rxcrc++; |
26674 |
lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; |
26675 |
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); |
26676 |
-diff -urNp linux-2.6.38.3/drivers/atm/nicstar.c linux-2.6.38.3/drivers/atm/nicstar.c |
26677 |
---- linux-2.6.38.3/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -0400 |
26678 |
-+++ linux-2.6.38.3/drivers/atm/nicstar.c 2011-04-17 15:57:32.000000000 -0400 |
26679 |
+diff -urNp linux-2.6.38.4/drivers/atm/nicstar.c linux-2.6.38.4/drivers/atm/nicstar.c |
26680 |
+--- linux-2.6.38.4/drivers/atm/nicstar.c 2011-03-14 21:20:32.000000000 -0400 |
26681 |
++++ linux-2.6.38.4/drivers/atm/nicstar.c 2011-04-17 15:57:32.000000000 -0400 |
26682 |
@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, |
26683 |
if ((vc = (vc_map *) vcc->dev_data) == NULL) { |
26684 |
printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", |
26685 |
@@ -24127,9 +23915,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/nicstar.c linux-2.6.38.3/drivers/atm/nicst |
26686 |
} |
26687 |
} |
26688 |
|
26689 |
-diff -urNp linux-2.6.38.3/drivers/atm/solos-pci.c linux-2.6.38.3/drivers/atm/solos-pci.c |
26690 |
---- linux-2.6.38.3/drivers/atm/solos-pci.c 2011-04-18 17:27:18.000000000 -0400 |
26691 |
-+++ linux-2.6.38.3/drivers/atm/solos-pci.c 2011-04-17 16:53:16.000000000 -0400 |
26692 |
+diff -urNp linux-2.6.38.4/drivers/atm/solos-pci.c linux-2.6.38.4/drivers/atm/solos-pci.c |
26693 |
+--- linux-2.6.38.4/drivers/atm/solos-pci.c 2011-04-18 17:27:18.000000000 -0400 |
26694 |
++++ linux-2.6.38.4/drivers/atm/solos-pci.c 2011-04-17 16:53:16.000000000 -0400 |
26695 |
@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg) |
26696 |
} |
26697 |
atm_charge(vcc, skb->truesize); |
26698 |
@@ -24148,9 +23936,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/solos-pci.c linux-2.6.38.3/drivers/atm/sol |
26699 |
solos_pop(vcc, oldskb); |
26700 |
} else |
26701 |
dev_kfree_skb_irq(oldskb); |
26702 |
-diff -urNp linux-2.6.38.3/drivers/atm/suni.c linux-2.6.38.3/drivers/atm/suni.c |
26703 |
---- linux-2.6.38.3/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -0400 |
26704 |
-+++ linux-2.6.38.3/drivers/atm/suni.c 2011-04-17 15:57:32.000000000 -0400 |
26705 |
+diff -urNp linux-2.6.38.4/drivers/atm/suni.c linux-2.6.38.4/drivers/atm/suni.c |
26706 |
+--- linux-2.6.38.4/drivers/atm/suni.c 2011-03-14 21:20:32.000000000 -0400 |
26707 |
++++ linux-2.6.38.4/drivers/atm/suni.c 2011-04-17 15:57:32.000000000 -0400 |
26708 |
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock); |
26709 |
|
26710 |
|
26711 |
@@ -24162,9 +23950,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/suni.c linux-2.6.38.3/drivers/atm/suni.c |
26712 |
|
26713 |
|
26714 |
static void suni_hz(unsigned long from_timer) |
26715 |
-diff -urNp linux-2.6.38.3/drivers/atm/uPD98402.c linux-2.6.38.3/drivers/atm/uPD98402.c |
26716 |
---- linux-2.6.38.3/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 -0400 |
26717 |
-+++ linux-2.6.38.3/drivers/atm/uPD98402.c 2011-04-17 15:57:32.000000000 -0400 |
26718 |
+diff -urNp linux-2.6.38.4/drivers/atm/uPD98402.c linux-2.6.38.4/drivers/atm/uPD98402.c |
26719 |
+--- linux-2.6.38.4/drivers/atm/uPD98402.c 2011-03-14 21:20:32.000000000 -0400 |
26720 |
++++ linux-2.6.38.4/drivers/atm/uPD98402.c 2011-04-17 15:57:32.000000000 -0400 |
26721 |
@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d |
26722 |
struct sonet_stats tmp; |
26723 |
int error = 0; |
26724 |
@@ -24209,9 +23997,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/uPD98402.c linux-2.6.38.3/drivers/atm/uPD9 |
26725 |
return 0; |
26726 |
} |
26727 |
|
26728 |
-diff -urNp linux-2.6.38.3/drivers/atm/zatm.c linux-2.6.38.3/drivers/atm/zatm.c |
26729 |
---- linux-2.6.38.3/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -0400 |
26730 |
-+++ linux-2.6.38.3/drivers/atm/zatm.c 2011-04-17 15:57:32.000000000 -0400 |
26731 |
+diff -urNp linux-2.6.38.4/drivers/atm/zatm.c linux-2.6.38.4/drivers/atm/zatm.c |
26732 |
+--- linux-2.6.38.4/drivers/atm/zatm.c 2011-03-14 21:20:32.000000000 -0400 |
26733 |
++++ linux-2.6.38.4/drivers/atm/zatm.c 2011-04-17 15:57:32.000000000 -0400 |
26734 |
@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy |
26735 |
} |
26736 |
if (!size) { |
26737 |
@@ -24239,9 +24027,9 @@ diff -urNp linux-2.6.38.3/drivers/atm/zatm.c linux-2.6.38.3/drivers/atm/zatm.c |
26738 |
wake_up(&zatm_vcc->tx_wait); |
26739 |
} |
26740 |
|
26741 |
-diff -urNp linux-2.6.38.3/drivers/block/cciss.c linux-2.6.38.3/drivers/block/cciss.c |
26742 |
---- linux-2.6.38.3/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -0400 |
26743 |
-+++ linux-2.6.38.3/drivers/block/cciss.c 2011-04-17 15:57:32.000000000 -0400 |
26744 |
+diff -urNp linux-2.6.38.4/drivers/block/cciss.c linux-2.6.38.4/drivers/block/cciss.c |
26745 |
+--- linux-2.6.38.4/drivers/block/cciss.c 2011-03-14 21:20:32.000000000 -0400 |
26746 |
++++ linux-2.6.38.4/drivers/block/cciss.c 2011-04-17 15:57:32.000000000 -0400 |
26747 |
@@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct |
26748 |
int err; |
26749 |
u32 cp; |
26750 |
@@ -24251,9 +24039,9 @@ diff -urNp linux-2.6.38.3/drivers/block/cciss.c linux-2.6.38.3/drivers/block/cci |
26751 |
err = 0; |
26752 |
err |= |
26753 |
copy_from_user(&arg64.LUN_info, &arg32->LUN_info, |
26754 |
-diff -urNp linux-2.6.38.3/drivers/char/agp/frontend.c linux-2.6.38.3/drivers/char/agp/frontend.c |
26755 |
---- linux-2.6.38.3/drivers/char/agp/frontend.c 2011-03-14 21:20:32.000000000 -0400 |
26756 |
-+++ linux-2.6.38.3/drivers/char/agp/frontend.c 2011-04-17 15:57:32.000000000 -0400 |
26757 |
+diff -urNp linux-2.6.38.4/drivers/char/agp/frontend.c linux-2.6.38.4/drivers/char/agp/frontend.c |
26758 |
+--- linux-2.6.38.4/drivers/char/agp/frontend.c 2011-03-14 21:20:32.000000000 -0400 |
26759 |
++++ linux-2.6.38.4/drivers/char/agp/frontend.c 2011-04-17 15:57:32.000000000 -0400 |
26760 |
@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag |
26761 |
if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) |
26762 |
return -EFAULT; |
26763 |
@@ -24263,21 +24051,70 @@ diff -urNp linux-2.6.38.3/drivers/char/agp/frontend.c linux-2.6.38.3/drivers/cha |
26764 |
return -EFAULT; |
26765 |
|
26766 |
client = agp_find_client_by_pid(reserve.pid); |
26767 |
-diff -urNp linux-2.6.38.3/drivers/char/agp/intel-agp.c linux-2.6.38.3/drivers/char/agp/intel-agp.c |
26768 |
---- linux-2.6.38.3/drivers/char/agp/intel-agp.c 2011-03-14 21:20:32.000000000 -0400 |
26769 |
-+++ linux-2.6.38.3/drivers/char/agp/intel-agp.c 2011-04-17 15:57:32.000000000 -0400 |
26770 |
-@@ -903,7 +903,7 @@ static struct pci_device_id agp_intel_pc |
26771 |
- ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB), |
26772 |
- ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB), |
26773 |
- ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB), |
26774 |
-- { } |
26775 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
26776 |
- }; |
26777 |
+diff -urNp linux-2.6.38.4/drivers/char/agp/generic.c linux-2.6.38.4/drivers/char/agp/generic.c |
26778 |
+--- linux-2.6.38.4/drivers/char/agp/generic.c 2011-03-14 21:20:32.000000000 -0400 |
26779 |
++++ linux-2.6.38.4/drivers/char/agp/generic.c 2011-04-22 19:37:16.000000000 -0400 |
26780 |
+@@ -115,6 +115,9 @@ static struct agp_memory *agp_create_use |
26781 |
+ struct agp_memory *new; |
26782 |
+ unsigned long alloc_size = num_agp_pages*sizeof(struct page *); |
26783 |
+ |
26784 |
++ if (INT_MAX/sizeof(struct page *) < num_agp_pages) |
26785 |
++ return NULL; |
26786 |
++ |
26787 |
+ new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL); |
26788 |
+ if (new == NULL) |
26789 |
+ return NULL; |
26790 |
+@@ -234,11 +237,14 @@ struct agp_memory *agp_allocate_memory(s |
26791 |
+ int scratch_pages; |
26792 |
+ struct agp_memory *new; |
26793 |
+ size_t i; |
26794 |
++ int cur_memory; |
26795 |
|
26796 |
- MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); |
26797 |
-diff -urNp linux-2.6.38.3/drivers/char/briq_panel.c linux-2.6.38.3/drivers/char/briq_panel.c |
26798 |
---- linux-2.6.38.3/drivers/char/briq_panel.c 2011-03-14 21:20:32.000000000 -0400 |
26799 |
-+++ linux-2.6.38.3/drivers/char/briq_panel.c 2011-04-18 19:47:43.000000000 -0400 |
26800 |
+ if (!bridge) |
26801 |
+ return NULL; |
26802 |
+ |
26803 |
+- if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->max_memory_agp) |
26804 |
++ cur_memory = atomic_read(&bridge->current_memory_agp); |
26805 |
++ if ((cur_memory + page_count > bridge->max_memory_agp) || |
26806 |
++ (cur_memory + page_count < page_count)) |
26807 |
+ return NULL; |
26808 |
+ |
26809 |
+ if (type >= AGP_USER_TYPES) { |
26810 |
+@@ -1089,8 +1095,8 @@ int agp_generic_insert_memory(struct agp |
26811 |
+ return -EINVAL; |
26812 |
+ } |
26813 |
+ |
26814 |
+- /* AK: could wrap */ |
26815 |
+- if ((pg_start + mem->page_count) > num_entries) |
26816 |
++ if (((pg_start + mem->page_count) > num_entries) || |
26817 |
++ ((pg_start + mem->page_count) < pg_start)) |
26818 |
+ return -EINVAL; |
26819 |
+ |
26820 |
+ j = pg_start; |
26821 |
+@@ -1124,7 +1130,7 @@ int agp_generic_remove_memory(struct agp |
26822 |
+ { |
26823 |
+ size_t i; |
26824 |
+ struct agp_bridge_data *bridge; |
26825 |
+- int mask_type; |
26826 |
++ int mask_type, num_entries; |
26827 |
+ |
26828 |
+ bridge = mem->bridge; |
26829 |
+ if (!bridge) |
26830 |
+@@ -1136,6 +1142,11 @@ int agp_generic_remove_memory(struct agp |
26831 |
+ if (type != mem->type) |
26832 |
+ return -EINVAL; |
26833 |
+ |
26834 |
++ num_entries = agp_num_entries(); |
26835 |
++ if (((pg_start + mem->page_count) > num_entries) || |
26836 |
++ ((pg_start + mem->page_count) < pg_start)) |
26837 |
++ return -EINVAL; |
26838 |
++ |
26839 |
+ mask_type = bridge->driver->agp_type_to_mask_type(bridge, type); |
26840 |
+ if (mask_type != 0) { |
26841 |
+ /* The generic routines know nothing of memory types */ |
26842 |
+diff -urNp linux-2.6.38.4/drivers/char/briq_panel.c linux-2.6.38.4/drivers/char/briq_panel.c |
26843 |
+--- linux-2.6.38.4/drivers/char/briq_panel.c 2011-03-14 21:20:32.000000000 -0400 |
26844 |
++++ linux-2.6.38.4/drivers/char/briq_panel.c 2011-04-18 19:47:43.000000000 -0400 |
26845 |
@@ -9,6 +9,7 @@ |
26846 |
#include <linux/types.h> |
26847 |
#include <linux/errno.h> |
26848 |
@@ -24319,20 +24156,20 @@ diff -urNp linux-2.6.38.3/drivers/char/briq_panel.c linux-2.6.38.3/drivers/char/ |
26849 |
|
26850 |
return len; |
26851 |
} |
26852 |
-diff -urNp linux-2.6.38.3/drivers/char/genrtc.c linux-2.6.38.3/drivers/char/genrtc.c |
26853 |
---- linux-2.6.38.3/drivers/char/genrtc.c 2011-03-14 21:20:32.000000000 -0400 |
26854 |
-+++ linux-2.6.38.3/drivers/char/genrtc.c 2011-04-18 19:43:14.000000000 -0400 |
26855 |
+diff -urNp linux-2.6.38.4/drivers/char/genrtc.c linux-2.6.38.4/drivers/char/genrtc.c |
26856 |
+--- linux-2.6.38.4/drivers/char/genrtc.c 2011-03-14 21:20:32.000000000 -0400 |
26857 |
++++ linux-2.6.38.4/drivers/char/genrtc.c 2011-04-21 16:55:16.000000000 -0400 |
26858 |
@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi |
26859 |
switch (cmd) { |
26860 |
|
26861 |
case RTC_PLL_GET: |
26862 |
-+ memset(&pll, 0, sizeof(pll); |
26863 |
++ memset(&pll, 0, sizeof(pll)); |
26864 |
if (get_rtc_pll(&pll)) |
26865 |
return -EINVAL; |
26866 |
else |
26867 |
-diff -urNp linux-2.6.38.3/drivers/char/hpet.c linux-2.6.38.3/drivers/char/hpet.c |
26868 |
---- linux-2.6.38.3/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -0400 |
26869 |
-+++ linux-2.6.38.3/drivers/char/hpet.c 2011-04-17 15:57:32.000000000 -0400 |
26870 |
+diff -urNp linux-2.6.38.4/drivers/char/hpet.c linux-2.6.38.4/drivers/char/hpet.c |
26871 |
+--- linux-2.6.38.4/drivers/char/hpet.c 2011-03-14 21:20:32.000000000 -0400 |
26872 |
++++ linux-2.6.38.4/drivers/char/hpet.c 2011-04-23 12:47:28.000000000 -0400 |
26873 |
@@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di |
26874 |
} |
26875 |
|
26876 |
@@ -24342,18 +24179,9 @@ diff -urNp linux-2.6.38.3/drivers/char/hpet.c linux-2.6.38.3/drivers/char/hpet.c |
26877 |
struct hpet_info *info) |
26878 |
{ |
26879 |
struct hpet_timer __iomem *timer; |
26880 |
-@@ -1043,7 +1043,7 @@ static struct acpi_driver hpet_acpi_driv |
26881 |
- }, |
26882 |
- }; |
26883 |
- |
26884 |
--static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops }; |
26885 |
-+static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops, {NULL, NULL}, NULL, NULL }; |
26886 |
- |
26887 |
- static int __init hpet_init(void) |
26888 |
- { |
26889 |
-diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c |
26890 |
---- linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:32.000000000 -0400 |
26891 |
-+++ linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:57:32.000000000 -0400 |
26892 |
+diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c |
26893 |
+--- linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c 2011-03-14 21:20:32.000000000 -0400 |
26894 |
++++ linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c 2011-04-17 15:57:32.000000000 -0400 |
26895 |
@@ -414,7 +414,7 @@ struct ipmi_smi { |
26896 |
struct proc_dir_entry *proc_dir; |
26897 |
char proc_dir_name[10]; |
26898 |
@@ -24384,9 +24212,9 @@ diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.3/dri |
26899 |
|
26900 |
intf->proc_dir = NULL; |
26901 |
|
26902 |
-diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c |
26903 |
---- linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.000000000 -0400 |
26904 |
-+++ linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:57:32.000000000 -0400 |
26905 |
+diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c |
26906 |
+--- linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c 2011-03-14 21:20:32.000000000 -0400 |
26907 |
++++ linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:57:32.000000000 -0400 |
26908 |
@@ -285,7 +285,7 @@ struct smi_info { |
26909 |
unsigned char slave_addr; |
26910 |
|
26911 |
@@ -24417,9 +24245,9 @@ diff -urNp linux-2.6.38.3/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.3/driver |
26912 |
|
26913 |
new_smi->interrupt_disabled = 1; |
26914 |
atomic_set(&new_smi->stop_operation, 0); |
26915 |
-diff -urNp linux-2.6.38.3/drivers/char/istallion.c linux-2.6.38.3/drivers/char/istallion.c |
26916 |
---- linux-2.6.38.3/drivers/char/istallion.c 2011-03-14 21:20:32.000000000 -0400 |
26917 |
-+++ linux-2.6.38.3/drivers/char/istallion.c 2011-04-18 19:42:25.000000000 -0400 |
26918 |
+diff -urNp linux-2.6.38.4/drivers/char/istallion.c linux-2.6.38.4/drivers/char/istallion.c |
26919 |
+--- linux-2.6.38.4/drivers/char/istallion.c 2011-03-14 21:20:32.000000000 -0400 |
26920 |
++++ linux-2.6.38.4/drivers/char/istallion.c 2011-04-18 19:42:25.000000000 -0400 |
26921 |
@@ -186,7 +186,6 @@ static struct ktermios stli_deftermios |
26922 |
* re-used for each stats call. |
26923 |
*/ |
26924 |
@@ -24436,9 +24264,9 @@ diff -urNp linux-2.6.38.3/drivers/char/istallion.c linux-2.6.38.3/drivers/char/i |
26925 |
|
26926 |
if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) |
26927 |
return -EFAULT; |
26928 |
-diff -urNp linux-2.6.38.3/drivers/char/Kconfig linux-2.6.38.3/drivers/char/Kconfig |
26929 |
---- linux-2.6.38.3/drivers/char/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
26930 |
-+++ linux-2.6.38.3/drivers/char/Kconfig 2011-04-18 19:19:48.000000000 -0400 |
26931 |
+diff -urNp linux-2.6.38.4/drivers/char/Kconfig linux-2.6.38.4/drivers/char/Kconfig |
26932 |
+--- linux-2.6.38.4/drivers/char/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
26933 |
++++ linux-2.6.38.4/drivers/char/Kconfig 2011-04-18 19:19:48.000000000 -0400 |
26934 |
@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING |
26935 |
|
26936 |
config DEVKMEM |
26937 |
@@ -24457,9 +24285,9 @@ diff -urNp linux-2.6.38.3/drivers/char/Kconfig linux-2.6.38.3/drivers/char/Kconf |
26938 |
default y |
26939 |
|
26940 |
source "drivers/s390/char/Kconfig" |
26941 |
-diff -urNp linux-2.6.38.3/drivers/char/mem.c linux-2.6.38.3/drivers/char/mem.c |
26942 |
---- linux-2.6.38.3/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -0400 |
26943 |
-+++ linux-2.6.38.3/drivers/char/mem.c 2011-04-17 15:57:32.000000000 -0400 |
26944 |
+diff -urNp linux-2.6.38.4/drivers/char/mem.c linux-2.6.38.4/drivers/char/mem.c |
26945 |
+--- linux-2.6.38.4/drivers/char/mem.c 2011-03-14 21:20:32.000000000 -0400 |
26946 |
++++ linux-2.6.38.4/drivers/char/mem.c 2011-04-17 15:57:32.000000000 -0400 |
26947 |
@@ -18,6 +18,7 @@ |
26948 |
#include <linux/raw.h> |
26949 |
#include <linux/tty.h> |
26950 |
@@ -24592,9 +24420,9 @@ diff -urNp linux-2.6.38.3/drivers/char/mem.c linux-2.6.38.3/drivers/char/mem.c |
26951 |
}; |
26952 |
|
26953 |
static int memory_open(struct inode *inode, struct file *filp) |
26954 |
-diff -urNp linux-2.6.38.3/drivers/char/nvram.c linux-2.6.38.3/drivers/char/nvram.c |
26955 |
---- linux-2.6.38.3/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0400 |
26956 |
-+++ linux-2.6.38.3/drivers/char/nvram.c 2011-04-17 15:57:32.000000000 -0400 |
26957 |
+diff -urNp linux-2.6.38.4/drivers/char/nvram.c linux-2.6.38.4/drivers/char/nvram.c |
26958 |
+--- linux-2.6.38.4/drivers/char/nvram.c 2011-03-14 21:20:32.000000000 -0400 |
26959 |
++++ linux-2.6.38.4/drivers/char/nvram.c 2011-04-23 12:47:28.000000000 -0400 |
26960 |
@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f |
26961 |
|
26962 |
spin_unlock_irq(&rtc_lock); |
26963 |
@@ -24604,21 +24432,9 @@ diff -urNp linux-2.6.38.3/drivers/char/nvram.c linux-2.6.38.3/drivers/char/nvram |
26964 |
return -EFAULT; |
26965 |
|
26966 |
*ppos = i; |
26967 |
-@@ -435,7 +435,10 @@ static const struct file_operations nvra |
26968 |
- static struct miscdevice nvram_dev = { |
26969 |
- NVRAM_MINOR, |
26970 |
- "nvram", |
26971 |
-- &nvram_fops |
26972 |
-+ &nvram_fops, |
26973 |
-+ {NULL, NULL}, |
26974 |
-+ NULL, |
26975 |
-+ NULL |
26976 |
- }; |
26977 |
- |
26978 |
- static int __init nvram_init(void) |
26979 |
-diff -urNp linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c |
26980 |
---- linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20:32.000000000 -0400 |
26981 |
-+++ linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:57:32.000000000 -0400 |
26982 |
+diff -urNp linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c |
26983 |
+--- linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c 2011-03-14 21:20:32.000000000 -0400 |
26984 |
++++ linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:57:32.000000000 -0400 |
26985 |
@@ -29,6 +29,7 @@ |
26986 |
#include <linux/tty_driver.h> |
26987 |
#include <linux/tty_flip.h> |
26988 |
@@ -24741,9 +24557,9 @@ diff -urNp linux-2.6.38.3/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.3/dr |
26989 |
do_ipw_close(ttyj); |
26990 |
ipwireless_disassociate_network_ttys(network, |
26991 |
ttyj->channel_idx); |
26992 |
-diff -urNp linux-2.6.38.3/drivers/char/random.c linux-2.6.38.3/drivers/char/random.c |
26993 |
---- linux-2.6.38.3/drivers/char/random.c 2011-03-14 21:20:32.000000000 -0400 |
26994 |
-+++ linux-2.6.38.3/drivers/char/random.c 2011-04-17 15:57:32.000000000 -0400 |
26995 |
+diff -urNp linux-2.6.38.4/drivers/char/random.c linux-2.6.38.4/drivers/char/random.c |
26996 |
+--- linux-2.6.38.4/drivers/char/random.c 2011-03-14 21:20:32.000000000 -0400 |
26997 |
++++ linux-2.6.38.4/drivers/char/random.c 2011-04-17 15:57:32.000000000 -0400 |
26998 |
@@ -254,8 +254,13 @@ |
26999 |
/* |
27000 |
* Configuration information |
27001 |
@@ -24794,9 +24610,9 @@ diff -urNp linux-2.6.38.3/drivers/char/random.c linux-2.6.38.3/drivers/char/rand |
27002 |
static int max_write_thresh = INPUT_POOL_WORDS * 32; |
27003 |
static char sysctl_bootid[16]; |
27004 |
|
27005 |
-diff -urNp linux-2.6.38.3/drivers/char/sonypi.c linux-2.6.38.3/drivers/char/sonypi.c |
27006 |
---- linux-2.6.38.3/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -0400 |
27007 |
-+++ linux-2.6.38.3/drivers/char/sonypi.c 2011-04-17 15:57:32.000000000 -0400 |
27008 |
+diff -urNp linux-2.6.38.4/drivers/char/sonypi.c linux-2.6.38.4/drivers/char/sonypi.c |
27009 |
+--- linux-2.6.38.4/drivers/char/sonypi.c 2011-03-14 21:20:32.000000000 -0400 |
27010 |
++++ linux-2.6.38.4/drivers/char/sonypi.c 2011-04-17 15:57:32.000000000 -0400 |
27011 |
@@ -55,6 +55,7 @@ |
27012 |
#include <asm/uaccess.h> |
27013 |
#include <asm/io.h> |
27014 |
@@ -24835,9 +24651,9 @@ diff -urNp linux-2.6.38.3/drivers/char/sonypi.c linux-2.6.38.3/drivers/char/sony |
27015 |
mutex_unlock(&sonypi_device.lock); |
27016 |
|
27017 |
return 0; |
27018 |
-diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm_bios.c linux-2.6.38.3/drivers/char/tpm/tpm_bios.c |
27019 |
---- linux-2.6.38.3/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.000000000 -0400 |
27020 |
-+++ linux-2.6.38.3/drivers/char/tpm/tpm_bios.c 2011-04-17 15:57:32.000000000 -0400 |
27021 |
+diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm_bios.c linux-2.6.38.4/drivers/char/tpm/tpm_bios.c |
27022 |
+--- linux-2.6.38.4/drivers/char/tpm/tpm_bios.c 2011-03-14 21:20:32.000000000 -0400 |
27023 |
++++ linux-2.6.38.4/drivers/char/tpm/tpm_bios.c 2011-04-17 15:57:32.000000000 -0400 |
27024 |
@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start |
27025 |
event = addr; |
27026 |
|
27027 |
@@ -24878,9 +24694,9 @@ diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm_bios.c linux-2.6.38.3/drivers/cha |
27028 |
|
27029 |
memcpy(log->bios_event_log, virt, len); |
27030 |
|
27031 |
-diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm.c linux-2.6.38.3/drivers/char/tpm/tpm.c |
27032 |
---- linux-2.6.38.3/drivers/char/tpm/tpm.c 2011-04-18 17:27:18.000000000 -0400 |
27033 |
-+++ linux-2.6.38.3/drivers/char/tpm/tpm.c 2011-04-17 16:53:16.000000000 -0400 |
27034 |
+diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm.c linux-2.6.38.4/drivers/char/tpm/tpm.c |
27035 |
+--- linux-2.6.38.4/drivers/char/tpm/tpm.c 2011-04-18 17:27:18.000000000 -0400 |
27036 |
++++ linux-2.6.38.4/drivers/char/tpm/tpm.c 2011-04-17 16:53:16.000000000 -0400 |
27037 |
@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c |
27038 |
chip->vendor.req_complete_val) |
27039 |
goto out_recv; |
27040 |
@@ -24890,9 +24706,9 @@ diff -urNp linux-2.6.38.3/drivers/char/tpm/tpm.c linux-2.6.38.3/drivers/char/tpm |
27041 |
dev_err(chip->dev, "Operation Canceled\n"); |
27042 |
rc = -ECANCELED; |
27043 |
goto out; |
27044 |
-diff -urNp linux-2.6.38.3/drivers/cpuidle/sysfs.c linux-2.6.38.3/drivers/cpuidle/sysfs.c |
27045 |
---- linux-2.6.38.3/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000 -0400 |
27046 |
-+++ linux-2.6.38.3/drivers/cpuidle/sysfs.c 2011-04-17 15:57:32.000000000 -0400 |
27047 |
+diff -urNp linux-2.6.38.4/drivers/cpuidle/sysfs.c linux-2.6.38.4/drivers/cpuidle/sysfs.c |
27048 |
+--- linux-2.6.38.4/drivers/cpuidle/sysfs.c 2011-03-14 21:20:32.000000000 -0400 |
27049 |
++++ linux-2.6.38.4/drivers/cpuidle/sysfs.c 2011-04-17 15:57:32.000000000 -0400 |
27050 |
@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui |
27051 |
.release = cpuidle_state_sysfs_release, |
27052 |
}; |
27053 |
@@ -24902,29 +24718,9 @@ diff -urNp linux-2.6.38.3/drivers/cpuidle/sysfs.c linux-2.6.38.3/drivers/cpuidle |
27054 |
{ |
27055 |
kobject_put(&device->kobjs[i]->kobj); |
27056 |
wait_for_completion(&device->kobjs[i]->kobj_unregister); |
27057 |
-diff -urNp linux-2.6.38.3/drivers/edac/edac_core.h linux-2.6.38.3/drivers/edac/edac_core.h |
27058 |
---- linux-2.6.38.3/drivers/edac/edac_core.h 2011-03-14 21:20:32.000000000 -0400 |
27059 |
-+++ linux-2.6.38.3/drivers/edac/edac_core.h 2011-04-17 15:57:32.000000000 -0400 |
27060 |
-@@ -88,11 +88,11 @@ extern int edac_debug_level; |
27061 |
- |
27062 |
- #else /* !CONFIG_EDAC_DEBUG */ |
27063 |
- |
27064 |
--#define debugf0( ... ) |
27065 |
--#define debugf1( ... ) |
27066 |
--#define debugf2( ... ) |
27067 |
--#define debugf3( ... ) |
27068 |
--#define debugf4( ... ) |
27069 |
-+#define debugf0( ... ) do {} while (0) |
27070 |
-+#define debugf1( ... ) do {} while (0) |
27071 |
-+#define debugf2( ... ) do {} while (0) |
27072 |
-+#define debugf3( ... ) do {} while (0) |
27073 |
-+#define debugf4( ... ) do {} while (0) |
27074 |
- |
27075 |
- #endif /* !CONFIG_EDAC_DEBUG */ |
27076 |
- |
27077 |
-diff -urNp linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c |
27078 |
---- linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.000000000 -0400 |
27079 |
-+++ linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:57:32.000000000 -0400 |
27080 |
+diff -urNp linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c |
27081 |
+--- linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c 2011-03-14 21:20:32.000000000 -0400 |
27082 |
++++ linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:57:32.000000000 -0400 |
27083 |
@@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct |
27084 |
} |
27085 |
|
27086 |
@@ -24934,9 +24730,9 @@ diff -urNp linux-2.6.38.3/drivers/edac/edac_mc_sysfs.c linux-2.6.38.3/drivers/ed |
27087 |
.show = inst_grp_show, |
27088 |
.store = inst_grp_store |
27089 |
}; |
27090 |
-diff -urNp linux-2.6.38.3/drivers/firewire/core-cdev.c linux-2.6.38.3/drivers/firewire/core-cdev.c |
27091 |
---- linux-2.6.38.3/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.000000000 -0400 |
27092 |
-+++ linux-2.6.38.3/drivers/firewire/core-cdev.c 2011-04-17 15:57:32.000000000 -0400 |
27093 |
+diff -urNp linux-2.6.38.4/drivers/firewire/core-cdev.c linux-2.6.38.4/drivers/firewire/core-cdev.c |
27094 |
+--- linux-2.6.38.4/drivers/firewire/core-cdev.c 2011-03-14 21:20:32.000000000 -0400 |
27095 |
++++ linux-2.6.38.4/drivers/firewire/core-cdev.c 2011-04-17 15:57:32.000000000 -0400 |
27096 |
@@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie |
27097 |
int ret; |
27098 |
|
27099 |
@@ -24947,9 +24743,9 @@ diff -urNp linux-2.6.38.3/drivers/firewire/core-cdev.c linux-2.6.38.3/drivers/fi |
27100 |
return -EINVAL; |
27101 |
|
27102 |
r = kmalloc(sizeof(*r), GFP_KERNEL); |
27103 |
-diff -urNp linux-2.6.38.3/drivers/firmware/dmi_scan.c linux-2.6.38.3/drivers/firmware/dmi_scan.c |
27104 |
---- linux-2.6.38.3/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.000000000 -0400 |
27105 |
-+++ linux-2.6.38.3/drivers/firmware/dmi_scan.c 2011-04-17 15:57:32.000000000 -0400 |
27106 |
+diff -urNp linux-2.6.38.4/drivers/firmware/dmi_scan.c linux-2.6.38.4/drivers/firmware/dmi_scan.c |
27107 |
+--- linux-2.6.38.4/drivers/firmware/dmi_scan.c 2011-03-14 21:20:32.000000000 -0400 |
27108 |
++++ linux-2.6.38.4/drivers/firmware/dmi_scan.c 2011-04-17 15:57:32.000000000 -0400 |
27109 |
@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void) |
27110 |
} |
27111 |
} |
27112 |
@@ -24962,9 +24758,9 @@ diff -urNp linux-2.6.38.3/drivers/firmware/dmi_scan.c linux-2.6.38.3/drivers/fir |
27113 |
p = dmi_ioremap(0xF0000, 0x10000); |
27114 |
if (p == NULL) |
27115 |
goto error; |
27116 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c |
27117 |
---- linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32.000000000 -0400 |
27118 |
-+++ linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:57:32.000000000 -0400 |
27119 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c |
27120 |
+--- linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c 2011-03-14 21:20:32.000000000 -0400 |
27121 |
++++ linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c 2011-04-17 15:57:32.000000000 -0400 |
27122 |
@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d |
27123 |
struct drm_crtc *tmp; |
27124 |
int crtc_mask = 1; |
27125 |
@@ -24974,9 +24770,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.3/drive |
27126 |
|
27127 |
dev = crtc->dev; |
27128 |
|
27129 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_drv.c linux-2.6.38.3/drivers/gpu/drm/drm_drv.c |
27130 |
---- linux-2.6.38.3/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.000000000 -0400 |
27131 |
-+++ linux-2.6.38.3/drivers/gpu/drm/drm_drv.c 2011-04-17 15:57:32.000000000 -0400 |
27132 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_drv.c linux-2.6.38.4/drivers/gpu/drm/drm_drv.c |
27133 |
+--- linux-2.6.38.4/drivers/gpu/drm/drm_drv.c 2011-03-14 21:20:32.000000000 -0400 |
27134 |
++++ linux-2.6.38.4/drivers/gpu/drm/drm_drv.c 2011-04-17 15:57:32.000000000 -0400 |
27135 |
@@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp, |
27136 |
|
27137 |
dev = file_priv->minor->dev; |
27138 |
@@ -24986,9 +24782,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_drv.c linux-2.6.38.3/drivers/gpu/d |
27139 |
++file_priv->ioctl_count; |
27140 |
|
27141 |
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", |
27142 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_fops.c linux-2.6.38.3/drivers/gpu/drm/drm_fops.c |
27143 |
---- linux-2.6.38.3/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000000 -0400 |
27144 |
-+++ linux-2.6.38.3/drivers/gpu/drm/drm_fops.c 2011-04-17 15:57:32.000000000 -0400 |
27145 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_fops.c linux-2.6.38.4/drivers/gpu/drm/drm_fops.c |
27146 |
+--- linux-2.6.38.4/drivers/gpu/drm/drm_fops.c 2011-03-14 21:20:32.000000000 -0400 |
27147 |
++++ linux-2.6.38.4/drivers/gpu/drm/drm_fops.c 2011-04-17 15:57:32.000000000 -0400 |
27148 |
@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * |
27149 |
} |
27150 |
|
27151 |
@@ -25038,9 +24834,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_fops.c linux-2.6.38.3/drivers/gpu/ |
27152 |
if (atomic_read(&dev->ioctl_count)) { |
27153 |
DRM_ERROR("Device busy: %d\n", |
27154 |
atomic_read(&dev->ioctl_count)); |
27155 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_global.c linux-2.6.38.3/drivers/gpu/drm/drm_global.c |
27156 |
---- linux-2.6.38.3/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.000000000 -0400 |
27157 |
-+++ linux-2.6.38.3/drivers/gpu/drm/drm_global.c 2011-04-17 15:57:32.000000000 -0400 |
27158 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_global.c linux-2.6.38.4/drivers/gpu/drm/drm_global.c |
27159 |
+--- linux-2.6.38.4/drivers/gpu/drm/drm_global.c 2011-03-14 21:20:32.000000000 -0400 |
27160 |
++++ linux-2.6.38.4/drivers/gpu/drm/drm_global.c 2011-04-17 15:57:32.000000000 -0400 |
27161 |
@@ -36,7 +36,7 @@ |
27162 |
struct drm_global_item { |
27163 |
struct mutex mutex; |
27164 |
@@ -25098,9 +24894,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_global.c linux-2.6.38.3/drivers/gp |
27165 |
ref->release(ref); |
27166 |
item->object = NULL; |
27167 |
} |
27168 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_info.c linux-2.6.38.3/drivers/gpu/drm/drm_info.c |
27169 |
---- linux-2.6.38.3/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000000 -0400 |
27170 |
-+++ linux-2.6.38.3/drivers/gpu/drm/drm_info.c 2011-04-17 15:57:32.000000000 -0400 |
27171 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_info.c linux-2.6.38.4/drivers/gpu/drm/drm_info.c |
27172 |
+--- linux-2.6.38.4/drivers/gpu/drm/drm_info.c 2011-03-14 21:20:32.000000000 -0400 |
27173 |
++++ linux-2.6.38.4/drivers/gpu/drm/drm_info.c 2011-04-17 15:57:32.000000000 -0400 |
27174 |
@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void |
27175 |
struct drm_local_map *map; |
27176 |
struct drm_map_list *r_list; |
27177 |
@@ -25141,9 +24937,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_info.c linux-2.6.38.3/drivers/gpu/ |
27178 |
|
27179 |
#if defined(__i386__) |
27180 |
pgprot = pgprot_val(vma->vm_page_prot); |
27181 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c |
27182 |
---- linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
27183 |
-+++ linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
27184 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c |
27185 |
+--- linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
27186 |
++++ linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
27187 |
@@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev, |
27188 |
stats->data[i].value = |
27189 |
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); |
27190 |
@@ -25153,9 +24949,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.3/drivers/gpu |
27191 |
stats->data[i].type = dev->types[i]; |
27192 |
} |
27193 |
|
27194 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_lock.c linux-2.6.38.3/drivers/gpu/drm/drm_lock.c |
27195 |
---- linux-2.6.38.3/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000000 -0400 |
27196 |
-+++ linux-2.6.38.3/drivers/gpu/drm/drm_lock.c 2011-04-17 15:57:32.000000000 -0400 |
27197 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_lock.c linux-2.6.38.4/drivers/gpu/drm/drm_lock.c |
27198 |
+--- linux-2.6.38.4/drivers/gpu/drm/drm_lock.c 2011-03-14 21:20:32.000000000 -0400 |
27199 |
++++ linux-2.6.38.4/drivers/gpu/drm/drm_lock.c 2011-04-17 15:57:32.000000000 -0400 |
27200 |
@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi |
27201 |
if (drm_lock_take(&master->lock, lock->context)) { |
27202 |
master->lock.file_priv = file_priv; |
27203 |
@@ -25174,9 +24970,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/drm_lock.c linux-2.6.38.3/drivers/gpu/ |
27204 |
|
27205 |
if (drm_lock_free(&master->lock, lock->context)) { |
27206 |
/* FIXME: Should really bail out here. */ |
27207 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c |
27208 |
---- linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.000000000 -0400 |
27209 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:57:32.000000000 -0400 |
27210 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c |
27211 |
+--- linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c 2011-03-14 21:20:32.000000000 -0400 |
27212 |
++++ linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:57:32.000000000 -0400 |
27213 |
@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de |
27214 |
dma->buflist[vertex->idx], |
27215 |
vertex->discard, vertex->used); |
27216 |
@@ -25199,9 +24995,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.3/drivers |
27217 |
sarea_priv->last_enqueue = dev_priv->counter - 1; |
27218 |
sarea_priv->last_dispatch = (int)hw_status[5]; |
27219 |
|
27220 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c |
27221 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32.000000000 -0400 |
27222 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:57:32.000000000 -0400 |
27223 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c |
27224 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-14 21:20:32.000000000 -0400 |
27225 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:57:32.000000000 -0400 |
27226 |
@@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_ |
27227 |
} |
27228 |
} |
27229 |
@@ -25211,9 +25007,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.3/drive |
27230 |
.init = ch7017_init, |
27231 |
.detect = ch7017_detect, |
27232 |
.mode_valid = ch7017_mode_valid, |
27233 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c |
27234 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32.000000000 -0400 |
27235 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:57:32.000000000 -0400 |
27236 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c |
27237 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-14 21:20:32.000000000 -0400 |
27238 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:57:32.000000000 -0400 |
27239 |
@@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_ |
27240 |
} |
27241 |
} |
27242 |
@@ -25223,9 +25019,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.3/drive |
27243 |
.init = ch7xxx_init, |
27244 |
.detect = ch7xxx_detect, |
27245 |
.mode_valid = ch7xxx_mode_valid, |
27246 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h |
27247 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000000 -0400 |
27248 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:57:32.000000000 -0400 |
27249 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h |
27250 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h 2011-03-14 21:20:32.000000000 -0400 |
27251 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:57:32.000000000 -0400 |
27252 |
@@ -122,23 +122,23 @@ struct intel_dvo_dev_ops { |
27253 |
* |
27254 |
* \return singly-linked list of modes or NULL if no modes found. |
27255 |
@@ -25258,9 +25054,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo.h linux-2.6.38.3/drivers/gpu/ |
27256 |
+extern const struct intel_dvo_dev_ops ch7017_ops; |
27257 |
|
27258 |
#endif /* _INTEL_DVO_H */ |
27259 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c |
27260 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.000000000 -0400 |
27261 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:57:32.000000000 -0400 |
27262 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c |
27263 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-14 21:20:32.000000000 -0400 |
27264 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:57:32.000000000 -0400 |
27265 |
@@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv |
27266 |
} |
27267 |
} |
27268 |
@@ -25270,9 +25066,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.3/drivers |
27269 |
.init = ivch_init, |
27270 |
.dpms = ivch_dpms, |
27271 |
.mode_valid = ivch_mode_valid, |
27272 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c |
27273 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32.000000000 -0400 |
27274 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:57:32.000000000 -0400 |
27275 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c |
27276 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-14 21:20:32.000000000 -0400 |
27277 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:57:32.000000000 -0400 |
27278 |
@@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_ |
27279 |
} |
27280 |
} |
27281 |
@@ -25282,9 +25078,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.3/drive |
27282 |
.init = sil164_init, |
27283 |
.detect = sil164_detect, |
27284 |
.mode_valid = sil164_mode_valid, |
27285 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c |
27286 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32.000000000 -0400 |
27287 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:57:32.000000000 -0400 |
27288 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c |
27289 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-14 21:20:32.000000000 -0400 |
27290 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:57:32.000000000 -0400 |
27291 |
@@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_ |
27292 |
} |
27293 |
} |
27294 |
@@ -25294,9 +25090,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.3/drive |
27295 |
.init = tfp410_init, |
27296 |
.detect = tfp410_detect, |
27297 |
.mode_valid = tfp410_mode_valid, |
27298 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c |
27299 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.000000000 -0400 |
27300 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c 2011-04-17 15:57:32.000000000 -0400 |
27301 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c |
27302 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c 2011-03-14 21:20:32.000000000 -0400 |
27303 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c 2011-04-17 15:57:32.000000000 -0400 |
27304 |
@@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(s |
27305 |
bool can_switch; |
27306 |
|
27307 |
@@ -25306,9 +25102,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.3/drivers |
27308 |
spin_unlock(&dev->count_lock); |
27309 |
return can_switch; |
27310 |
} |
27311 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c |
27312 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.000000000 -0400 |
27313 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:57:32.000000000 -0400 |
27314 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c |
27315 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c 2011-03-14 21:20:32.000000000 -0400 |
27316 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:57:32.000000000 -0400 |
27317 |
@@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_o |
27318 |
.restore = i915_pm_resume, |
27319 |
}; |
27320 |
@@ -25318,9 +25114,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.3/drivers |
27321 |
.fault = i915_gem_fault, |
27322 |
.open = drm_gem_vm_open, |
27323 |
.close = drm_gem_vm_close, |
27324 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h |
27325 |
---- linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h 2011-03-14 21:20:32.000000000 -0400 |
27326 |
-+++ linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h 2011-04-17 15:57:32.000000000 -0400 |
27327 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h |
27328 |
+--- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h 2011-03-14 21:20:32.000000000 -0400 |
27329 |
++++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h 2011-04-17 15:57:32.000000000 -0400 |
27330 |
@@ -1229,7 +1229,7 @@ extern int intel_setup_gmbus(struct drm_ |
27331 |
extern void intel_teardown_gmbus(struct drm_device *dev); |
27332 |
extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); |
27333 |
@@ -25330,9 +25126,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.3/drivers |
27334 |
{ |
27335 |
return container_of(adapter, struct intel_gmbus, adapter)->force_bit; |
27336 |
} |
27337 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c |
27338 |
---- linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21:20:32.000000000 -0400 |
27339 |
-+++ linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-04-17 15:57:32.000000000 -0400 |
27340 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c |
27341 |
+--- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-03-14 21:20:32.000000000 -0400 |
27342 |
++++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-04-17 15:57:32.000000000 -0400 |
27343 |
@@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switc |
27344 |
bool can_switch; |
27345 |
|
27346 |
@@ -25342,9 +25138,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.3 |
27347 |
spin_unlock(&dev->count_lock); |
27348 |
return can_switch; |
27349 |
} |
27350 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c |
27351 |
---- linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:32.000000000 -0400 |
27352 |
-+++ linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:57:32.000000000 -0400 |
27353 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c |
27354 |
+--- linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c 2011-03-14 21:20:32.000000000 -0400 |
27355 |
++++ linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:57:32.000000000 -0400 |
27356 |
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, |
27357 |
regex_t mask_rex; |
27358 |
regmatch_t match[4]; |
27359 |
@@ -25362,9 +25158,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.3/dri |
27360 |
|
27361 |
if (regcomp |
27362 |
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { |
27363 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c |
27364 |
---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:20:32.000000000 -0400 |
27365 |
-+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c 2011-04-17 15:57:32.000000000 -0400 |
27366 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c |
27367 |
+--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c 2011-03-14 21:20:32.000000000 -0400 |
27368 |
++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c 2011-04-17 15:57:32.000000000 -0400 |
27369 |
@@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch |
27370 |
bool can_switch; |
27371 |
|
27372 |
@@ -25374,9 +25170,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.3/ |
27373 |
spin_unlock(&dev->count_lock); |
27374 |
return can_switch; |
27375 |
} |
27376 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c |
27377 |
---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-14 21:20:32.000000000 -0400 |
27378 |
-+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-17 15:57:32.000000000 -0400 |
27379 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c |
27380 |
+--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-14 21:20:32.000000000 -0400 |
27381 |
++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-17 15:57:32.000000000 -0400 |
27382 |
@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str |
27383 |
request = compat_alloc_user_space(sizeof(*request)); |
27384 |
if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) |
27385 |
@@ -25386,9 +25182,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.3/d |
27386 |
&request->value)) |
27387 |
return -EFAULT; |
27388 |
|
27389 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c |
27390 |
---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:20:32.000000000 -0400 |
27391 |
-+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:57:32.000000000 -0400 |
27392 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c |
27393 |
+--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c 2011-03-14 21:20:32.000000000 -0400 |
27394 |
++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:57:32.000000000 -0400 |
27395 |
@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de |
27396 |
if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS) |
27397 |
sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS; |
27398 |
@@ -25407,9 +25203,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.3/d |
27399 |
|
27400 |
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); |
27401 |
|
27402 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c |
27403 |
---- linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:32.000000000 -0400 |
27404 |
-+++ linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:57:32.000000000 -0400 |
27405 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c |
27406 |
+--- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-14 21:20:32.000000000 -0400 |
27407 |
++++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:57:32.000000000 -0400 |
27408 |
@@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str |
27409 |
man->size = size >> PAGE_SHIFT; |
27410 |
} |
27411 |
@@ -25470,9 +25266,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.3/dri |
27412 |
vma->vm_ops = &radeon_ttm_vm_ops; |
27413 |
return 0; |
27414 |
} |
27415 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c |
27416 |
---- linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c 2011-03-14 21:20:32.000000000 -0400 |
27417 |
-+++ linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:57:32.000000000 -0400 |
27418 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c |
27419 |
+--- linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c 2011-03-14 21:20:32.000000000 -0400 |
27420 |
++++ linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:57:32.000000000 -0400 |
27421 |
@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct |
27422 |
if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && |
27423 |
rdev->pm.sideport_bandwidth.full) |
27424 |
@@ -25486,21 +25282,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.3/drivers/ |
27425 |
} else { |
27426 |
if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && |
27427 |
rdev->pm.k8_bandwidth.full) |
27428 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo.c |
27429 |
---- linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-14 21:20:32.000000000 -0400 |
27430 |
-+++ linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo.c 2011-04-17 15:57:32.000000000 -0400 |
27431 |
-@@ -40,7 +40,7 @@ |
27432 |
- #include <asm/atomic.h> |
27433 |
- |
27434 |
- #define TTM_ASSERT_LOCKED(param) |
27435 |
--#define TTM_DEBUG(fmt, arg...) |
27436 |
-+#define TTM_DEBUG(fmt, arg...) do {} while (0) |
27437 |
- #define TTM_BO_HASH_ORDER 13 |
27438 |
- |
27439 |
- static int ttm_bo_setup_vm(struct ttm_buffer_object *bo); |
27440 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c |
27441 |
---- linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.000000000 -0400 |
27442 |
-+++ linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:57:32.000000000 -0400 |
27443 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c |
27444 |
+--- linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-14 21:20:32.000000000 -0400 |
27445 |
++++ linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:57:32.000000000 -0400 |
27446 |
@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_ |
27447 |
return best_bo; |
27448 |
} |
27449 |
@@ -25558,9 +25342,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.3/drivers |
27450 |
|
27451 |
static const struct vm_operations_struct ttm_bo_vm_ops = { |
27452 |
.fault = ttm_bo_vm_fault, |
27453 |
-diff -urNp linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c |
27454 |
---- linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-03-14 21:20:32.000000000 -0400 |
27455 |
-+++ linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-04-17 15:57:32.000000000 -0400 |
27456 |
+diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c |
27457 |
+--- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-03-14 21:20:32.000000000 -0400 |
27458 |
++++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-04-17 15:57:32.000000000 -0400 |
27459 |
@@ -534,7 +534,7 @@ static int vmw_fifo_vm_fault(struct vm_a |
27460 |
return VM_FAULT_SIGBUS; |
27461 |
} |
27462 |
@@ -25570,9 +25354,9 @@ diff -urNp linux-2.6.38.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.3/dr |
27463 |
.fault = vmw_fifo_vm_fault, |
27464 |
.open = NULL, |
27465 |
.close = NULL |
27466 |
-diff -urNp linux-2.6.38.3/drivers/hid/usbhid/hiddev.c linux-2.6.38.3/drivers/hid/usbhid/hiddev.c |
27467 |
---- linux-2.6.38.3/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.000000000 -0400 |
27468 |
-+++ linux-2.6.38.3/drivers/hid/usbhid/hiddev.c 2011-04-17 15:57:32.000000000 -0400 |
27469 |
+diff -urNp linux-2.6.38.4/drivers/hid/usbhid/hiddev.c linux-2.6.38.4/drivers/hid/usbhid/hiddev.c |
27470 |
+--- linux-2.6.38.4/drivers/hid/usbhid/hiddev.c 2011-03-14 21:20:32.000000000 -0400 |
27471 |
++++ linux-2.6.38.4/drivers/hid/usbhid/hiddev.c 2011-04-17 15:57:32.000000000 -0400 |
27472 |
@@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi |
27473 |
break; |
27474 |
|
27475 |
@@ -25582,57 +25366,9 @@ diff -urNp linux-2.6.38.3/drivers/hid/usbhid/hiddev.c linux-2.6.38.3/drivers/hid |
27476 |
break; |
27477 |
|
27478 |
for (i = 0; i < hid->maxcollection; i++) |
27479 |
-diff -urNp linux-2.6.38.3/drivers/hwmon/k8temp.c linux-2.6.38.3/drivers/hwmon/k8temp.c |
27480 |
---- linux-2.6.38.3/drivers/hwmon/k8temp.c 2011-03-14 21:20:32.000000000 -0400 |
27481 |
-+++ linux-2.6.38.3/drivers/hwmon/k8temp.c 2011-04-17 15:57:32.000000000 -0400 |
27482 |
-@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n |
27483 |
- |
27484 |
- static const struct pci_device_id k8temp_ids[] = { |
27485 |
- { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, |
27486 |
-- { 0 }, |
27487 |
-+ { 0, 0, 0, 0, 0, 0, 0 }, |
27488 |
- }; |
27489 |
- |
27490 |
- MODULE_DEVICE_TABLE(pci, k8temp_ids); |
27491 |
-diff -urNp linux-2.6.38.3/drivers/hwmon/sis5595.c linux-2.6.38.3/drivers/hwmon/sis5595.c |
27492 |
---- linux-2.6.38.3/drivers/hwmon/sis5595.c 2011-03-14 21:20:32.000000000 -0400 |
27493 |
-+++ linux-2.6.38.3/drivers/hwmon/sis5595.c 2011-04-17 15:57:32.000000000 -0400 |
27494 |
-@@ -701,7 +701,7 @@ static struct sis5595_data *sis5595_upda |
27495 |
- |
27496 |
- static const struct pci_device_id sis5595_pci_ids[] = { |
27497 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, |
27498 |
-- { 0, } |
27499 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
27500 |
- }; |
27501 |
- |
27502 |
- MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); |
27503 |
-diff -urNp linux-2.6.38.3/drivers/hwmon/via686a.c linux-2.6.38.3/drivers/hwmon/via686a.c |
27504 |
---- linux-2.6.38.3/drivers/hwmon/via686a.c 2011-03-14 21:20:32.000000000 -0400 |
27505 |
-+++ linux-2.6.38.3/drivers/hwmon/via686a.c 2011-04-17 15:57:32.000000000 -0400 |
27506 |
-@@ -779,7 +779,7 @@ static struct via686a_data *via686a_upda |
27507 |
- |
27508 |
- static const struct pci_device_id via686a_pci_ids[] = { |
27509 |
- { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) }, |
27510 |
-- { 0, } |
27511 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
27512 |
- }; |
27513 |
- |
27514 |
- MODULE_DEVICE_TABLE(pci, via686a_pci_ids); |
27515 |
-diff -urNp linux-2.6.38.3/drivers/hwmon/vt8231.c linux-2.6.38.3/drivers/hwmon/vt8231.c |
27516 |
---- linux-2.6.38.3/drivers/hwmon/vt8231.c 2011-03-14 21:20:32.000000000 -0400 |
27517 |
-+++ linux-2.6.38.3/drivers/hwmon/vt8231.c 2011-04-17 15:57:32.000000000 -0400 |
27518 |
-@@ -701,7 +701,7 @@ static struct platform_driver vt8231_dri |
27519 |
- |
27520 |
- static const struct pci_device_id vt8231_pci_ids[] = { |
27521 |
- { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) }, |
27522 |
-- { 0, } |
27523 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
27524 |
- }; |
27525 |
- |
27526 |
- MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); |
27527 |
-diff -urNp linux-2.6.38.3/drivers/hwmon/w83791d.c linux-2.6.38.3/drivers/hwmon/w83791d.c |
27528 |
---- linux-2.6.38.3/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000 -0400 |
27529 |
-+++ linux-2.6.38.3/drivers/hwmon/w83791d.c 2011-04-17 15:57:32.000000000 -0400 |
27530 |
+diff -urNp linux-2.6.38.4/drivers/hwmon/w83791d.c linux-2.6.38.4/drivers/hwmon/w83791d.c |
27531 |
+--- linux-2.6.38.4/drivers/hwmon/w83791d.c 2011-03-14 21:20:32.000000000 -0400 |
27532 |
++++ linux-2.6.38.4/drivers/hwmon/w83791d.c 2011-04-17 15:57:32.000000000 -0400 |
27533 |
@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli |
27534 |
struct i2c_board_info *info); |
27535 |
static int w83791d_remove(struct i2c_client *client); |
27536 |
@@ -25644,66 +25380,9 @@ diff -urNp linux-2.6.38.3/drivers/hwmon/w83791d.c linux-2.6.38.3/drivers/hwmon/w |
27537 |
static struct w83791d_data *w83791d_update_device(struct device *dev); |
27538 |
|
27539 |
#ifdef DEBUG |
27540 |
-diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-i801.c linux-2.6.38.3/drivers/i2c/busses/i2c-i801.c |
27541 |
---- linux-2.6.38.3/drivers/i2c/busses/i2c-i801.c 2011-03-14 21:20:32.000000000 -0400 |
27542 |
-+++ linux-2.6.38.3/drivers/i2c/busses/i2c-i801.c 2011-04-17 15:57:32.000000000 -0400 |
27543 |
-@@ -621,7 +621,7 @@ static const struct pci_device_id i801_i |
27544 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) }, |
27545 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) }, |
27546 |
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2) }, |
27547 |
-- { 0, } |
27548 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
27549 |
- }; |
27550 |
- |
27551 |
- MODULE_DEVICE_TABLE(pci, i801_ids); |
27552 |
-diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-piix4.c linux-2.6.38.3/drivers/i2c/busses/i2c-piix4.c |
27553 |
---- linux-2.6.38.3/drivers/i2c/busses/i2c-piix4.c 2011-03-14 21:20:32.000000000 -0400 |
27554 |
-+++ linux-2.6.38.3/drivers/i2c/busses/i2c-piix4.c 2011-04-17 15:57:32.000000000 -0400 |
27555 |
-@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat |
27556 |
- .ident = "IBM", |
27557 |
- .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, |
27558 |
- }, |
27559 |
-- { }, |
27560 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27561 |
- }; |
27562 |
- |
27563 |
- static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, |
27564 |
-@@ -491,7 +491,7 @@ static const struct pci_device_id piix4_ |
27565 |
- PCI_DEVICE_ID_SERVERWORKS_HT1000SB) }, |
27566 |
- { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, |
27567 |
- PCI_DEVICE_ID_SERVERWORKS_HT1100LD) }, |
27568 |
-- { 0, } |
27569 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
27570 |
- }; |
27571 |
- |
27572 |
- MODULE_DEVICE_TABLE (pci, piix4_ids); |
27573 |
-diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-sis630.c linux-2.6.38.3/drivers/i2c/busses/i2c-sis630.c |
27574 |
---- linux-2.6.38.3/drivers/i2c/busses/i2c-sis630.c 2011-03-14 21:20:32.000000000 -0400 |
27575 |
-+++ linux-2.6.38.3/drivers/i2c/busses/i2c-sis630.c 2011-04-17 15:57:32.000000000 -0400 |
27576 |
-@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter |
27577 |
- static const struct pci_device_id sis630_ids[] __devinitconst = { |
27578 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, |
27579 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) }, |
27580 |
-- { 0, } |
27581 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
27582 |
- }; |
27583 |
- |
27584 |
- MODULE_DEVICE_TABLE (pci, sis630_ids); |
27585 |
-diff -urNp linux-2.6.38.3/drivers/i2c/busses/i2c-sis96x.c linux-2.6.38.3/drivers/i2c/busses/i2c-sis96x.c |
27586 |
---- linux-2.6.38.3/drivers/i2c/busses/i2c-sis96x.c 2011-03-14 21:20:32.000000000 -0400 |
27587 |
-+++ linux-2.6.38.3/drivers/i2c/busses/i2c-sis96x.c 2011-04-17 15:57:32.000000000 -0400 |
27588 |
-@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter |
27589 |
- |
27590 |
- static const struct pci_device_id sis96x_ids[] = { |
27591 |
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) }, |
27592 |
-- { 0, } |
27593 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
27594 |
- }; |
27595 |
- |
27596 |
- MODULE_DEVICE_TABLE (pci, sis96x_ids); |
27597 |
-diff -urNp linux-2.6.38.3/drivers/ide/ide-cd.c linux-2.6.38.3/drivers/ide/ide-cd.c |
27598 |
---- linux-2.6.38.3/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0400 |
27599 |
-+++ linux-2.6.38.3/drivers/ide/ide-cd.c 2011-04-17 15:57:32.000000000 -0400 |
27600 |
+diff -urNp linux-2.6.38.4/drivers/ide/ide-cd.c linux-2.6.38.4/drivers/ide/ide-cd.c |
27601 |
+--- linux-2.6.38.4/drivers/ide/ide-cd.c 2011-03-14 21:20:32.000000000 -0400 |
27602 |
++++ linux-2.6.38.4/drivers/ide/ide-cd.c 2011-04-17 15:57:32.000000000 -0400 |
27603 |
@@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_ |
27604 |
alignment = queue_dma_alignment(q) | q->dma_pad_mask; |
27605 |
if ((unsigned long)buf & alignment |
27606 |
@@ -25713,9 +25392,9 @@ diff -urNp linux-2.6.38.3/drivers/ide/ide-cd.c linux-2.6.38.3/drivers/ide/ide-cd |
27607 |
drive->dma = 0; |
27608 |
} |
27609 |
} |
27610 |
-diff -urNp linux-2.6.38.3/drivers/infiniband/core/cm.c linux-2.6.38.3/drivers/infiniband/core/cm.c |
27611 |
---- linux-2.6.38.3/drivers/infiniband/core/cm.c 2011-04-18 17:27:14.000000000 -0400 |
27612 |
-+++ linux-2.6.38.3/drivers/infiniband/core/cm.c 2011-04-17 15:57:32.000000000 -0400 |
27613 |
+diff -urNp linux-2.6.38.4/drivers/infiniband/core/cm.c linux-2.6.38.4/drivers/infiniband/core/cm.c |
27614 |
+--- linux-2.6.38.4/drivers/infiniband/core/cm.c 2011-04-18 17:27:14.000000000 -0400 |
27615 |
++++ linux-2.6.38.4/drivers/infiniband/core/cm.c 2011-04-17 15:57:32.000000000 -0400 |
27616 |
@@ -113,7 +113,7 @@ static char const counter_group_names[CM |
27617 |
|
27618 |
struct cm_counter_group { |
27619 |
@@ -25855,9 +25534,9 @@ diff -urNp linux-2.6.38.3/drivers/infiniband/core/cm.c linux-2.6.38.3/drivers/in |
27620 |
} |
27621 |
|
27622 |
static const struct sysfs_ops cm_counter_ops = { |
27623 |
-diff -urNp linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h |
27624 |
---- linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.000000000 -0400 |
27625 |
-+++ linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h 2011-04-17 15:57:32.000000000 -0400 |
27626 |
+diff -urNp linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h |
27627 |
+--- linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h 2011-03-14 21:20:32.000000000 -0400 |
27628 |
++++ linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h 2011-04-17 15:57:32.000000000 -0400 |
27629 |
@@ -51,6 +51,7 @@ |
27630 |
#include <linux/completion.h> |
27631 |
#include <linux/kref.h> |
27632 |
@@ -25866,77 +25545,9 @@ diff -urNp linux-2.6.38.3/drivers/infiniband/hw/qib/qib.h linux-2.6.38.3/drivers |
27633 |
|
27634 |
#include "qib_common.h" |
27635 |
#include "qib_verbs.h" |
27636 |
-diff -urNp linux-2.6.38.3/drivers/input/keyboard/atkbd.c linux-2.6.38.3/drivers/input/keyboard/atkbd.c |
27637 |
---- linux-2.6.38.3/drivers/input/keyboard/atkbd.c 2011-03-14 21:20:32.000000000 -0400 |
27638 |
-+++ linux-2.6.38.3/drivers/input/keyboard/atkbd.c 2011-04-17 15:57:32.000000000 -0400 |
27639 |
-@@ -1250,7 +1250,7 @@ static struct serio_device_id atkbd_seri |
27640 |
- .id = SERIO_ANY, |
27641 |
- .extra = SERIO_ANY, |
27642 |
- }, |
27643 |
-- { 0 } |
27644 |
-+ { 0, 0, 0, 0 } |
27645 |
- }; |
27646 |
- |
27647 |
- MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); |
27648 |
-diff -urNp linux-2.6.38.3/drivers/input/mouse/lifebook.c linux-2.6.38.3/drivers/input/mouse/lifebook.c |
27649 |
---- linux-2.6.38.3/drivers/input/mouse/lifebook.c 2011-03-14 21:20:32.000000000 -0400 |
27650 |
-+++ linux-2.6.38.3/drivers/input/mouse/lifebook.c 2011-04-17 15:57:32.000000000 -0400 |
27651 |
-@@ -123,7 +123,7 @@ static const struct dmi_system_id __init |
27652 |
- DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), |
27653 |
- }, |
27654 |
- }, |
27655 |
-- { } |
27656 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL} |
27657 |
- }; |
27658 |
- |
27659 |
- void __init lifebook_module_init(void) |
27660 |
-diff -urNp linux-2.6.38.3/drivers/input/mouse/psmouse-base.c linux-2.6.38.3/drivers/input/mouse/psmouse-base.c |
27661 |
---- linux-2.6.38.3/drivers/input/mouse/psmouse-base.c 2011-03-14 21:20:32.000000000 -0400 |
27662 |
-+++ linux-2.6.38.3/drivers/input/mouse/psmouse-base.c 2011-04-17 15:57:32.000000000 -0400 |
27663 |
-@@ -1462,7 +1462,7 @@ static struct serio_device_id psmouse_se |
27664 |
- .id = SERIO_ANY, |
27665 |
- .extra = SERIO_ANY, |
27666 |
- }, |
27667 |
-- { 0 } |
27668 |
-+ { 0, 0, 0, 0 } |
27669 |
- }; |
27670 |
- |
27671 |
- MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); |
27672 |
-diff -urNp linux-2.6.38.3/drivers/input/mouse/synaptics.c linux-2.6.38.3/drivers/input/mouse/synaptics.c |
27673 |
---- linux-2.6.38.3/drivers/input/mouse/synaptics.c 2011-04-18 17:27:18.000000000 -0400 |
27674 |
-+++ linux-2.6.38.3/drivers/input/mouse/synaptics.c 2011-04-17 16:53:16.000000000 -0400 |
27675 |
-@@ -559,7 +559,7 @@ static void synaptics_process_packet(str |
27676 |
- break; |
27677 |
- case 2: |
27678 |
- if (SYN_MODEL_PEN(priv->model_id)) |
27679 |
-- ; /* Nothing, treat a pen as a single finger */ |
27680 |
-+ break; /* Nothing, treat a pen as a single finger */ |
27681 |
- break; |
27682 |
- case 4 ... 15: |
27683 |
- if (SYN_CAP_PALMDETECT(priv->capabilities)) |
27684 |
-@@ -825,7 +825,6 @@ static const struct dmi_system_id __init |
27685 |
- DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |
27686 |
- DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"), |
27687 |
- }, |
27688 |
-- |
27689 |
- }, |
27690 |
- { |
27691 |
- /* Toshiba Portege M300 */ |
27692 |
-@@ -834,10 +833,9 @@ static const struct dmi_system_id __init |
27693 |
- DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"), |
27694 |
- DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"), |
27695 |
- }, |
27696 |
-- |
27697 |
- }, |
27698 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27699 |
- #endif |
27700 |
-- { } |
27701 |
- }; |
27702 |
- |
27703 |
- static bool broken_olpc_ec; |
27704 |
-diff -urNp linux-2.6.38.3/drivers/input/mousedev.c linux-2.6.38.3/drivers/input/mousedev.c |
27705 |
---- linux-2.6.38.3/drivers/input/mousedev.c 2011-03-14 21:20:32.000000000 -0400 |
27706 |
-+++ linux-2.6.38.3/drivers/input/mousedev.c 2011-04-17 15:57:32.000000000 -0400 |
27707 |
+diff -urNp linux-2.6.38.4/drivers/input/mousedev.c linux-2.6.38.4/drivers/input/mousedev.c |
27708 |
+--- linux-2.6.38.4/drivers/input/mousedev.c 2011-03-14 21:20:32.000000000 -0400 |
27709 |
++++ linux-2.6.38.4/drivers/input/mousedev.c 2011-04-23 12:47:28.000000000 -0400 |
27710 |
@@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file |
27711 |
|
27712 |
spin_unlock_irq(&client->packet_lock); |
27713 |
@@ -25946,87 +25557,9 @@ diff -urNp linux-2.6.38.3/drivers/input/mousedev.c linux-2.6.38.3/drivers/input/ |
27714 |
return -EFAULT; |
27715 |
|
27716 |
return count; |
27717 |
-@@ -1067,7 +1067,7 @@ static struct input_handler mousedev_han |
27718 |
- |
27719 |
- #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX |
27720 |
- static struct miscdevice psaux_mouse = { |
27721 |
-- PSMOUSE_MINOR, "psaux", &mousedev_fops |
27722 |
-+ PSMOUSE_MINOR, "psaux", &mousedev_fops, {NULL, NULL}, NULL, NULL |
27723 |
- }; |
27724 |
- static int psaux_registered; |
27725 |
- #endif |
27726 |
-diff -urNp linux-2.6.38.3/drivers/input/serio/i8042-x86ia64io.h linux-2.6.38.3/drivers/input/serio/i8042-x86ia64io.h |
27727 |
---- linux-2.6.38.3/drivers/input/serio/i8042-x86ia64io.h 2011-03-14 21:20:32.000000000 -0400 |
27728 |
-+++ linux-2.6.38.3/drivers/input/serio/i8042-x86ia64io.h 2011-04-17 15:57:32.000000000 -0400 |
27729 |
-@@ -183,7 +183,7 @@ static const struct dmi_system_id __init |
27730 |
- DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), |
27731 |
- }, |
27732 |
- }, |
27733 |
-- { } |
27734 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27735 |
- }; |
27736 |
- |
27737 |
- /* |
27738 |
-@@ -431,7 +431,7 @@ static const struct dmi_system_id __init |
27739 |
- DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), |
27740 |
- }, |
27741 |
- }, |
27742 |
-- { } |
27743 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27744 |
- }; |
27745 |
- |
27746 |
- static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { |
27747 |
-@@ -505,7 +505,7 @@ static const struct dmi_system_id __init |
27748 |
- DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), |
27749 |
- }, |
27750 |
- }, |
27751 |
-- { } |
27752 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27753 |
- }; |
27754 |
- |
27755 |
- #ifdef CONFIG_PNP |
27756 |
-@@ -524,7 +524,7 @@ static const struct dmi_system_id __init |
27757 |
- DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), |
27758 |
- }, |
27759 |
- }, |
27760 |
-- { } |
27761 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27762 |
- }; |
27763 |
- |
27764 |
- static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { |
27765 |
-@@ -548,7 +548,7 @@ static const struct dmi_system_id __init |
27766 |
- DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ |
27767 |
- }, |
27768 |
- }, |
27769 |
-- { } |
27770 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27771 |
- }; |
27772 |
- #endif |
27773 |
- |
27774 |
-@@ -640,7 +640,7 @@ static const struct dmi_system_id __init |
27775 |
- DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), |
27776 |
- }, |
27777 |
- }, |
27778 |
-- { } |
27779 |
-+ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } |
27780 |
- }; |
27781 |
- |
27782 |
- #endif /* CONFIG_X86 */ |
27783 |
-diff -urNp linux-2.6.38.3/drivers/input/serio/serio_raw.c linux-2.6.38.3/drivers/input/serio/serio_raw.c |
27784 |
---- linux-2.6.38.3/drivers/input/serio/serio_raw.c 2011-03-14 21:20:32.000000000 -0400 |
27785 |
-+++ linux-2.6.38.3/drivers/input/serio/serio_raw.c 2011-04-17 15:57:32.000000000 -0400 |
27786 |
-@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_ |
27787 |
- .id = SERIO_ANY, |
27788 |
- .extra = SERIO_ANY, |
27789 |
- }, |
27790 |
-- { 0 } |
27791 |
-+ { 0, 0, 0, 0 } |
27792 |
- }; |
27793 |
- |
27794 |
- MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); |
27795 |
-diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/common.c linux-2.6.38.3/drivers/isdn/gigaset/common.c |
27796 |
---- linux-2.6.38.3/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000000000 -0400 |
27797 |
-+++ linux-2.6.38.3/drivers/isdn/gigaset/common.c 2011-04-17 15:57:32.000000000 -0400 |
27798 |
+diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/common.c linux-2.6.38.4/drivers/isdn/gigaset/common.c |
27799 |
+--- linux-2.6.38.4/drivers/isdn/gigaset/common.c 2011-03-14 21:20:32.000000000 -0400 |
27800 |
++++ linux-2.6.38.4/drivers/isdn/gigaset/common.c 2011-04-17 15:57:32.000000000 -0400 |
27801 |
@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct |
27802 |
cs->commands_pending = 0; |
27803 |
cs->cur_at_seq = 0; |
27804 |
@@ -26036,9 +25569,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/common.c linux-2.6.38.3/drivers/i |
27805 |
cs->dev = NULL; |
27806 |
cs->tty = NULL; |
27807 |
cs->tty_dev = NULL; |
27808 |
-diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h |
27809 |
---- linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.000000000 -0400 |
27810 |
-+++ linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:57:32.000000000 -0400 |
27811 |
+diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h |
27812 |
+--- linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h 2011-03-14 21:20:32.000000000 -0400 |
27813 |
++++ linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:57:32.000000000 -0400 |
27814 |
@@ -35,6 +35,7 @@ |
27815 |
#include <linux/tty_driver.h> |
27816 |
#include <linux/list.h> |
27817 |
@@ -26056,9 +25589,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/gigaset.h linux-2.6.38.3/drivers/ |
27818 |
struct tty_struct *tty; |
27819 |
struct tasklet_struct if_wake_tasklet; |
27820 |
unsigned control_state; |
27821 |
-diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/interface.c linux-2.6.38.3/drivers/isdn/gigaset/interface.c |
27822 |
---- linux-2.6.38.3/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.000000000 -0400 |
27823 |
-+++ linux-2.6.38.3/drivers/isdn/gigaset/interface.c 2011-04-17 15:57:32.000000000 -0400 |
27824 |
+diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/interface.c linux-2.6.38.4/drivers/isdn/gigaset/interface.c |
27825 |
+--- linux-2.6.38.4/drivers/isdn/gigaset/interface.c 2011-03-14 21:20:32.000000000 -0400 |
27826 |
++++ linux-2.6.38.4/drivers/isdn/gigaset/interface.c 2011-04-17 15:57:32.000000000 -0400 |
27827 |
@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt |
27828 |
return -ERESTARTSYS; |
27829 |
tty->driver_data = cs; |
27830 |
@@ -26146,9 +25679,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/gigaset/interface.c linux-2.6.38.3/driver |
27831 |
dev_warn(cs->dev, "%s: device not opened\n", __func__); |
27832 |
goto out; |
27833 |
} |
27834 |
-diff -urNp linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c |
27835 |
---- linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.000000000 -0400 |
27836 |
-+++ linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:57:32.000000000 -0400 |
27837 |
+diff -urNp linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c |
27838 |
+--- linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c 2011-03-14 21:20:32.000000000 -0400 |
27839 |
++++ linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:57:32.000000000 -0400 |
27840 |
@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo |
27841 |
} |
27842 |
if (left) { |
27843 |
@@ -26167,9 +25700,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/hardware/avm/b1.c linux-2.6.38.3/drivers/ |
27844 |
return -EFAULT; |
27845 |
} else { |
27846 |
memcpy(buf, dp, left); |
27847 |
-diff -urNp linux-2.6.38.3/drivers/isdn/icn/icn.c linux-2.6.38.3/drivers/isdn/icn/icn.c |
27848 |
---- linux-2.6.38.3/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 -0400 |
27849 |
-+++ linux-2.6.38.3/drivers/isdn/icn/icn.c 2011-04-17 15:57:32.000000000 -0400 |
27850 |
+diff -urNp linux-2.6.38.4/drivers/isdn/icn/icn.c linux-2.6.38.4/drivers/isdn/icn/icn.c |
27851 |
+--- linux-2.6.38.4/drivers/isdn/icn/icn.c 2011-03-14 21:20:32.000000000 -0400 |
27852 |
++++ linux-2.6.38.4/drivers/isdn/icn/icn.c 2011-04-17 15:57:32.000000000 -0400 |
27853 |
@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len |
27854 |
if (count > len) |
27855 |
count = len; |
27856 |
@@ -26179,9 +25712,9 @@ diff -urNp linux-2.6.38.3/drivers/isdn/icn/icn.c linux-2.6.38.3/drivers/isdn/icn |
27857 |
return -EFAULT; |
27858 |
} else |
27859 |
memcpy(msg, buf, count); |
27860 |
-diff -urNp linux-2.6.38.3/drivers/lguest/core.c linux-2.6.38.3/drivers/lguest/core.c |
27861 |
---- linux-2.6.38.3/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -0400 |
27862 |
-+++ linux-2.6.38.3/drivers/lguest/core.c 2011-04-17 15:57:32.000000000 -0400 |
27863 |
+diff -urNp linux-2.6.38.4/drivers/lguest/core.c linux-2.6.38.4/drivers/lguest/core.c |
27864 |
+--- linux-2.6.38.4/drivers/lguest/core.c 2011-03-14 21:20:32.000000000 -0400 |
27865 |
++++ linux-2.6.38.4/drivers/lguest/core.c 2011-04-17 15:57:32.000000000 -0400 |
27866 |
@@ -92,9 +92,17 @@ static __init int map_switcher(void) |
27867 |
* it's worked so far. The end address needs +1 because __get_vm_area |
27868 |
* allocates an extra guard page, so we need space for that. |
27869 |
@@ -26209,9 +25742,9 @@ diff -urNp linux-2.6.38.3/drivers/lguest/core.c linux-2.6.38.3/drivers/lguest/co |
27870 |
end_switcher_text - start_switcher_text); |
27871 |
|
27872 |
printk(KERN_INFO "lguest: mapped switcher at %p\n", |
27873 |
-diff -urNp linux-2.6.38.3/drivers/lguest/x86/core.c linux-2.6.38.3/drivers/lguest/x86/core.c |
27874 |
---- linux-2.6.38.3/drivers/lguest/x86/core.c 2011-03-14 21:20:32.000000000 -0400 |
27875 |
-+++ linux-2.6.38.3/drivers/lguest/x86/core.c 2011-04-17 15:57:32.000000000 -0400 |
27876 |
+diff -urNp linux-2.6.38.4/drivers/lguest/x86/core.c linux-2.6.38.4/drivers/lguest/x86/core.c |
27877 |
+--- linux-2.6.38.4/drivers/lguest/x86/core.c 2011-03-14 21:20:32.000000000 -0400 |
27878 |
++++ linux-2.6.38.4/drivers/lguest/x86/core.c 2011-04-17 15:57:32.000000000 -0400 |
27879 |
@@ -59,7 +59,7 @@ static struct { |
27880 |
/* Offset from where switcher.S was compiled to where we've copied it */ |
27881 |
static unsigned long switcher_offset(void) |
27882 |
@@ -26253,9 +25786,9 @@ diff -urNp linux-2.6.38.3/drivers/lguest/x86/core.c linux-2.6.38.3/drivers/lgues |
27883 |
lguest_entry.segment = LGUEST_CS; |
27884 |
|
27885 |
/* |
27886 |
-diff -urNp linux-2.6.38.3/drivers/lguest/x86/switcher_32.S linux-2.6.38.3/drivers/lguest/x86/switcher_32.S |
27887 |
---- linux-2.6.38.3/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.000000000 -0400 |
27888 |
-+++ linux-2.6.38.3/drivers/lguest/x86/switcher_32.S 2011-04-17 15:57:32.000000000 -0400 |
27889 |
+diff -urNp linux-2.6.38.4/drivers/lguest/x86/switcher_32.S linux-2.6.38.4/drivers/lguest/x86/switcher_32.S |
27890 |
+--- linux-2.6.38.4/drivers/lguest/x86/switcher_32.S 2011-03-14 21:20:32.000000000 -0400 |
27891 |
++++ linux-2.6.38.4/drivers/lguest/x86/switcher_32.S 2011-04-17 15:57:32.000000000 -0400 |
27892 |
@@ -87,6 +87,7 @@ |
27893 |
#include <asm/page.h> |
27894 |
#include <asm/segment.h> |
27895 |
@@ -26314,21 +25847,9 @@ diff -urNp linux-2.6.38.3/drivers/lguest/x86/switcher_32.S linux-2.6.38.3/driver |
27896 |
|
27897 |
// Every interrupt can come to us here |
27898 |
// But we must truly tell each apart. |
27899 |
-diff -urNp linux-2.6.38.3/drivers/md/bitmap.c linux-2.6.38.3/drivers/md/bitmap.c |
27900 |
---- linux-2.6.38.3/drivers/md/bitmap.c 2011-03-14 21:20:32.000000000 -0400 |
27901 |
-+++ linux-2.6.38.3/drivers/md/bitmap.c 2011-04-17 15:57:32.000000000 -0400 |
27902 |
-@@ -55,7 +55,7 @@ |
27903 |
- # if DEBUG > 0 |
27904 |
- # define PRINTK(x...) printk(KERN_DEBUG x) |
27905 |
- # else |
27906 |
--# define PRINTK(x...) |
27907 |
-+# define PRINTK(x...) do {} while (0) |
27908 |
- # endif |
27909 |
- #endif |
27910 |
- |
27911 |
-diff -urNp linux-2.6.38.3/drivers/md/dm-ioctl.c linux-2.6.38.3/drivers/md/dm-ioctl.c |
27912 |
---- linux-2.6.38.3/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
27913 |
-+++ linux-2.6.38.3/drivers/md/dm-ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
27914 |
+diff -urNp linux-2.6.38.4/drivers/md/dm-ioctl.c linux-2.6.38.4/drivers/md/dm-ioctl.c |
27915 |
+--- linux-2.6.38.4/drivers/md/dm-ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
27916 |
++++ linux-2.6.38.4/drivers/md/dm-ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
27917 |
@@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, str |
27918 |
cmd == DM_LIST_VERSIONS_CMD) |
27919 |
return 0; |
27920 |
@@ -26338,9 +25859,9 @@ diff -urNp linux-2.6.38.3/drivers/md/dm-ioctl.c linux-2.6.38.3/drivers/md/dm-ioc |
27921 |
if (!*param->name) { |
27922 |
DMWARN("name not supplied when creating device"); |
27923 |
return -EINVAL; |
27924 |
-diff -urNp linux-2.6.38.3/drivers/md/dm-table.c linux-2.6.38.3/drivers/md/dm-table.c |
27925 |
---- linux-2.6.38.3/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -0400 |
27926 |
-+++ linux-2.6.38.3/drivers/md/dm-table.c 2011-04-17 15:57:32.000000000 -0400 |
27927 |
+diff -urNp linux-2.6.38.4/drivers/md/dm-table.c linux-2.6.38.4/drivers/md/dm-table.c |
27928 |
+--- linux-2.6.38.4/drivers/md/dm-table.c 2011-03-14 21:20:32.000000000 -0400 |
27929 |
++++ linux-2.6.38.4/drivers/md/dm-table.c 2011-04-17 15:57:32.000000000 -0400 |
27930 |
@@ -372,7 +372,7 @@ static int device_area_is_invalid(struct |
27931 |
if (!dev_size) |
27932 |
return 0; |
27933 |
@@ -26350,36 +25871,9 @@ diff -urNp linux-2.6.38.3/drivers/md/dm-table.c linux-2.6.38.3/drivers/md/dm-tab |
27934 |
DMWARN("%s: %s too small for target: " |
27935 |
"start=%llu, len=%llu, dev_size=%llu", |
27936 |
dm_device_name(ti->table->md), bdevname(bdev, b), |
27937 |
-diff -urNp linux-2.6.38.3/drivers/md/md.c linux-2.6.38.3/drivers/md/md.c |
27938 |
---- linux-2.6.38.3/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400 |
27939 |
-+++ linux-2.6.38.3/drivers/md/md.c 2011-04-17 15:57:32.000000000 -0400 |
27940 |
-@@ -1889,7 +1889,7 @@ static int bind_rdev_to_array(mdk_rdev_t |
27941 |
- |
27942 |
- ko = &part_to_dev(rdev->bdev->bd_part)->kobj; |
27943 |
- if (sysfs_create_link(&rdev->kobj, ko, "block")) |
27944 |
-- /* failure here is OK */; |
27945 |
-+ /* failure here is OK */{} |
27946 |
- rdev->sysfs_state = sysfs_get_dirent_safe(rdev->kobj.sd, "state"); |
27947 |
- |
27948 |
- list_add_rcu(&rdev->same_set, &mddev->disks); |
27949 |
-@@ -2499,7 +2499,7 @@ slot_store(mdk_rdev_t *rdev, const char |
27950 |
- sysfs_notify_dirent_safe(rdev->sysfs_state); |
27951 |
- sprintf(nm, "rd%d", rdev->raid_disk); |
27952 |
- if (sysfs_create_link(&rdev->mddev->kobj, &rdev->kobj, nm)) |
27953 |
-- /* failure here is OK */; |
27954 |
-+ /* failure here is OK */{} |
27955 |
- /* don't wakeup anyone, leave that to userspace. */ |
27956 |
- } else { |
27957 |
- if (slot >= rdev->mddev->raid_disks && |
27958 |
-@@ -4594,7 +4594,7 @@ int md_run(mddev_t *mddev) |
27959 |
- char nm[20]; |
27960 |
- sprintf(nm, "rd%d", rdev->raid_disk); |
27961 |
- if (sysfs_create_link(&mddev->kobj, &rdev->kobj, nm)) |
27962 |
-- /* failure here is OK */; |
27963 |
-+ /* failure here is OK */{} |
27964 |
- } |
27965 |
- |
27966 |
- set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); |
27967 |
+diff -urNp linux-2.6.38.4/drivers/md/md.c linux-2.6.38.4/drivers/md/md.c |
27968 |
+--- linux-2.6.38.4/drivers/md/md.c 2011-03-14 21:20:32.000000000 -0400 |
27969 |
++++ linux-2.6.38.4/drivers/md/md.c 2011-04-23 12:47:28.000000000 -0400 |
27970 |
@@ -6462,7 +6462,7 @@ static int md_seq_show(struct seq_file * |
27971 |
chunk_kb ? "KB" : "B"); |
27972 |
if (bitmap->file) { |
27973 |
@@ -26398,18 +25892,9 @@ diff -urNp linux-2.6.38.3/drivers/md/md.c linux-2.6.38.3/drivers/md/md.c |
27974 |
/* sync IO will cause sync_io to increase before the disk_stats |
27975 |
* as sync_io is counted when a request starts, and |
27976 |
* disk_stats is counted when it completes. |
27977 |
-@@ -7070,7 +7070,7 @@ static int remove_and_add_spares(mddev_t |
27978 |
- sprintf(nm, "rd%d", rdev->raid_disk); |
27979 |
- if (sysfs_create_link(&mddev->kobj, |
27980 |
- &rdev->kobj, nm)) |
27981 |
-- /* failure here is OK */; |
27982 |
-+ /* failure here is OK */{} |
27983 |
- spares++; |
27984 |
- md_new_event(mddev); |
27985 |
- set_bit(MD_CHANGE_DEVS, &mddev->flags); |
27986 |
-diff -urNp linux-2.6.38.3/drivers/md/md.h linux-2.6.38.3/drivers/md/md.h |
27987 |
---- linux-2.6.38.3/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400 |
27988 |
-+++ linux-2.6.38.3/drivers/md/md.h 2011-04-17 15:57:32.000000000 -0400 |
27989 |
+diff -urNp linux-2.6.38.4/drivers/md/md.h linux-2.6.38.4/drivers/md/md.h |
27990 |
+--- linux-2.6.38.4/drivers/md/md.h 2011-03-14 21:20:32.000000000 -0400 |
27991 |
++++ linux-2.6.38.4/drivers/md/md.h 2011-04-17 15:57:32.000000000 -0400 |
27992 |
@@ -360,7 +360,7 @@ static inline void rdev_dec_pending(mdk_ |
27993 |
|
27994 |
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) |
27995 |
@@ -26419,9 +25904,9 @@ diff -urNp linux-2.6.38.3/drivers/md/md.h linux-2.6.38.3/drivers/md/md.h |
27996 |
} |
27997 |
|
27998 |
struct mdk_personality |
27999 |
-diff -urNp linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c |
28000 |
---- linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:32.000000000 -0400 |
28001 |
-+++ linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:57:32.000000000 -0400 |
28002 |
+diff -urNp linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c |
28003 |
+--- linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-14 21:20:32.000000000 -0400 |
28004 |
++++ linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-04-17 15:57:32.000000000 -0400 |
28005 |
@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt |
28006 |
const struct dvb_device *template, void *priv, int type) |
28007 |
{ |
28008 |
@@ -26431,9 +25916,9 @@ diff -urNp linux-2.6.38.3/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.3/dri |
28009 |
struct device *clsdev; |
28010 |
int minor; |
28011 |
int id; |
28012 |
-diff -urNp linux-2.6.38.3/drivers/media/radio/radio-cadet.c linux-2.6.38.3/drivers/media/radio/radio-cadet.c |
28013 |
---- linux-2.6.38.3/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32.000000000 -0400 |
28014 |
-+++ linux-2.6.38.3/drivers/media/radio/radio-cadet.c 2011-04-17 15:57:32.000000000 -0400 |
28015 |
+diff -urNp linux-2.6.38.4/drivers/media/radio/radio-cadet.c linux-2.6.38.4/drivers/media/radio/radio-cadet.c |
28016 |
+--- linux-2.6.38.4/drivers/media/radio/radio-cadet.c 2011-03-14 21:20:32.000000000 -0400 |
28017 |
++++ linux-2.6.38.4/drivers/media/radio/radio-cadet.c 2011-04-17 15:57:32.000000000 -0400 |
28018 |
@@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f |
28019 |
readbuf[i++] = dev->rdsbuf[dev->rdsout++]; |
28020 |
mutex_unlock(&dev->lock); |
28021 |
@@ -26443,9 +25928,9 @@ diff -urNp linux-2.6.38.3/drivers/media/radio/radio-cadet.c linux-2.6.38.3/drive |
28022 |
return -EFAULT; |
28023 |
return i; |
28024 |
} |
28025 |
-diff -urNp linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c |
28026 |
---- linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.000000000 -0400 |
28027 |
-+++ linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c 2011-04-17 15:57:32.000000000 -0400 |
28028 |
+diff -urNp linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c |
28029 |
+--- linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c 2011-03-14 21:20:32.000000000 -0400 |
28030 |
++++ linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c 2011-04-17 15:57:32.000000000 -0400 |
28031 |
@@ -277,7 +277,7 @@ static void ir_lirc_close(void *data) |
28032 |
return; |
28033 |
} |
28034 |
@@ -26455,9 +25940,9 @@ diff -urNp linux-2.6.38.3/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.3/driver |
28035 |
.owner = THIS_MODULE, |
28036 |
.write = ir_lirc_transmit_ir, |
28037 |
.unlocked_ioctl = ir_lirc_ioctl, |
28038 |
-diff -urNp linux-2.6.38.3/drivers/media/rc/lirc_dev.c linux-2.6.38.3/drivers/media/rc/lirc_dev.c |
28039 |
---- linux-2.6.38.3/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.000000000 -0400 |
28040 |
-+++ linux-2.6.38.3/drivers/media/rc/lirc_dev.c 2011-04-17 15:57:32.000000000 -0400 |
28041 |
+diff -urNp linux-2.6.38.4/drivers/media/rc/lirc_dev.c linux-2.6.38.4/drivers/media/rc/lirc_dev.c |
28042 |
+--- linux-2.6.38.4/drivers/media/rc/lirc_dev.c 2011-03-14 21:20:32.000000000 -0400 |
28043 |
++++ linux-2.6.38.4/drivers/media/rc/lirc_dev.c 2011-04-17 15:57:32.000000000 -0400 |
28044 |
@@ -151,7 +151,7 @@ static int lirc_thread(void *irctl) |
28045 |
} |
28046 |
|
28047 |
@@ -26467,25 +25952,9 @@ diff -urNp linux-2.6.38.3/drivers/media/rc/lirc_dev.c linux-2.6.38.3/drivers/med |
28048 |
.owner = THIS_MODULE, |
28049 |
.read = lirc_dev_fop_read, |
28050 |
.write = lirc_dev_fop_write, |
28051 |
-diff -urNp linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c |
28052 |
---- linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c 2011-03-14 21:20:32.000000000 -0400 |
28053 |
-+++ linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c 2011-04-17 15:57:32.000000000 -0400 |
28054 |
-@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_ |
28055 |
- sn9c102_show_i2c_reg, sn9c102_store_i2c_reg); |
28056 |
- static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR, |
28057 |
- sn9c102_show_i2c_val, sn9c102_store_i2c_val); |
28058 |
--static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green); |
28059 |
--static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue); |
28060 |
--static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red); |
28061 |
-+static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green); |
28062 |
-+static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue); |
28063 |
-+static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red); |
28064 |
- static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL); |
28065 |
- |
28066 |
- |
28067 |
-diff -urNp linux-2.6.38.3/drivers/message/fusion/mptbase.c linux-2.6.38.3/drivers/message/fusion/mptbase.c |
28068 |
---- linux-2.6.38.3/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.000000000 -0400 |
28069 |
-+++ linux-2.6.38.3/drivers/message/fusion/mptbase.c 2011-04-17 15:57:32.000000000 -0400 |
28070 |
+diff -urNp linux-2.6.38.4/drivers/message/fusion/mptbase.c linux-2.6.38.4/drivers/message/fusion/mptbase.c |
28071 |
+--- linux-2.6.38.4/drivers/message/fusion/mptbase.c 2011-03-14 21:20:32.000000000 -0400 |
28072 |
++++ linux-2.6.38.4/drivers/message/fusion/mptbase.c 2011-04-17 15:57:32.000000000 -0400 |
28073 |
@@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct |
28074 |
seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); |
28075 |
seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); |
28076 |
@@ -26500,21 +25969,9 @@ diff -urNp linux-2.6.38.3/drivers/message/fusion/mptbase.c linux-2.6.38.3/driver |
28077 |
/* |
28078 |
* Rounding UP to nearest 4-kB boundary here... |
28079 |
*/ |
28080 |
-diff -urNp linux-2.6.38.3/drivers/message/fusion/mptdebug.h linux-2.6.38.3/drivers/message/fusion/mptdebug.h |
28081 |
---- linux-2.6.38.3/drivers/message/fusion/mptdebug.h 2011-03-14 21:20:32.000000000 -0400 |
28082 |
-+++ linux-2.6.38.3/drivers/message/fusion/mptdebug.h 2011-04-17 15:57:32.000000000 -0400 |
28083 |
-@@ -71,7 +71,7 @@ |
28084 |
- CMD; \ |
28085 |
- } |
28086 |
- #else |
28087 |
--#define MPT_CHECK_LOGGING(IOC, CMD, BITS) |
28088 |
-+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) |
28089 |
- #endif |
28090 |
- |
28091 |
- |
28092 |
-diff -urNp linux-2.6.38.3/drivers/message/fusion/mptsas.c linux-2.6.38.3/drivers/message/fusion/mptsas.c |
28093 |
---- linux-2.6.38.3/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.000000000 -0400 |
28094 |
-+++ linux-2.6.38.3/drivers/message/fusion/mptsas.c 2011-04-17 15:57:32.000000000 -0400 |
28095 |
+diff -urNp linux-2.6.38.4/drivers/message/fusion/mptsas.c linux-2.6.38.4/drivers/message/fusion/mptsas.c |
28096 |
+--- linux-2.6.38.4/drivers/message/fusion/mptsas.c 2011-03-14 21:20:32.000000000 -0400 |
28097 |
++++ linux-2.6.38.4/drivers/message/fusion/mptsas.c 2011-04-17 15:57:32.000000000 -0400 |
28098 |
@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin |
28099 |
return 0; |
28100 |
} |
28101 |
@@ -26563,9 +26020,9 @@ diff -urNp linux-2.6.38.3/drivers/message/fusion/mptsas.c linux-2.6.38.3/drivers |
28102 |
static inline struct sas_port * |
28103 |
mptsas_get_port(struct mptsas_phyinfo *phy_info) |
28104 |
{ |
28105 |
-diff -urNp linux-2.6.38.3/drivers/message/fusion/mptscsih.c linux-2.6.38.3/drivers/message/fusion/mptscsih.c |
28106 |
---- linux-2.6.38.3/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32.000000000 -0400 |
28107 |
-+++ linux-2.6.38.3/drivers/message/fusion/mptscsih.c 2011-04-17 15:57:32.000000000 -0400 |
28108 |
+diff -urNp linux-2.6.38.4/drivers/message/fusion/mptscsih.c linux-2.6.38.4/drivers/message/fusion/mptscsih.c |
28109 |
+--- linux-2.6.38.4/drivers/message/fusion/mptscsih.c 2011-03-14 21:20:32.000000000 -0400 |
28110 |
++++ linux-2.6.38.4/drivers/message/fusion/mptscsih.c 2011-04-17 15:57:32.000000000 -0400 |
28111 |
@@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost) |
28112 |
|
28113 |
h = shost_priv(SChost); |
28114 |
@@ -26591,9 +26048,9 @@ diff -urNp linux-2.6.38.3/drivers/message/fusion/mptscsih.c linux-2.6.38.3/drive |
28115 |
|
28116 |
return h->info_kbuf; |
28117 |
} |
28118 |
-diff -urNp linux-2.6.38.3/drivers/message/i2o/i2o_proc.c linux-2.6.38.3/drivers/message/i2o/i2o_proc.c |
28119 |
---- linux-2.6.38.3/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.000000000 -0400 |
28120 |
-+++ linux-2.6.38.3/drivers/message/i2o/i2o_proc.c 2011-04-17 15:57:32.000000000 -0400 |
28121 |
+diff -urNp linux-2.6.38.4/drivers/message/i2o/i2o_proc.c linux-2.6.38.4/drivers/message/i2o/i2o_proc.c |
28122 |
+--- linux-2.6.38.4/drivers/message/i2o/i2o_proc.c 2011-03-14 21:20:32.000000000 -0400 |
28123 |
++++ linux-2.6.38.4/drivers/message/i2o/i2o_proc.c 2011-04-17 15:57:32.000000000 -0400 |
28124 |
@@ -255,13 +255,6 @@ static char *scsi_devices[] = { |
28125 |
"Array Controller Device" |
28126 |
}; |
28127 |
@@ -26680,9 +26137,9 @@ diff -urNp linux-2.6.38.3/drivers/message/i2o/i2o_proc.c linux-2.6.38.3/drivers/ |
28128 |
|
28129 |
return 0; |
28130 |
} |
28131 |
-diff -urNp linux-2.6.38.3/drivers/mfd/janz-cmodio.c linux-2.6.38.3/drivers/mfd/janz-cmodio.c |
28132 |
---- linux-2.6.38.3/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.000000000 -0400 |
28133 |
-+++ linux-2.6.38.3/drivers/mfd/janz-cmodio.c 2011-04-17 15:57:32.000000000 -0400 |
28134 |
+diff -urNp linux-2.6.38.4/drivers/mfd/janz-cmodio.c linux-2.6.38.4/drivers/mfd/janz-cmodio.c |
28135 |
+--- linux-2.6.38.4/drivers/mfd/janz-cmodio.c 2011-03-14 21:20:32.000000000 -0400 |
28136 |
++++ linux-2.6.38.4/drivers/mfd/janz-cmodio.c 2011-04-17 15:57:32.000000000 -0400 |
28137 |
@@ -13,6 +13,7 @@ |
28138 |
|
28139 |
#include <linux/kernel.h> |
28140 |
@@ -26691,9 +26148,9 @@ diff -urNp linux-2.6.38.3/drivers/mfd/janz-cmodio.c linux-2.6.38.3/drivers/mfd/j |
28141 |
#include <linux/init.h> |
28142 |
#include <linux/pci.h> |
28143 |
#include <linux/interrupt.h> |
28144 |
-diff -urNp linux-2.6.38.3/drivers/misc/kgdbts.c linux-2.6.38.3/drivers/misc/kgdbts.c |
28145 |
---- linux-2.6.38.3/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -0400 |
28146 |
-+++ linux-2.6.38.3/drivers/misc/kgdbts.c 2011-04-17 15:57:32.000000000 -0400 |
28147 |
+diff -urNp linux-2.6.38.4/drivers/misc/kgdbts.c linux-2.6.38.4/drivers/misc/kgdbts.c |
28148 |
+--- linux-2.6.38.4/drivers/misc/kgdbts.c 2011-03-14 21:20:32.000000000 -0400 |
28149 |
++++ linux-2.6.38.4/drivers/misc/kgdbts.c 2011-04-17 15:57:32.000000000 -0400 |
28150 |
@@ -118,7 +118,7 @@ |
28151 |
} while (0) |
28152 |
#define MAX_CONFIG_LEN 40 |
28153 |
@@ -26712,9 +26169,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/kgdbts.c linux-2.6.38.3/drivers/misc/kgdb |
28154 |
.name = "kgdbts", |
28155 |
.read_char = kgdbts_get_char, |
28156 |
.write_char = kgdbts_put_char, |
28157 |
-diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c |
28158 |
---- linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32.000000000 -0400 |
28159 |
-+++ linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:57:32.000000000 -0400 |
28160 |
+diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c |
28161 |
+--- linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c 2011-03-14 21:20:32.000000000 -0400 |
28162 |
++++ linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:57:32.000000000 -0400 |
28163 |
@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op |
28164 |
unsigned long nsec; |
28165 |
|
28166 |
@@ -26726,9 +26183,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.3/drive |
28167 |
if (mcs_op_statistics[op].max < nsec) |
28168 |
mcs_op_statistics[op].max = nsec; |
28169 |
} |
28170 |
-diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c |
28171 |
---- linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.000000000 -0400 |
28172 |
-+++ linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:57:32.000000000 -0400 |
28173 |
+diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c |
28174 |
+--- linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c 2011-03-14 21:20:32.000000000 -0400 |
28175 |
++++ linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:57:32.000000000 -0400 |
28176 |
@@ -32,9 +32,9 @@ |
28177 |
|
28178 |
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f) |
28179 |
@@ -26752,9 +26209,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.3/driver |
28180 |
max = mcs_op_statistics[op].max; |
28181 |
seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, |
28182 |
count ? total / count : 0, max); |
28183 |
-diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h |
28184 |
---- linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.000000000 -0400 |
28185 |
-+++ linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:57:32.000000000 -0400 |
28186 |
+diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h |
28187 |
+--- linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h 2011-03-14 21:20:32.000000000 -0400 |
28188 |
++++ linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:57:32.000000000 -0400 |
28189 |
@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids; |
28190 |
* GRU statistics. |
28191 |
*/ |
28192 |
@@ -26934,9 +26391,9 @@ diff -urNp linux-2.6.38.3/drivers/misc/sgi-gru/grutables.h linux-2.6.38.3/driver |
28193 |
} while (0) |
28194 |
|
28195 |
#ifdef CONFIG_SGI_GRU_DEBUG |
28196 |
-diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc2000.c linux-2.6.38.3/drivers/mtd/devices/doc2000.c |
28197 |
---- linux-2.6.38.3/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000000000 -0400 |
28198 |
-+++ linux-2.6.38.3/drivers/mtd/devices/doc2000.c 2011-04-17 15:57:32.000000000 -0400 |
28199 |
+diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2000.c linux-2.6.38.4/drivers/mtd/devices/doc2000.c |
28200 |
+--- linux-2.6.38.4/drivers/mtd/devices/doc2000.c 2011-03-14 21:20:32.000000000 -0400 |
28201 |
++++ linux-2.6.38.4/drivers/mtd/devices/doc2000.c 2011-04-17 15:57:32.000000000 -0400 |
28202 |
@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt |
28203 |
|
28204 |
/* The ECC will not be calculated correctly if less than 512 is written */ |
28205 |
@@ -26946,9 +26403,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc2000.c linux-2.6.38.3/drivers/m |
28206 |
printk(KERN_WARNING |
28207 |
"ECC needs a full sector write (adr: %lx size %lx)\n", |
28208 |
(long) to, (long) len); |
28209 |
-diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc2001.c linux-2.6.38.3/drivers/mtd/devices/doc2001.c |
28210 |
---- linux-2.6.38.3/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000000000 -0400 |
28211 |
-+++ linux-2.6.38.3/drivers/mtd/devices/doc2001.c 2011-04-17 15:57:32.000000000 -0400 |
28212 |
+diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2001.c linux-2.6.38.4/drivers/mtd/devices/doc2001.c |
28213 |
+--- linux-2.6.38.4/drivers/mtd/devices/doc2001.c 2011-03-14 21:20:32.000000000 -0400 |
28214 |
++++ linux-2.6.38.4/drivers/mtd/devices/doc2001.c 2011-04-17 15:57:32.000000000 -0400 |
28215 |
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt |
28216 |
struct Nand *mychip = &this->chips[from >> (this->chipshift)]; |
28217 |
|
28218 |
@@ -26958,9 +26415,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/devices/doc2001.c linux-2.6.38.3/drivers/m |
28219 |
return -EINVAL; |
28220 |
|
28221 |
/* Don't allow a single read to cross a 512-byte block boundary */ |
28222 |
-diff -urNp linux-2.6.38.3/drivers/mtd/nand/denali.c linux-2.6.38.3/drivers/mtd/nand/denali.c |
28223 |
---- linux-2.6.38.3/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.000000000 -0400 |
28224 |
-+++ linux-2.6.38.3/drivers/mtd/nand/denali.c 2011-04-17 15:57:32.000000000 -0400 |
28225 |
+diff -urNp linux-2.6.38.4/drivers/mtd/nand/denali.c linux-2.6.38.4/drivers/mtd/nand/denali.c |
28226 |
+--- linux-2.6.38.4/drivers/mtd/nand/denali.c 2011-03-14 21:20:32.000000000 -0400 |
28227 |
++++ linux-2.6.38.4/drivers/mtd/nand/denali.c 2011-04-17 15:57:32.000000000 -0400 |
28228 |
@@ -25,6 +25,7 @@ |
28229 |
#include <linux/pci.h> |
28230 |
#include <linux/mtd/mtd.h> |
28231 |
@@ -26969,9 +26426,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/nand/denali.c linux-2.6.38.3/drivers/mtd/n |
28232 |
|
28233 |
#include "denali.h" |
28234 |
|
28235 |
-diff -urNp linux-2.6.38.3/drivers/mtd/ubi/build.c linux-2.6.38.3/drivers/mtd/ubi/build.c |
28236 |
---- linux-2.6.38.3/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000 -0400 |
28237 |
-+++ linux-2.6.38.3/drivers/mtd/ubi/build.c 2011-04-17 15:57:32.000000000 -0400 |
28238 |
+diff -urNp linux-2.6.38.4/drivers/mtd/ubi/build.c linux-2.6.38.4/drivers/mtd/ubi/build.c |
28239 |
+--- linux-2.6.38.4/drivers/mtd/ubi/build.c 2011-03-14 21:20:32.000000000 -0400 |
28240 |
++++ linux-2.6.38.4/drivers/mtd/ubi/build.c 2011-04-17 15:57:32.000000000 -0400 |
28241 |
@@ -1285,7 +1285,7 @@ module_exit(ubi_exit); |
28242 |
static int __init bytes_str_to_int(const char *str) |
28243 |
{ |
28244 |
@@ -27011,9 +26468,9 @@ diff -urNp linux-2.6.38.3/drivers/mtd/ubi/build.c linux-2.6.38.3/drivers/mtd/ubi |
28245 |
} |
28246 |
|
28247 |
/** |
28248 |
-diff -urNp linux-2.6.38.3/drivers/net/e1000e/82571.c linux-2.6.38.3/drivers/net/e1000e/82571.c |
28249 |
---- linux-2.6.38.3/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000000 -0400 |
28250 |
-+++ linux-2.6.38.3/drivers/net/e1000e/82571.c 2011-04-17 15:57:32.000000000 -0400 |
28251 |
+diff -urNp linux-2.6.38.4/drivers/net/e1000e/82571.c linux-2.6.38.4/drivers/net/e1000e/82571.c |
28252 |
+--- linux-2.6.38.4/drivers/net/e1000e/82571.c 2011-03-14 21:20:32.000000000 -0400 |
28253 |
++++ linux-2.6.38.4/drivers/net/e1000e/82571.c 2011-04-17 15:57:32.000000000 -0400 |
28254 |
@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s |
28255 |
{ |
28256 |
struct e1000_hw *hw = &adapter->hw; |
28257 |
@@ -27068,9 +26525,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/82571.c linux-2.6.38.3/drivers/net/ |
28258 |
.acquire = e1000_acquire_nvm_82571, |
28259 |
.read = e1000e_read_nvm_eerd, |
28260 |
.release = e1000_release_nvm_82571, |
28261 |
-diff -urNp linux-2.6.38.3/drivers/net/e1000e/e1000.h linux-2.6.38.3/drivers/net/e1000e/e1000.h |
28262 |
---- linux-2.6.38.3/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000000 -0400 |
28263 |
-+++ linux-2.6.38.3/drivers/net/e1000e/e1000.h 2011-04-17 15:57:32.000000000 -0400 |
28264 |
+diff -urNp linux-2.6.38.4/drivers/net/e1000e/e1000.h linux-2.6.38.4/drivers/net/e1000e/e1000.h |
28265 |
+--- linux-2.6.38.4/drivers/net/e1000e/e1000.h 2011-03-14 21:20:32.000000000 -0400 |
28266 |
++++ linux-2.6.38.4/drivers/net/e1000e/e1000.h 2011-04-17 15:57:32.000000000 -0400 |
28267 |
@@ -408,9 +408,9 @@ struct e1000_info { |
28268 |
u32 pba; |
28269 |
u32 max_hw_frame_size; |
28270 |
@@ -27084,9 +26541,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/e1000.h linux-2.6.38.3/drivers/net/ |
28271 |
}; |
28272 |
|
28273 |
/* hardware capability, feature, and workaround flags */ |
28274 |
-diff -urNp linux-2.6.38.3/drivers/net/e1000e/es2lan.c linux-2.6.38.3/drivers/net/e1000e/es2lan.c |
28275 |
---- linux-2.6.38.3/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.000000000 -0400 |
28276 |
-+++ linux-2.6.38.3/drivers/net/e1000e/es2lan.c 2011-04-17 15:57:32.000000000 -0400 |
28277 |
+diff -urNp linux-2.6.38.4/drivers/net/e1000e/es2lan.c linux-2.6.38.4/drivers/net/e1000e/es2lan.c |
28278 |
+--- linux-2.6.38.4/drivers/net/e1000e/es2lan.c 2011-03-14 21:20:32.000000000 -0400 |
28279 |
++++ linux-2.6.38.4/drivers/net/e1000e/es2lan.c 2011-04-17 15:57:32.000000000 -0400 |
28280 |
@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es |
28281 |
{ |
28282 |
struct e1000_hw *hw = &adapter->hw; |
28283 |
@@ -27123,9 +26580,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/es2lan.c linux-2.6.38.3/drivers/net |
28284 |
.acquire = e1000_acquire_nvm_80003es2lan, |
28285 |
.read = e1000e_read_nvm_eerd, |
28286 |
.release = e1000_release_nvm_80003es2lan, |
28287 |
-diff -urNp linux-2.6.38.3/drivers/net/e1000e/hw.h linux-2.6.38.3/drivers/net/e1000e/hw.h |
28288 |
---- linux-2.6.38.3/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000 -0400 |
28289 |
-+++ linux-2.6.38.3/drivers/net/e1000e/hw.h 2011-04-17 15:57:32.000000000 -0400 |
28290 |
+diff -urNp linux-2.6.38.4/drivers/net/e1000e/hw.h linux-2.6.38.4/drivers/net/e1000e/hw.h |
28291 |
+--- linux-2.6.38.4/drivers/net/e1000e/hw.h 2011-03-14 21:20:32.000000000 -0400 |
28292 |
++++ linux-2.6.38.4/drivers/net/e1000e/hw.h 2011-04-17 15:57:32.000000000 -0400 |
28293 |
@@ -801,16 +801,17 @@ struct e1000_phy_operations { |
28294 |
|
28295 |
/* Function pointers for the NVM. */ |
28296 |
@@ -27167,9 +26624,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/hw.h linux-2.6.38.3/drivers/net/e10 |
28297 |
struct e1000_nvm_operations ops; |
28298 |
|
28299 |
enum e1000_nvm_type type; |
28300 |
-diff -urNp linux-2.6.38.3/drivers/net/e1000e/ich8lan.c linux-2.6.38.3/drivers/net/e1000e/ich8lan.c |
28301 |
---- linux-2.6.38.3/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.000000000 -0400 |
28302 |
-+++ linux-2.6.38.3/drivers/net/e1000e/ich8lan.c 2011-04-17 15:57:32.000000000 -0400 |
28303 |
+diff -urNp linux-2.6.38.4/drivers/net/e1000e/ich8lan.c linux-2.6.38.4/drivers/net/e1000e/ich8lan.c |
28304 |
+--- linux-2.6.38.4/drivers/net/e1000e/ich8lan.c 2011-03-14 21:20:32.000000000 -0400 |
28305 |
++++ linux-2.6.38.4/drivers/net/e1000e/ich8lan.c 2011-04-17 15:57:32.000000000 -0400 |
28306 |
@@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan |
28307 |
} |
28308 |
} |
28309 |
@@ -27197,9 +26654,9 @@ diff -urNp linux-2.6.38.3/drivers/net/e1000e/ich8lan.c linux-2.6.38.3/drivers/ne |
28310 |
.acquire = e1000_acquire_nvm_ich8lan, |
28311 |
.read = e1000_read_nvm_ich8lan, |
28312 |
.release = e1000_release_nvm_ich8lan, |
28313 |
-diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_82575.c linux-2.6.38.3/drivers/net/igb/e1000_82575.c |
28314 |
---- linux-2.6.38.3/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000000000 -0400 |
28315 |
-+++ linux-2.6.38.3/drivers/net/igb/e1000_82575.c 2011-04-17 15:57:32.000000000 -0400 |
28316 |
+diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_82575.c linux-2.6.38.4/drivers/net/igb/e1000_82575.c |
28317 |
+--- linux-2.6.38.4/drivers/net/igb/e1000_82575.c 2011-03-14 21:20:32.000000000 -0400 |
28318 |
++++ linux-2.6.38.4/drivers/net/igb/e1000_82575.c 2011-04-17 15:57:32.000000000 -0400 |
28319 |
@@ -1747,7 +1747,7 @@ u16 igb_rxpbs_adjust_82580(u32 data) |
28320 |
return ret_val; |
28321 |
} |
28322 |
@@ -27225,9 +26682,9 @@ diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_82575.c linux-2.6.38.3/drivers/n |
28323 |
.acquire = igb_acquire_nvm_82575, |
28324 |
.read = igb_read_nvm_eerd, |
28325 |
.release = igb_release_nvm_82575, |
28326 |
-diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_hw.h linux-2.6.38.3/drivers/net/igb/e1000_hw.h |
28327 |
---- linux-2.6.38.3/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000000 -0400 |
28328 |
-+++ linux-2.6.38.3/drivers/net/igb/e1000_hw.h 2011-04-17 15:57:32.000000000 -0400 |
28329 |
+diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_hw.h linux-2.6.38.4/drivers/net/igb/e1000_hw.h |
28330 |
+--- linux-2.6.38.4/drivers/net/igb/e1000_hw.h 2011-03-14 21:20:32.000000000 -0400 |
28331 |
++++ linux-2.6.38.4/drivers/net/igb/e1000_hw.h 2011-04-17 15:57:32.000000000 -0400 |
28332 |
@@ -327,22 +327,23 @@ struct e1000_phy_operations { |
28333 |
}; |
28334 |
|
28335 |
@@ -27275,9 +26732,9 @@ diff -urNp linux-2.6.38.3/drivers/net/igb/e1000_hw.h linux-2.6.38.3/drivers/net/ |
28336 |
struct e1000_nvm_operations ops; |
28337 |
|
28338 |
enum e1000_nvm_type type; |
28339 |
-diff -urNp linux-2.6.38.3/drivers/net/igbvf/vf.h linux-2.6.38.3/drivers/net/igbvf/vf.h |
28340 |
---- linux-2.6.38.3/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 -0400 |
28341 |
-+++ linux-2.6.38.3/drivers/net/igbvf/vf.h 2011-04-17 15:57:32.000000000 -0400 |
28342 |
+diff -urNp linux-2.6.38.4/drivers/net/igbvf/vf.h linux-2.6.38.4/drivers/net/igbvf/vf.h |
28343 |
+--- linux-2.6.38.4/drivers/net/igbvf/vf.h 2011-03-14 21:20:32.000000000 -0400 |
28344 |
++++ linux-2.6.38.4/drivers/net/igbvf/vf.h 2011-04-17 15:57:32.000000000 -0400 |
28345 |
@@ -191,6 +191,7 @@ struct e1000_mac_operations { |
28346 |
}; |
28347 |
|
28348 |
@@ -27286,28 +26743,9 @@ diff -urNp linux-2.6.38.3/drivers/net/igbvf/vf.h linux-2.6.38.3/drivers/net/igbv |
28349 |
struct e1000_mac_operations ops; |
28350 |
u8 addr[6]; |
28351 |
u8 perm_addr[6]; |
28352 |
-diff -urNp linux-2.6.38.3/drivers/net/irda/vlsi_ir.c linux-2.6.38.3/drivers/net/irda/vlsi_ir.c |
28353 |
---- linux-2.6.38.3/drivers/net/irda/vlsi_ir.c 2011-03-14 21:20:32.000000000 -0400 |
28354 |
-+++ linux-2.6.38.3/drivers/net/irda/vlsi_ir.c 2011-04-17 15:57:32.000000000 -0400 |
28355 |
-@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( |
28356 |
- /* no race - tx-ring already empty */ |
28357 |
- vlsi_set_baud(idev, iobase); |
28358 |
- netif_wake_queue(ndev); |
28359 |
-- } |
28360 |
-- else |
28361 |
-- ; |
28362 |
-+ } else { |
28363 |
- /* keep the speed change pending like it would |
28364 |
- * for any len>0 packet. tx completion interrupt |
28365 |
- * will apply it when the tx ring becomes empty. |
28366 |
- */ |
28367 |
-+ } |
28368 |
- spin_unlock_irqrestore(&idev->lock, flags); |
28369 |
- dev_kfree_skb_any(skb); |
28370 |
- return NETDEV_TX_OK; |
28371 |
-diff -urNp linux-2.6.38.3/drivers/net/pcnet32.c linux-2.6.38.3/drivers/net/pcnet32.c |
28372 |
---- linux-2.6.38.3/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -0400 |
28373 |
-+++ linux-2.6.38.3/drivers/net/pcnet32.c 2011-04-17 15:57:32.000000000 -0400 |
28374 |
+diff -urNp linux-2.6.38.4/drivers/net/pcnet32.c linux-2.6.38.4/drivers/net/pcnet32.c |
28375 |
+--- linux-2.6.38.4/drivers/net/pcnet32.c 2011-03-14 21:20:32.000000000 -0400 |
28376 |
++++ linux-2.6.38.4/drivers/net/pcnet32.c 2011-04-17 15:57:32.000000000 -0400 |
28377 |
@@ -82,7 +82,7 @@ static int cards_found; |
28378 |
/* |
28379 |
* VLB I/O addresses |
28380 |
@@ -27317,9 +26755,9 @@ diff -urNp linux-2.6.38.3/drivers/net/pcnet32.c linux-2.6.38.3/drivers/net/pcnet |
28381 |
{ 0x300, 0x320, 0x340, 0x360, 0 }; |
28382 |
|
28383 |
static int pcnet32_debug; |
28384 |
-diff -urNp linux-2.6.38.3/drivers/net/ppp_generic.c linux-2.6.38.3/drivers/net/ppp_generic.c |
28385 |
---- linux-2.6.38.3/drivers/net/ppp_generic.c 2011-03-14 21:20:32.000000000 -0400 |
28386 |
-+++ linux-2.6.38.3/drivers/net/ppp_generic.c 2011-04-17 15:57:32.000000000 -0400 |
28387 |
+diff -urNp linux-2.6.38.4/drivers/net/ppp_generic.c linux-2.6.38.4/drivers/net/ppp_generic.c |
28388 |
+--- linux-2.6.38.4/drivers/net/ppp_generic.c 2011-03-14 21:20:32.000000000 -0400 |
28389 |
++++ linux-2.6.38.4/drivers/net/ppp_generic.c 2011-04-17 15:57:32.000000000 -0400 |
28390 |
@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st |
28391 |
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; |
28392 |
struct ppp_stats stats; |
28393 |
@@ -27338,9 +26776,9 @@ diff -urNp linux-2.6.38.3/drivers/net/ppp_generic.c linux-2.6.38.3/drivers/net/p |
28394 |
break; |
28395 |
err = 0; |
28396 |
break; |
28397 |
-diff -urNp linux-2.6.38.3/drivers/net/tg3.h linux-2.6.38.3/drivers/net/tg3.h |
28398 |
---- linux-2.6.38.3/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400 |
28399 |
-+++ linux-2.6.38.3/drivers/net/tg3.h 2011-04-17 15:57:32.000000000 -0400 |
28400 |
+diff -urNp linux-2.6.38.4/drivers/net/tg3.h linux-2.6.38.4/drivers/net/tg3.h |
28401 |
+--- linux-2.6.38.4/drivers/net/tg3.h 2011-03-14 21:20:32.000000000 -0400 |
28402 |
++++ linux-2.6.38.4/drivers/net/tg3.h 2011-04-17 15:57:32.000000000 -0400 |
28403 |
@@ -131,6 +131,7 @@ |
28404 |
#define CHIPREV_ID_5750_A0 0x4000 |
28405 |
#define CHIPREV_ID_5750_A1 0x4001 |
28406 |
@@ -27349,9 +26787,9 @@ diff -urNp linux-2.6.38.3/drivers/net/tg3.h linux-2.6.38.3/drivers/net/tg3.h |
28407 |
#define CHIPREV_ID_5750_C2 0x4202 |
28408 |
#define CHIPREV_ID_5752_A0_HW 0x5000 |
28409 |
#define CHIPREV_ID_5752_A0 0x6000 |
28410 |
-diff -urNp linux-2.6.38.3/drivers/net/tulip/de4x5.c linux-2.6.38.3/drivers/net/tulip/de4x5.c |
28411 |
---- linux-2.6.38.3/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.000000000 -0400 |
28412 |
-+++ linux-2.6.38.3/drivers/net/tulip/de4x5.c 2011-04-17 15:57:32.000000000 -0400 |
28413 |
+diff -urNp linux-2.6.38.4/drivers/net/tulip/de4x5.c linux-2.6.38.4/drivers/net/tulip/de4x5.c |
28414 |
+--- linux-2.6.38.4/drivers/net/tulip/de4x5.c 2011-03-14 21:20:32.000000000 -0400 |
28415 |
++++ linux-2.6.38.4/drivers/net/tulip/de4x5.c 2011-04-17 15:57:32.000000000 -0400 |
28416 |
@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru |
28417 |
for (i=0; i<ETH_ALEN; i++) { |
28418 |
tmp.addr[i] = dev->dev_addr[i]; |
28419 |
@@ -27370,9 +26808,9 @@ diff -urNp linux-2.6.38.3/drivers/net/tulip/de4x5.c linux-2.6.38.3/drivers/net/t |
28420 |
return -EFAULT; |
28421 |
break; |
28422 |
} |
28423 |
-diff -urNp linux-2.6.38.3/drivers/net/usb/hso.c linux-2.6.38.3/drivers/net/usb/hso.c |
28424 |
---- linux-2.6.38.3/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -0400 |
28425 |
-+++ linux-2.6.38.3/drivers/net/usb/hso.c 2011-04-17 15:57:32.000000000 -0400 |
28426 |
+diff -urNp linux-2.6.38.4/drivers/net/usb/hso.c linux-2.6.38.4/drivers/net/usb/hso.c |
28427 |
+--- linux-2.6.38.4/drivers/net/usb/hso.c 2011-03-14 21:20:32.000000000 -0400 |
28428 |
++++ linux-2.6.38.4/drivers/net/usb/hso.c 2011-04-17 15:57:32.000000000 -0400 |
28429 |
@@ -71,7 +71,7 @@ |
28430 |
#include <asm/byteorder.h> |
28431 |
#include <linux/serial_core.h> |
28432 |
@@ -27469,9 +26907,9 @@ diff -urNp linux-2.6.38.3/drivers/net/usb/hso.c linux-2.6.38.3/drivers/net/usb/h |
28433 |
result = |
28434 |
hso_start_serial_device(serial_table[i], GFP_NOIO); |
28435 |
hso_kick_transmit(dev2ser(serial_table[i])); |
28436 |
-diff -urNp linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c |
28437 |
---- linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-18 17:27:18.000000000 -0400 |
28438 |
-+++ linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-17 16:53:41.000000000 -0400 |
28439 |
+diff -urNp linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c |
28440 |
+--- linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-18 17:27:18.000000000 -0400 |
28441 |
++++ linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-04-17 16:53:41.000000000 -0400 |
28442 |
@@ -628,8 +628,7 @@ vmxnet3_set_rss_indir(struct net_device |
28443 |
* Return with error code if any of the queue indices |
28444 |
* is out of range |
28445 |
@@ -27482,9 +26920,9 @@ diff -urNp linux-2.6.38.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.3/d |
28446 |
return -EINVAL; |
28447 |
} |
28448 |
|
28449 |
-diff -urNp linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c |
28450 |
---- linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
28451 |
-+++ linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:57:32.000000000 -0400 |
28452 |
+diff -urNp linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c |
28453 |
+--- linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
28454 |
++++ linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:57:32.000000000 -0400 |
28455 |
@@ -43,7 +43,7 @@ static struct dentry *rootdir; |
28456 |
struct b43_debugfs_fops { |
28457 |
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); |
28458 |
@@ -27494,9 +26932,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/b43/debugfs.c linux-2.6.38.3/driv |
28459 |
/* Offset of struct b43_dfs_file in struct b43_dfsentry */ |
28460 |
size_t file_struct_offset; |
28461 |
}; |
28462 |
-diff -urNp linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c |
28463 |
---- linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
28464 |
-+++ linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 15:57:32.000000000 -0400 |
28465 |
+diff -urNp linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c |
28466 |
+--- linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
28467 |
++++ linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 15:57:32.000000000 -0400 |
28468 |
@@ -44,7 +44,7 @@ static struct dentry *rootdir; |
28469 |
struct b43legacy_debugfs_fops { |
28470 |
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); |
28471 |
@@ -27506,9 +26944,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38. |
28472 |
/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ |
28473 |
size_t file_struct_offset; |
28474 |
/* Take wl->irq_lock before calling read/write? */ |
28475 |
-diff -urNp linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h |
28476 |
---- linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 21:20:32.000000000 -0400 |
28477 |
-+++ linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 15:57:32.000000000 -0400 |
28478 |
+diff -urNp linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h |
28479 |
+--- linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-14 21:20:32.000000000 -0400 |
28480 |
++++ linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 15:57:32.000000000 -0400 |
28481 |
@@ -68,8 +68,8 @@ do { |
28482 |
} while (0) |
28483 |
|
28484 |
@@ -27520,9 +26958,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38. |
28485 |
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, |
28486 |
const void *p, u32 len) |
28487 |
{} |
28488 |
-diff -urNp linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c |
28489 |
---- linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
28490 |
-+++ linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15:57:32.000000000 -0400 |
28491 |
+diff -urNp linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c |
28492 |
+--- linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
28493 |
++++ linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15:57:32.000000000 -0400 |
28494 |
@@ -702,7 +702,7 @@ out_unlock: |
28495 |
struct lbs_debugfs_files { |
28496 |
const char *name; |
28497 |
@@ -27532,9 +26970,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.3 |
28498 |
}; |
28499 |
|
28500 |
static const struct lbs_debugfs_files debugfs_files[] = { |
28501 |
-diff -urNp linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c |
28502 |
---- linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32.000000000 -0400 |
28503 |
-+++ linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:57:32.000000000 -0400 |
28504 |
+diff -urNp linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c |
28505 |
+--- linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c 2011-03-14 21:20:32.000000000 -0400 |
28506 |
++++ linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:57:32.000000000 -0400 |
28507 |
@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn |
28508 |
|
28509 |
netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold); |
28510 |
@@ -27544,9 +26982,9 @@ diff -urNp linux-2.6.38.3/drivers/net/wireless/rndis_wlan.c linux-2.6.38.3/drive |
28511 |
rts_threshold = 2347; |
28512 |
|
28513 |
tmp = cpu_to_le32(rts_threshold); |
28514 |
-diff -urNp linux-2.6.38.3/drivers/oprofile/buffer_sync.c linux-2.6.38.3/drivers/oprofile/buffer_sync.c |
28515 |
---- linux-2.6.38.3/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.000000000 -0400 |
28516 |
-+++ linux-2.6.38.3/drivers/oprofile/buffer_sync.c 2011-04-17 15:57:32.000000000 -0400 |
28517 |
+diff -urNp linux-2.6.38.4/drivers/oprofile/buffer_sync.c linux-2.6.38.4/drivers/oprofile/buffer_sync.c |
28518 |
+--- linux-2.6.38.4/drivers/oprofile/buffer_sync.c 2011-03-14 21:20:32.000000000 -0400 |
28519 |
++++ linux-2.6.38.4/drivers/oprofile/buffer_sync.c 2011-04-17 15:57:32.000000000 -0400 |
28520 |
@@ -342,7 +342,7 @@ static void add_data(struct op_entry *en |
28521 |
if (cookie == NO_COOKIE) |
28522 |
offset = pc; |
28523 |
@@ -27582,9 +27020,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/buffer_sync.c linux-2.6.38.3/drivers/ |
28524 |
} |
28525 |
} |
28526 |
release_mm(mm); |
28527 |
-diff -urNp linux-2.6.38.3/drivers/oprofile/event_buffer.c linux-2.6.38.3/drivers/oprofile/event_buffer.c |
28528 |
---- linux-2.6.38.3/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.000000000 -0400 |
28529 |
-+++ linux-2.6.38.3/drivers/oprofile/event_buffer.c 2011-04-17 15:57:32.000000000 -0400 |
28530 |
+diff -urNp linux-2.6.38.4/drivers/oprofile/event_buffer.c linux-2.6.38.4/drivers/oprofile/event_buffer.c |
28531 |
+--- linux-2.6.38.4/drivers/oprofile/event_buffer.c 2011-03-14 21:20:32.000000000 -0400 |
28532 |
++++ linux-2.6.38.4/drivers/oprofile/event_buffer.c 2011-04-17 15:57:32.000000000 -0400 |
28533 |
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value |
28534 |
} |
28535 |
|
28536 |
@@ -27594,9 +27032,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/event_buffer.c linux-2.6.38.3/drivers |
28537 |
return; |
28538 |
} |
28539 |
|
28540 |
-diff -urNp linux-2.6.38.3/drivers/oprofile/oprof.c linux-2.6.38.3/drivers/oprofile/oprof.c |
28541 |
---- linux-2.6.38.3/drivers/oprofile/oprof.c 2011-03-14 21:20:32.000000000 -0400 |
28542 |
-+++ linux-2.6.38.3/drivers/oprofile/oprof.c 2011-04-17 15:57:32.000000000 -0400 |
28543 |
+diff -urNp linux-2.6.38.4/drivers/oprofile/oprof.c linux-2.6.38.4/drivers/oprofile/oprof.c |
28544 |
+--- linux-2.6.38.4/drivers/oprofile/oprof.c 2011-03-14 21:20:32.000000000 -0400 |
28545 |
++++ linux-2.6.38.4/drivers/oprofile/oprof.c 2011-04-17 15:57:32.000000000 -0400 |
28546 |
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st |
28547 |
if (oprofile_ops.switch_events()) |
28548 |
return; |
28549 |
@@ -27606,9 +27044,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprof.c linux-2.6.38.3/drivers/oprofi |
28550 |
start_switch_worker(); |
28551 |
} |
28552 |
|
28553 |
-diff -urNp linux-2.6.38.3/drivers/oprofile/oprofilefs.c linux-2.6.38.3/drivers/oprofile/oprofilefs.c |
28554 |
---- linux-2.6.38.3/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000000000 -0400 |
28555 |
-+++ linux-2.6.38.3/drivers/oprofile/oprofilefs.c 2011-04-17 15:57:32.000000000 -0400 |
28556 |
+diff -urNp linux-2.6.38.4/drivers/oprofile/oprofilefs.c linux-2.6.38.4/drivers/oprofile/oprofilefs.c |
28557 |
+--- linux-2.6.38.4/drivers/oprofile/oprofilefs.c 2011-03-14 21:20:32.000000000 -0400 |
28558 |
++++ linux-2.6.38.4/drivers/oprofile/oprofilefs.c 2011-04-17 15:57:32.000000000 -0400 |
28559 |
@@ -186,7 +186,7 @@ static const struct file_operations atom |
28560 |
|
28561 |
|
28562 |
@@ -27618,9 +27056,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprofilefs.c linux-2.6.38.3/drivers/o |
28563 |
{ |
28564 |
return __oprofilefs_create_file(sb, root, name, |
28565 |
&atomic_ro_fops, 0444, val); |
28566 |
-diff -urNp linux-2.6.38.3/drivers/oprofile/oprofile_stats.c linux-2.6.38.3/drivers/oprofile/oprofile_stats.c |
28567 |
---- linux-2.6.38.3/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32.000000000 -0400 |
28568 |
-+++ linux-2.6.38.3/drivers/oprofile/oprofile_stats.c 2011-04-17 15:57:32.000000000 -0400 |
28569 |
+diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.c linux-2.6.38.4/drivers/oprofile/oprofile_stats.c |
28570 |
+--- linux-2.6.38.4/drivers/oprofile/oprofile_stats.c 2011-03-14 21:20:32.000000000 -0400 |
28571 |
++++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.c 2011-04-17 15:57:32.000000000 -0400 |
28572 |
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) |
28573 |
cpu_buf->sample_invalid_eip = 0; |
28574 |
} |
28575 |
@@ -27638,9 +27076,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprofile_stats.c linux-2.6.38.3/drive |
28576 |
} |
28577 |
|
28578 |
|
28579 |
-diff -urNp linux-2.6.38.3/drivers/oprofile/oprofile_stats.h linux-2.6.38.3/drivers/oprofile/oprofile_stats.h |
28580 |
---- linux-2.6.38.3/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32.000000000 -0400 |
28581 |
-+++ linux-2.6.38.3/drivers/oprofile/oprofile_stats.h 2011-04-17 15:57:32.000000000 -0400 |
28582 |
+diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.h linux-2.6.38.4/drivers/oprofile/oprofile_stats.h |
28583 |
+--- linux-2.6.38.4/drivers/oprofile/oprofile_stats.h 2011-03-14 21:20:32.000000000 -0400 |
28584 |
++++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.h 2011-04-17 15:57:32.000000000 -0400 |
28585 |
@@ -13,11 +13,11 @@ |
28586 |
#include <asm/atomic.h> |
28587 |
|
28588 |
@@ -27658,9 +27096,9 @@ diff -urNp linux-2.6.38.3/drivers/oprofile/oprofile_stats.h linux-2.6.38.3/drive |
28589 |
}; |
28590 |
|
28591 |
extern struct oprofile_stat_struct oprofile_stats; |
28592 |
-diff -urNp linux-2.6.38.3/drivers/parport/procfs.c linux-2.6.38.3/drivers/parport/procfs.c |
28593 |
---- linux-2.6.38.3/drivers/parport/procfs.c 2011-03-14 21:20:32.000000000 -0400 |
28594 |
-+++ linux-2.6.38.3/drivers/parport/procfs.c 2011-04-17 15:57:32.000000000 -0400 |
28595 |
+diff -urNp linux-2.6.38.4/drivers/parport/procfs.c linux-2.6.38.4/drivers/parport/procfs.c |
28596 |
+--- linux-2.6.38.4/drivers/parport/procfs.c 2011-03-14 21:20:32.000000000 -0400 |
28597 |
++++ linux-2.6.38.4/drivers/parport/procfs.c 2011-04-17 15:57:32.000000000 -0400 |
28598 |
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t |
28599 |
|
28600 |
*ppos += len; |
28601 |
@@ -27679,9 +27117,9 @@ diff -urNp linux-2.6.38.3/drivers/parport/procfs.c linux-2.6.38.3/drivers/parpor |
28602 |
} |
28603 |
#endif /* IEEE1284.3 support. */ |
28604 |
|
28605 |
-diff -urNp linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c |
28606 |
---- linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c 2011-04-18 17:27:16.000000000 -0400 |
28607 |
-+++ linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:57:32.000000000 -0400 |
28608 |
+diff -urNp linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c |
28609 |
+--- linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c 2011-04-18 17:27:16.000000000 -0400 |
28610 |
++++ linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:57:32.000000000 -0400 |
28611 |
@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif |
28612 |
} |
28613 |
|
28614 |
@@ -27691,9 +27129,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.3/driv |
28615 |
.handler = handle_hotplug_event_func, |
28616 |
}; |
28617 |
|
28618 |
-diff -urNp linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c |
28619 |
---- linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:32.000000000 -0400 |
28620 |
-+++ linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:57:32.000000000 -0400 |
28621 |
+diff -urNp linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c |
28622 |
+--- linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-14 21:20:32.000000000 -0400 |
28623 |
++++ linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:57:32.000000000 -0400 |
28624 |
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ |
28625 |
|
28626 |
void compaq_nvram_init (void __iomem *rom_start) |
28627 |
@@ -27708,9 +27146,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.3/driv |
28628 |
dbg("int15 entry = %p\n", compaq_int15_entry_point); |
28629 |
|
28630 |
/* initialize our int15 lock */ |
28631 |
-diff -urNp linux-2.6.38.3/drivers/pci/intel-iommu.c linux-2.6.38.3/drivers/pci/intel-iommu.c |
28632 |
---- linux-2.6.38.3/drivers/pci/intel-iommu.c 2011-03-14 21:20:32.000000000 -0400 |
28633 |
-+++ linux-2.6.38.3/drivers/pci/intel-iommu.c 2011-04-17 15:57:32.000000000 -0400 |
28634 |
+diff -urNp linux-2.6.38.4/drivers/pci/intel-iommu.c linux-2.6.38.4/drivers/pci/intel-iommu.c |
28635 |
+--- linux-2.6.38.4/drivers/pci/intel-iommu.c 2011-03-14 21:20:32.000000000 -0400 |
28636 |
++++ linux-2.6.38.4/drivers/pci/intel-iommu.c 2011-04-17 15:57:32.000000000 -0400 |
28637 |
@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de |
28638 |
return !dma_addr; |
28639 |
} |
28640 |
@@ -27720,9 +27158,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/intel-iommu.c linux-2.6.38.3/drivers/pci/i |
28641 |
.alloc_coherent = intel_alloc_coherent, |
28642 |
.free_coherent = intel_free_coherent, |
28643 |
.map_sg = intel_map_sg, |
28644 |
-diff -urNp linux-2.6.38.3/drivers/pci/pcie/aspm.c linux-2.6.38.3/drivers/pci/pcie/aspm.c |
28645 |
---- linux-2.6.38.3/drivers/pci/pcie/aspm.c 2011-04-18 17:27:18.000000000 -0400 |
28646 |
-+++ linux-2.6.38.3/drivers/pci/pcie/aspm.c 2011-04-17 16:53:41.000000000 -0400 |
28647 |
+diff -urNp linux-2.6.38.4/drivers/pci/pcie/aspm.c linux-2.6.38.4/drivers/pci/pcie/aspm.c |
28648 |
+--- linux-2.6.38.4/drivers/pci/pcie/aspm.c 2011-04-18 17:27:18.000000000 -0400 |
28649 |
++++ linux-2.6.38.4/drivers/pci/pcie/aspm.c 2011-04-17 16:53:41.000000000 -0400 |
28650 |
@@ -27,9 +27,9 @@ |
28651 |
#define MODULE_PARAM_PREFIX "pcie_aspm." |
28652 |
|
28653 |
@@ -27736,21 +27174,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/pcie/aspm.c linux-2.6.38.3/drivers/pci/pci |
28654 |
#define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) |
28655 |
#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) |
28656 |
|
28657 |
-diff -urNp linux-2.6.38.3/drivers/pci/pcie/portdrv_pci.c linux-2.6.38.3/drivers/pci/pcie/portdrv_pci.c |
28658 |
---- linux-2.6.38.3/drivers/pci/pcie/portdrv_pci.c 2011-03-14 21:20:32.000000000 -0400 |
28659 |
-+++ linux-2.6.38.3/drivers/pci/pcie/portdrv_pci.c 2011-04-17 15:57:32.000000000 -0400 |
28660 |
-@@ -307,7 +307,7 @@ static void pcie_portdrv_err_resume(stru |
28661 |
- static const struct pci_device_id port_pci_ids[] = { { |
28662 |
- /* handle any PCI-Express port */ |
28663 |
- PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0), |
28664 |
-- }, { /* end: all zeroes */ } |
28665 |
-+ }, { 0, 0, 0, 0, 0, 0, 0 } |
28666 |
- }; |
28667 |
- MODULE_DEVICE_TABLE(pci, port_pci_ids); |
28668 |
- |
28669 |
-diff -urNp linux-2.6.38.3/drivers/pci/probe.c linux-2.6.38.3/drivers/pci/probe.c |
28670 |
---- linux-2.6.38.3/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -0400 |
28671 |
-+++ linux-2.6.38.3/drivers/pci/probe.c 2011-04-17 15:57:32.000000000 -0400 |
28672 |
+diff -urNp linux-2.6.38.4/drivers/pci/probe.c linux-2.6.38.4/drivers/pci/probe.c |
28673 |
+--- linux-2.6.38.4/drivers/pci/probe.c 2011-03-14 21:20:32.000000000 -0400 |
28674 |
++++ linux-2.6.38.4/drivers/pci/probe.c 2011-04-17 15:57:32.000000000 -0400 |
28675 |
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( |
28676 |
return ret; |
28677 |
} |
28678 |
@@ -27777,9 +27203,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/probe.c linux-2.6.38.3/drivers/pci/probe.c |
28679 |
|
28680 |
if (!dev->mmio_always_on) { |
28681 |
pci_read_config_word(dev, PCI_COMMAND, &orig_cmd); |
28682 |
-diff -urNp linux-2.6.38.3/drivers/pci/proc.c linux-2.6.38.3/drivers/pci/proc.c |
28683 |
---- linux-2.6.38.3/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -0400 |
28684 |
-+++ linux-2.6.38.3/drivers/pci/proc.c 2011-04-17 15:57:32.000000000 -0400 |
28685 |
+diff -urNp linux-2.6.38.4/drivers/pci/proc.c linux-2.6.38.4/drivers/pci/proc.c |
28686 |
+--- linux-2.6.38.4/drivers/pci/proc.c 2011-03-14 21:20:32.000000000 -0400 |
28687 |
++++ linux-2.6.38.4/drivers/pci/proc.c 2011-04-17 15:57:32.000000000 -0400 |
28688 |
@@ -476,7 +476,16 @@ static const struct file_operations proc |
28689 |
static int __init pci_proc_init(void) |
28690 |
{ |
28691 |
@@ -27797,33 +27223,9 @@ diff -urNp linux-2.6.38.3/drivers/pci/proc.c linux-2.6.38.3/drivers/pci/proc.c |
28692 |
proc_create("devices", 0, proc_bus_pci_dir, |
28693 |
&proc_bus_pci_dev_operations); |
28694 |
proc_initialized = 1; |
28695 |
-diff -urNp linux-2.6.38.3/drivers/pcmcia/ti113x.h linux-2.6.38.3/drivers/pcmcia/ti113x.h |
28696 |
---- linux-2.6.38.3/drivers/pcmcia/ti113x.h 2011-03-14 21:20:32.000000000 -0400 |
28697 |
-+++ linux-2.6.38.3/drivers/pcmcia/ti113x.h 2011-04-17 15:57:32.000000000 -0400 |
28698 |
-@@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl |
28699 |
- DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, |
28700 |
- ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), |
28701 |
- |
28702 |
-- {} |
28703 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
28704 |
- }; |
28705 |
- |
28706 |
- static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) |
28707 |
-diff -urNp linux-2.6.38.3/drivers/pcmcia/yenta_socket.c linux-2.6.38.3/drivers/pcmcia/yenta_socket.c |
28708 |
---- linux-2.6.38.3/drivers/pcmcia/yenta_socket.c 2011-03-14 21:20:32.000000000 -0400 |
28709 |
-+++ linux-2.6.38.3/drivers/pcmcia/yenta_socket.c 2011-04-17 15:57:32.000000000 -0400 |
28710 |
-@@ -1426,7 +1426,7 @@ static struct pci_device_id yenta_table[ |
28711 |
- |
28712 |
- /* match any cardbus bridge */ |
28713 |
- CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT), |
28714 |
-- { /* all zeroes */ } |
28715 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
28716 |
- }; |
28717 |
- MODULE_DEVICE_TABLE(pci, yenta_table); |
28718 |
- |
28719 |
-diff -urNp linux-2.6.38.3/drivers/platform/x86/asus-laptop.c linux-2.6.38.3/drivers/platform/x86/asus-laptop.c |
28720 |
---- linux-2.6.38.3/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:32.000000000 -0400 |
28721 |
-+++ linux-2.6.38.3/drivers/platform/x86/asus-laptop.c 2011-04-17 15:57:32.000000000 -0400 |
28722 |
+diff -urNp linux-2.6.38.4/drivers/platform/x86/asus-laptop.c linux-2.6.38.4/drivers/platform/x86/asus-laptop.c |
28723 |
+--- linux-2.6.38.4/drivers/platform/x86/asus-laptop.c 2011-03-14 21:20:32.000000000 -0400 |
28724 |
++++ linux-2.6.38.4/drivers/platform/x86/asus-laptop.c 2011-04-17 15:57:32.000000000 -0400 |
28725 |
@@ -243,7 +243,6 @@ struct asus_laptop { |
28726 |
struct asus_led gled; |
28727 |
struct asus_led kled; |
28728 |
@@ -27832,9 +27234,9 @@ diff -urNp linux-2.6.38.3/drivers/platform/x86/asus-laptop.c linux-2.6.38.3/driv |
28729 |
int wireless_status; |
28730 |
bool have_rsts; |
28731 |
int lcd_state; |
28732 |
-diff -urNp linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c |
28733 |
---- linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.000000000 -0400 |
28734 |
-+++ linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:57:32.000000000 -0400 |
28735 |
+diff -urNp linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c |
28736 |
+--- linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c 2011-03-14 21:20:32.000000000 -0400 |
28737 |
++++ linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:57:32.000000000 -0400 |
28738 |
@@ -59,7 +59,7 @@ do { \ |
28739 |
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ |
28740 |
} while(0) |
28741 |
@@ -27891,21 +27293,9 @@ diff -urNp linux-2.6.38.3/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.3/drivers |
28742 |
+ |
28743 |
+ pax_close_kernel(); |
28744 |
} |
28745 |
-diff -urNp linux-2.6.38.3/drivers/pnp/quirks.c linux-2.6.38.3/drivers/pnp/quirks.c |
28746 |
---- linux-2.6.38.3/drivers/pnp/quirks.c 2011-03-14 21:20:32.000000000 -0400 |
28747 |
-+++ linux-2.6.38.3/drivers/pnp/quirks.c 2011-04-17 15:57:32.000000000 -0400 |
28748 |
-@@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = { |
28749 |
- /* PnP resources that might overlap PCI BARs */ |
28750 |
- {"PNP0c01", quirk_system_pci_resources}, |
28751 |
- {"PNP0c02", quirk_system_pci_resources}, |
28752 |
-- {""} |
28753 |
-+ {"", NULL} |
28754 |
- }; |
28755 |
- |
28756 |
- void pnp_fixup_device(struct pnp_dev *dev) |
28757 |
-diff -urNp linux-2.6.38.3/drivers/pnp/resource.c linux-2.6.38.3/drivers/pnp/resource.c |
28758 |
---- linux-2.6.38.3/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 -0400 |
28759 |
-+++ linux-2.6.38.3/drivers/pnp/resource.c 2011-04-17 15:57:32.000000000 -0400 |
28760 |
+diff -urNp linux-2.6.38.4/drivers/pnp/resource.c linux-2.6.38.4/drivers/pnp/resource.c |
28761 |
+--- linux-2.6.38.4/drivers/pnp/resource.c 2011-03-14 21:20:32.000000000 -0400 |
28762 |
++++ linux-2.6.38.4/drivers/pnp/resource.c 2011-04-17 15:57:32.000000000 -0400 |
28763 |
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s |
28764 |
return 1; |
28765 |
|
28766 |
@@ -27924,9 +27314,9 @@ diff -urNp linux-2.6.38.3/drivers/pnp/resource.c linux-2.6.38.3/drivers/pnp/reso |
28767 |
return 0; |
28768 |
|
28769 |
/* check if the resource is reserved */ |
28770 |
-diff -urNp linux-2.6.38.3/drivers/rtc/rtc-dev.c linux-2.6.38.3/drivers/rtc/rtc-dev.c |
28771 |
---- linux-2.6.38.3/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -0400 |
28772 |
-+++ linux-2.6.38.3/drivers/rtc/rtc-dev.c 2011-04-17 15:57:32.000000000 -0400 |
28773 |
+diff -urNp linux-2.6.38.4/drivers/rtc/rtc-dev.c linux-2.6.38.4/drivers/rtc/rtc-dev.c |
28774 |
+--- linux-2.6.38.4/drivers/rtc/rtc-dev.c 2011-03-14 21:20:32.000000000 -0400 |
28775 |
++++ linux-2.6.38.4/drivers/rtc/rtc-dev.c 2011-04-17 15:57:32.000000000 -0400 |
28776 |
@@ -14,6 +14,7 @@ |
28777 |
#include <linux/module.h> |
28778 |
#include <linux/rtc.h> |
28779 |
@@ -27944,9 +27334,9 @@ diff -urNp linux-2.6.38.3/drivers/rtc/rtc-dev.c linux-2.6.38.3/drivers/rtc/rtc-d |
28780 |
return rtc_set_time(rtc, &tm); |
28781 |
|
28782 |
case RTC_PIE_ON: |
28783 |
-diff -urNp linux-2.6.38.3/drivers/s390/cio/qdio_debug.c linux-2.6.38.3/drivers/s390/cio/qdio_debug.c |
28784 |
---- linux-2.6.38.3/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000000000 -0400 |
28785 |
-+++ linux-2.6.38.3/drivers/s390/cio/qdio_debug.c 2011-04-17 15:57:32.000000000 -0400 |
28786 |
+diff -urNp linux-2.6.38.4/drivers/s390/cio/qdio_debug.c linux-2.6.38.4/drivers/s390/cio/qdio_debug.c |
28787 |
+--- linux-2.6.38.4/drivers/s390/cio/qdio_debug.c 2011-03-14 21:20:32.000000000 -0400 |
28788 |
++++ linux-2.6.38.4/drivers/s390/cio/qdio_debug.c 2011-04-17 15:57:32.000000000 -0400 |
28789 |
@@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode * |
28790 |
filp->f_path.dentry->d_inode->i_private); |
28791 |
} |
28792 |
@@ -27956,9 +27346,9 @@ diff -urNp linux-2.6.38.3/drivers/s390/cio/qdio_debug.c linux-2.6.38.3/drivers/s |
28793 |
.owner = THIS_MODULE, |
28794 |
.open = qperf_seq_open, |
28795 |
.read = seq_read, |
28796 |
-diff -urNp linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c |
28797 |
---- linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:32.000000000 -0400 |
28798 |
-+++ linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:57:32.000000000 -0400 |
28799 |
+diff -urNp linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c |
28800 |
+--- linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-14 21:20:32.000000000 -0400 |
28801 |
++++ linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:57:32.000000000 -0400 |
28802 |
@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru |
28803 |
flash_error_table[i].reason); |
28804 |
} |
28805 |
@@ -27968,9 +27358,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.3/dri |
28806 |
asd_show_update_bios, asd_store_update_bios); |
28807 |
|
28808 |
static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) |
28809 |
-diff -urNp linux-2.6.38.3/drivers/scsi/hpsa.c linux-2.6.38.3/drivers/scsi/hpsa.c |
28810 |
---- linux-2.6.38.3/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -0400 |
28811 |
-+++ linux-2.6.38.3/drivers/scsi/hpsa.c 2011-04-17 15:57:32.000000000 -0400 |
28812 |
+diff -urNp linux-2.6.38.4/drivers/scsi/hpsa.c linux-2.6.38.4/drivers/scsi/hpsa.c |
28813 |
+--- linux-2.6.38.4/drivers/scsi/hpsa.c 2011-03-14 21:20:32.000000000 -0400 |
28814 |
++++ linux-2.6.38.4/drivers/scsi/hpsa.c 2011-04-17 15:57:32.000000000 -0400 |
28815 |
@@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct |
28816 |
int err; |
28817 |
u32 cp; |
28818 |
@@ -27980,9 +27370,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/hpsa.c linux-2.6.38.3/drivers/scsi/hpsa.c |
28819 |
err = 0; |
28820 |
err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info, |
28821 |
sizeof(arg64.LUN_info)); |
28822 |
-diff -urNp linux-2.6.38.3/drivers/scsi/ipr.c linux-2.6.38.3/drivers/scsi/ipr.c |
28823 |
---- linux-2.6.38.3/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -0400 |
28824 |
-+++ linux-2.6.38.3/drivers/scsi/ipr.c 2011-04-17 15:57:32.000000000 -0400 |
28825 |
+diff -urNp linux-2.6.38.4/drivers/scsi/ipr.c linux-2.6.38.4/drivers/scsi/ipr.c |
28826 |
+--- linux-2.6.38.4/drivers/scsi/ipr.c 2011-03-14 21:20:32.000000000 -0400 |
28827 |
++++ linux-2.6.38.4/drivers/scsi/ipr.c 2011-04-17 15:57:32.000000000 -0400 |
28828 |
@@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_q |
28829 |
return true; |
28830 |
} |
28831 |
@@ -27992,9 +27382,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/ipr.c linux-2.6.38.3/drivers/scsi/ipr.c |
28832 |
.phy_reset = ipr_ata_phy_reset, |
28833 |
.hardreset = ipr_sata_reset, |
28834 |
.post_internal_cmd = ipr_ata_post_internal, |
28835 |
-diff -urNp linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c |
28836 |
---- linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.000000000 -0400 |
28837 |
-+++ linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:57:32.000000000 -0400 |
28838 |
+diff -urNp linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c |
28839 |
+--- linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c 2011-03-14 21:20:32.000000000 -0400 |
28840 |
++++ linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c 2011-04-17 15:57:32.000000000 -0400 |
28841 |
@@ -105,12 +105,12 @@ struct fc_exch_mgr { |
28842 |
* all together if not used XXX |
28843 |
*/ |
28844 |
@@ -28116,10 +27506,10 @@ diff -urNp linux-2.6.38.3/drivers/scsi/libfc/fc_exch.c linux-2.6.38.3/drivers/sc |
28845 |
|
28846 |
fc_frame_free(fp); |
28847 |
} |
28848 |
-diff -urNp linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c |
28849 |
---- linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000000000 -0400 |
28850 |
-+++ linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c 2011-04-17 15:57:32.000000000 -0400 |
28851 |
-@@ -348,10 +348,10 @@ static int sas_ata_scr_read(struct ata_l |
28852 |
+diff -urNp linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c |
28853 |
+--- linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c 2011-03-14 21:20:32.000000000 -0400 |
28854 |
++++ linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c 2011-04-23 12:47:28.000000000 -0400 |
28855 |
+@@ -348,7 +348,7 @@ static int sas_ata_scr_read(struct ata_l |
28856 |
} |
28857 |
} |
28858 |
|
28859 |
@@ -28127,26 +27517,10 @@ diff -urNp linux-2.6.38.3/drivers/scsi/libsas/sas_ata.c linux-2.6.38.3/drivers/s |
28860 |
+static const struct ata_port_operations sas_sata_ops = { |
28861 |
.phy_reset = sas_ata_phy_reset, |
28862 |
.post_internal_cmd = sas_ata_post_internal, |
28863 |
-- .qc_defer = ata_std_qc_defer, |
28864 |
-+ .qc_defer = ata_std_qc_defer, |
28865 |
- .qc_prep = ata_noop_qc_prep, |
28866 |
- .qc_issue = sas_ata_qc_issue, |
28867 |
- .qc_fill_rtf = sas_ata_qc_fill_rtf, |
28868 |
-diff -urNp linux-2.6.38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h |
28869 |
---- linux-2.6.38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-03-14 21:20:32.000000000 -0400 |
28870 |
-+++ linux-2.6.38.3/drivers/scsi/mpt2sas/mpt2sas_debug.h 2011-04-17 15:57:32.000000000 -0400 |
28871 |
-@@ -79,7 +79,7 @@ |
28872 |
- CMD; \ |
28873 |
- } |
28874 |
- #else |
28875 |
--#define MPT_CHECK_LOGGING(IOC, CMD, BITS) |
28876 |
-+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0) |
28877 |
- #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ |
28878 |
- |
28879 |
- |
28880 |
-diff -urNp linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c |
28881 |
---- linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000000000 -0400 |
28882 |
-+++ linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c 2011-04-17 15:57:32.000000000 -0400 |
28883 |
+ .qc_defer = ata_std_qc_defer, |
28884 |
+diff -urNp linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c |
28885 |
+--- linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c 2011-03-14 21:20:32.000000000 -0400 |
28886 |
++++ linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c 2011-04-17 15:57:32.000000000 -0400 |
28887 |
@@ -4096,7 +4096,7 @@ static struct pci_driver qla2xxx_pci_dri |
28888 |
.err_handler = &qla2xxx_err_handler, |
28889 |
}; |
28890 |
@@ -28156,21 +27530,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.3/drivers/s |
28891 |
.owner = THIS_MODULE, |
28892 |
.llseek = noop_llseek, |
28893 |
}; |
28894 |
-diff -urNp linux-2.6.38.3/drivers/scsi/scsi_logging.h linux-2.6.38.3/drivers/scsi/scsi_logging.h |
28895 |
---- linux-2.6.38.3/drivers/scsi/scsi_logging.h 2011-03-14 21:20:32.000000000 -0400 |
28896 |
-+++ linux-2.6.38.3/drivers/scsi/scsi_logging.h 2011-04-17 15:57:32.000000000 -0400 |
28897 |
-@@ -51,7 +51,7 @@ do { \ |
28898 |
- } while (0); \ |
28899 |
- } while (0) |
28900 |
- #else |
28901 |
--#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) |
28902 |
-+#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) do {} while (0) |
28903 |
- #endif /* CONFIG_SCSI_LOGGING */ |
28904 |
- |
28905 |
- /* |
28906 |
-diff -urNp linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c |
28907 |
---- linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c 2011-03-14 21:20:32.000000000 -0400 |
28908 |
-+++ linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c 2011-04-17 15:57:32.000000000 -0400 |
28909 |
+diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c |
28910 |
+--- linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c 2011-03-14 21:20:32.000000000 -0400 |
28911 |
++++ linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c 2011-04-17 15:57:32.000000000 -0400 |
28912 |
@@ -836,7 +836,7 @@ static int fc_str_to_dev_loss(const char |
28913 |
char *cp; |
28914 |
|
28915 |
@@ -28180,9 +27542,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/scsi_transport_fc.c linux-2.6.38.3/driver |
28916 |
return -EINVAL; |
28917 |
/* |
28918 |
* Check for overflow; dev_loss_tmo is u32 |
28919 |
-diff -urNp linux-2.6.38.3/drivers/scsi/sg.c linux-2.6.38.3/drivers/scsi/sg.c |
28920 |
---- linux-2.6.38.3/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400 |
28921 |
-+++ linux-2.6.38.3/drivers/scsi/sg.c 2011-04-17 15:57:32.000000000 -0400 |
28922 |
+diff -urNp linux-2.6.38.4/drivers/scsi/sg.c linux-2.6.38.4/drivers/scsi/sg.c |
28923 |
+--- linux-2.6.38.4/drivers/scsi/sg.c 2011-03-14 21:20:32.000000000 -0400 |
28924 |
++++ linux-2.6.38.4/drivers/scsi/sg.c 2011-04-17 15:57:32.000000000 -0400 |
28925 |
@@ -2310,7 +2310,7 @@ struct sg_proc_leaf { |
28926 |
const struct file_operations * fops; |
28927 |
}; |
28928 |
@@ -28201,9 +27563,9 @@ diff -urNp linux-2.6.38.3/drivers/scsi/sg.c linux-2.6.38.3/drivers/scsi/sg.c |
28929 |
|
28930 |
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); |
28931 |
if (!sg_proc_sgp) |
28932 |
-diff -urNp linux-2.6.38.3/drivers/staging/autofs/root.c linux-2.6.38.3/drivers/staging/autofs/root.c |
28933 |
---- linux-2.6.38.3/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000000000 -0400 |
28934 |
-+++ linux-2.6.38.3/drivers/staging/autofs/root.c 2011-04-17 15:57:32.000000000 -0400 |
28935 |
+diff -urNp linux-2.6.38.4/drivers/staging/autofs/root.c linux-2.6.38.4/drivers/staging/autofs/root.c |
28936 |
+--- linux-2.6.38.4/drivers/staging/autofs/root.c 2011-03-14 21:20:32.000000000 -0400 |
28937 |
++++ linux-2.6.38.4/drivers/staging/autofs/root.c 2011-04-17 15:57:32.000000000 -0400 |
28938 |
@@ -311,7 +311,8 @@ static int autofs_root_symlink(struct in |
28939 |
set_bit(n,sbi->symlink_bitmap); |
28940 |
sl = &sbi->symlink[n]; |
28941 |
@@ -28214,9 +27576,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/autofs/root.c linux-2.6.38.3/drivers/s |
28942 |
if (!sl->data) { |
28943 |
clear_bit(n,sbi->symlink_bitmap); |
28944 |
unlock_kernel(); |
28945 |
-diff -urNp linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c |
28946 |
---- linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000000000 -0400 |
28947 |
-+++ linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c 2011-04-17 15:57:32.000000000 -0400 |
28948 |
+diff -urNp linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c |
28949 |
+--- linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c 2011-03-14 21:20:32.000000000 -0400 |
28950 |
++++ linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c 2011-04-17 15:57:32.000000000 -0400 |
28951 |
@@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file * |
28952 |
} |
28953 |
|
28954 |
@@ -28226,9 +27588,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/bcm/Bcmchar.c linux-2.6.38.3/drivers/s |
28955 |
.owner = THIS_MODULE, |
28956 |
.open = bcm_char_open, |
28957 |
.release = bcm_char_release, |
28958 |
-diff -urNp linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c |
28959 |
---- linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-14 21:20:32.000000000 -0400 |
28960 |
-+++ linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-04-17 15:57:32.000000000 -0400 |
28961 |
+diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c |
28962 |
+--- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-03-14 21:20:32.000000000 -0400 |
28963 |
++++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-04-17 15:57:32.000000000 -0400 |
28964 |
@@ -863,14 +863,14 @@ static void dhd_op_if(dhd_if_t *ifp) |
28965 |
free_netdev(ifp->net); |
28966 |
} |
28967 |
@@ -28284,9 +27646,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2 |
28968 |
|
28969 |
#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) |
28970 |
g_bus = bus; |
28971 |
-diff -urNp linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c |
28972 |
---- linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14 21:20:32.000000000 -0400 |
28973 |
-+++ linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-04-17 15:57:32.000000000 -0400 |
28974 |
+diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c |
28975 |
+--- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-03-14 21:20:32.000000000 -0400 |
28976 |
++++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c 2011-04-17 15:57:32.000000000 -0400 |
28977 |
@@ -513,7 +513,7 @@ wl_iw_get_range(struct net_device *dev, |
28978 |
list = (wl_u32_list_t *) channels; |
28979 |
|
28980 |
@@ -28296,9 +27658,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.3 |
28981 |
|
28982 |
range->min_nwid = range->max_nwid = 0; |
28983 |
|
28984 |
-diff -urNp linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c |
28985 |
---- linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20:32.000000000 -0400 |
28986 |
-+++ linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:57:32.000000000 -0400 |
28987 |
+diff -urNp linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c |
28988 |
+--- linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c 2011-03-14 21:20:32.000000000 -0400 |
28989 |
++++ linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c 2011-04-17 15:57:32.000000000 -0400 |
28990 |
@@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_ |
28991 |
mutex_unlock(&dev->mutex); |
28992 |
} |
28993 |
@@ -28308,9 +27670,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/comedi/comedi_fops.c linux-2.6.38.3/dr |
28994 |
.close = comedi_unmap, |
28995 |
}; |
28996 |
|
28997 |
-diff -urNp linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c |
28998 |
---- linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-14 21:20:32.000000000 -0400 |
28999 |
-+++ linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-04-17 15:57:32.000000000 -0400 |
29000 |
+diff -urNp linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c |
29001 |
+--- linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-03-14 21:20:32.000000000 -0400 |
29002 |
++++ linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c 2011-04-17 15:57:32.000000000 -0400 |
29003 |
@@ -55,7 +55,7 @@ int numofmsgbuf = 0; |
29004 |
// |
29005 |
// Table of entry-point routines for char device |
29006 |
@@ -28320,9 +27682,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux |
29007 |
{ |
29008 |
.unlocked_ioctl = ft1000_ioctl, |
29009 |
.poll = ft1000_poll_dev, |
29010 |
-diff -urNp linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c |
29011 |
---- linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20:32.000000000 -0400 |
29012 |
-+++ linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:57:32.000000000 -0400 |
29013 |
+diff -urNp linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c |
29014 |
+--- linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c 2011-03-14 21:20:32.000000000 -0400 |
29015 |
++++ linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:57:32.000000000 -0400 |
29016 |
@@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are |
29017 |
return 0; |
29018 |
} |
29019 |
@@ -28332,9 +27694,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.3/dr |
29020 |
.open = go7007_vm_open, |
29021 |
.close = go7007_vm_close, |
29022 |
.fault = go7007_vm_fault, |
29023 |
-diff -urNp linux-2.6.38.3/drivers/staging/hv/hv.c linux-2.6.38.3/drivers/staging/hv/hv.c |
29024 |
---- linux-2.6.38.3/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000 -0400 |
29025 |
-+++ linux-2.6.38.3/drivers/staging/hv/hv.c 2011-04-17 15:57:32.000000000 -0400 |
29026 |
+diff -urNp linux-2.6.38.4/drivers/staging/hv/hv.c linux-2.6.38.4/drivers/staging/hv/hv.c |
29027 |
+--- linux-2.6.38.4/drivers/staging/hv/hv.c 2011-03-14 21:20:32.000000000 -0400 |
29028 |
++++ linux-2.6.38.4/drivers/staging/hv/hv.c 2011-04-17 15:57:32.000000000 -0400 |
29029 |
@@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi |
29030 |
u64 output_address = (output) ? virt_to_phys(output) : 0; |
29031 |
u32 output_address_hi = output_address >> 32; |
29032 |
@@ -28344,9 +27706,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/hv/hv.c linux-2.6.38.3/drivers/staging |
29033 |
|
29034 |
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", |
29035 |
control, input, output); |
29036 |
-diff -urNp linux-2.6.38.3/drivers/staging/phison/phison.c linux-2.6.38.3/drivers/staging/phison/phison.c |
29037 |
---- linux-2.6.38.3/drivers/staging/phison/phison.c 2011-03-14 21:20:32.000000000 -0400 |
29038 |
-+++ linux-2.6.38.3/drivers/staging/phison/phison.c 2011-04-17 15:57:32.000000000 -0400 |
29039 |
+diff -urNp linux-2.6.38.4/drivers/staging/phison/phison.c linux-2.6.38.4/drivers/staging/phison/phison.c |
29040 |
+--- linux-2.6.38.4/drivers/staging/phison/phison.c 2011-03-14 21:20:32.000000000 -0400 |
29041 |
++++ linux-2.6.38.4/drivers/staging/phison/phison.c 2011-04-17 15:57:32.000000000 -0400 |
29042 |
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ |
29043 |
ATA_BMDMA_SHT(DRV_NAME), |
29044 |
}; |
29045 |
@@ -28356,9 +27718,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/phison/phison.c linux-2.6.38.3/drivers |
29046 |
.inherits = &ata_bmdma_port_ops, |
29047 |
.prereset = phison_pre_reset, |
29048 |
}; |
29049 |
-diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/inode.c linux-2.6.38.3/drivers/staging/pohmelfs/inode.c |
29050 |
---- linux-2.6.38.3/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
29051 |
-+++ linux-2.6.38.3/drivers/staging/pohmelfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
29052 |
+diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/inode.c linux-2.6.38.4/drivers/staging/pohmelfs/inode.c |
29053 |
+--- linux-2.6.38.4/drivers/staging/pohmelfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
29054 |
++++ linux-2.6.38.4/drivers/staging/pohmelfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
29055 |
@@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su |
29056 |
mutex_init(&psb->mcache_lock); |
29057 |
psb->mcache_root = RB_ROOT; |
29058 |
@@ -28368,9 +27730,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/inode.c linux-2.6.38.3/driver |
29059 |
|
29060 |
psb->trans_max_pages = 100; |
29061 |
|
29062 |
-diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c |
29063 |
---- linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32.000000000 -0400 |
29064 |
-+++ linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:57:32.000000000 -0400 |
29065 |
+diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c |
29066 |
+--- linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c 2011-03-14 21:20:32.000000000 -0400 |
29067 |
++++ linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:57:32.000000000 -0400 |
29068 |
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ |
29069 |
m->data = data; |
29070 |
m->start = start; |
29071 |
@@ -28380,9 +27742,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/mcache.c linux-2.6.38.3/drive |
29072 |
|
29073 |
mutex_lock(&psb->mcache_lock); |
29074 |
err = pohmelfs_mcache_insert(psb, m); |
29075 |
-diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h |
29076 |
---- linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.000000000 -0400 |
29077 |
-+++ linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:57:32.000000000 -0400 |
29078 |
+diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h |
29079 |
+--- linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h 2011-03-14 21:20:32.000000000 -0400 |
29080 |
++++ linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h 2011-04-17 15:57:32.000000000 -0400 |
29081 |
@@ -571,7 +571,7 @@ struct pohmelfs_config; |
29082 |
struct pohmelfs_sb { |
29083 |
struct rb_root mcache_root; |
29084 |
@@ -28392,9 +27754,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/pohmelfs/netfs.h linux-2.6.38.3/driver |
29085 |
unsigned long mcache_timeout; |
29086 |
|
29087 |
unsigned int idx; |
29088 |
-diff -urNp linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c |
29089 |
---- linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 21:20:32.000000000 -0400 |
29090 |
-+++ linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c 2011-04-17 15:57:32.000000000 -0400 |
29091 |
+diff -urNp linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c |
29092 |
+--- linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-03-14 21:20:32.000000000 -0400 |
29093 |
++++ linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c 2011-04-17 15:57:32.000000000 -0400 |
29094 |
@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode |
29095 |
return seq_open(file, &crypto_seq_ops); |
29096 |
} |
29097 |
@@ -28404,9 +27766,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38 |
29098 |
.open = crypto_info_open, |
29099 |
.read = seq_read, |
29100 |
.llseek = seq_lseek, |
29101 |
-diff -urNp linux-2.6.38.3/drivers/staging/spectra/ffsport.c linux-2.6.38.3/drivers/staging/spectra/ffsport.c |
29102 |
---- linux-2.6.38.3/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32.000000000 -0400 |
29103 |
-+++ linux-2.6.38.3/drivers/staging/spectra/ffsport.c 2011-04-17 15:57:32.000000000 -0400 |
29104 |
+diff -urNp linux-2.6.38.4/drivers/staging/spectra/ffsport.c linux-2.6.38.4/drivers/staging/spectra/ffsport.c |
29105 |
+--- linux-2.6.38.4/drivers/staging/spectra/ffsport.c 2011-03-14 21:20:32.000000000 -0400 |
29106 |
++++ linux-2.6.38.4/drivers/staging/spectra/ffsport.c 2011-04-17 15:57:32.000000000 -0400 |
29107 |
@@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block |
29108 |
return ret; |
29109 |
} |
29110 |
@@ -28416,9 +27778,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/spectra/ffsport.c linux-2.6.38.3/drive |
29111 |
.owner = THIS_MODULE, |
29112 |
.open = GLOB_SBD_open, |
29113 |
.release = GLOB_SBD_release, |
29114 |
-diff -urNp linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c |
29115 |
---- linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:20:32.000000000 -0400 |
29116 |
-+++ linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:57:32.000000000 -0400 |
29117 |
+diff -urNp linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c |
29118 |
+--- linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c 2011-03-14 21:20:32.000000000 -0400 |
29119 |
++++ linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:57:32.000000000 -0400 |
29120 |
@@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(stru |
29121 |
static int __devinit vme_user_probe(struct device *, int, int); |
29122 |
static int __devexit vme_user_remove(struct device *, int, int); |
29123 |
@@ -28428,9 +27790,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/vme/devices/vme_user.c linux-2.6.38.3/ |
29124 |
.open = vme_user_open, |
29125 |
.release = vme_user_release, |
29126 |
.read = vme_user_read, |
29127 |
-diff -urNp linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c |
29128 |
---- linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-14 21:20:32.000000000 -0400 |
29129 |
-+++ linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-04-17 15:57:32.000000000 -0400 |
29130 |
+diff -urNp linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c |
29131 |
+--- linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-03-14 21:20:32.000000000 -0400 |
29132 |
++++ linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c 2011-04-17 15:57:32.000000000 -0400 |
29133 |
@@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge |
29134 |
|
29135 |
|
29136 |
@@ -28440,9 +27802,9 @@ diff -urNp linux-2.6.38.3/drivers/staging/westbridge/astoria/block/cyasblkdev_bl |
29137 |
.open = cyasblkdev_blk_open, |
29138 |
.release = cyasblkdev_blk_release, |
29139 |
.ioctl = cyasblkdev_blk_ioctl, |
29140 |
-diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_console.h linux-2.6.38.3/drivers/tty/hvc/hvc_console.h |
29141 |
---- linux-2.6.38.3/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000000000 -0400 |
29142 |
-+++ linux-2.6.38.3/drivers/tty/hvc/hvc_console.h 2011-04-17 15:57:32.000000000 -0400 |
29143 |
+diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_console.h linux-2.6.38.4/drivers/tty/hvc/hvc_console.h |
29144 |
+--- linux-2.6.38.4/drivers/tty/hvc/hvc_console.h 2011-03-14 21:20:32.000000000 -0400 |
29145 |
++++ linux-2.6.38.4/drivers/tty/hvc/hvc_console.h 2011-04-17 15:57:32.000000000 -0400 |
29146 |
@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter |
29147 |
/* register a vterm for hvc tty operation (module_init or hotplug add) */ |
29148 |
extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data, |
29149 |
@@ -28451,9 +27813,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_console.h linux-2.6.38.3/drivers/t |
29150 |
/* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ |
29151 |
extern int hvc_remove(struct hvc_struct *hp); |
29152 |
|
29153 |
-diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvcs.c linux-2.6.38.3/drivers/tty/hvc/hvcs.c |
29154 |
---- linux-2.6.38.3/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 -0400 |
29155 |
-+++ linux-2.6.38.3/drivers/tty/hvc/hvcs.c 2011-04-17 15:57:32.000000000 -0400 |
29156 |
+diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvcs.c linux-2.6.38.4/drivers/tty/hvc/hvcs.c |
29157 |
+--- linux-2.6.38.4/drivers/tty/hvc/hvcs.c 2011-03-14 21:20:32.000000000 -0400 |
29158 |
++++ linux-2.6.38.4/drivers/tty/hvc/hvcs.c 2011-04-17 15:57:32.000000000 -0400 |
29159 |
@@ -83,6 +83,7 @@ |
29160 |
#include <asm/hvcserver.h> |
29161 |
#include <asm/uaccess.h> |
29162 |
@@ -28556,9 +27918,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvcs.c linux-2.6.38.3/drivers/tty/hvc/ |
29163 |
return 0; |
29164 |
|
29165 |
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; |
29166 |
-diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c |
29167 |
---- linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.000000000 -0400 |
29168 |
-+++ linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c 2011-04-17 15:57:32.000000000 -0400 |
29169 |
+diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c |
29170 |
+--- linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c 2011-03-14 21:20:32.000000000 -0400 |
29171 |
++++ linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c 2011-04-17 15:57:32.000000000 -0400 |
29172 |
@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt |
29173 |
return recv; |
29174 |
} |
29175 |
@@ -28595,9 +27957,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/hvc/hvc_xen.c linux-2.6.38.3/drivers/tty/h |
29176 |
|
29177 |
if (!xen_pv_domain()) |
29178 |
return 0; |
29179 |
-diff -urNp linux-2.6.38.3/drivers/tty/n_gsm.c linux-2.6.38.3/drivers/tty/n_gsm.c |
29180 |
---- linux-2.6.38.3/drivers/tty/n_gsm.c 2011-03-14 21:20:32.000000000 -0400 |
29181 |
-+++ linux-2.6.38.3/drivers/tty/n_gsm.c 2011-04-17 15:57:32.000000000 -0400 |
29182 |
+diff -urNp linux-2.6.38.4/drivers/tty/n_gsm.c linux-2.6.38.4/drivers/tty/n_gsm.c |
29183 |
+--- linux-2.6.38.4/drivers/tty/n_gsm.c 2011-03-14 21:20:32.000000000 -0400 |
29184 |
++++ linux-2.6.38.4/drivers/tty/n_gsm.c 2011-04-17 15:57:32.000000000 -0400 |
29185 |
@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s |
29186 |
return NULL; |
29187 |
spin_lock_init(&dlci->lock); |
29188 |
@@ -28607,9 +27969,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/n_gsm.c linux-2.6.38.3/drivers/tty/n_gsm.c |
29189 |
kfree(dlci); |
29190 |
return NULL; |
29191 |
} |
29192 |
-diff -urNp linux-2.6.38.3/drivers/tty/n_tty.c linux-2.6.38.3/drivers/tty/n_tty.c |
29193 |
---- linux-2.6.38.3/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -0400 |
29194 |
-+++ linux-2.6.38.3/drivers/tty/n_tty.c 2011-04-17 15:57:32.000000000 -0400 |
29195 |
+diff -urNp linux-2.6.38.4/drivers/tty/n_tty.c linux-2.6.38.4/drivers/tty/n_tty.c |
29196 |
+--- linux-2.6.38.4/drivers/tty/n_tty.c 2011-03-14 21:20:32.000000000 -0400 |
29197 |
++++ linux-2.6.38.4/drivers/tty/n_tty.c 2011-04-17 15:57:32.000000000 -0400 |
29198 |
@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ |
29199 |
{ |
29200 |
*ops = tty_ldisc_N_TTY; |
29201 |
@@ -28619,9 +27981,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/n_tty.c linux-2.6.38.3/drivers/tty/n_tty.c |
29202 |
+ ops->flags = 0; |
29203 |
} |
29204 |
EXPORT_SYMBOL_GPL(n_tty_inherit_ops); |
29205 |
-diff -urNp linux-2.6.38.3/drivers/tty/pty.c linux-2.6.38.3/drivers/tty/pty.c |
29206 |
---- linux-2.6.38.3/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400 |
29207 |
-+++ linux-2.6.38.3/drivers/tty/pty.c 2011-04-17 15:57:32.000000000 -0400 |
29208 |
+diff -urNp linux-2.6.38.4/drivers/tty/pty.c linux-2.6.38.4/drivers/tty/pty.c |
29209 |
+--- linux-2.6.38.4/drivers/tty/pty.c 2011-03-14 21:20:32.000000000 -0400 |
29210 |
++++ linux-2.6.38.4/drivers/tty/pty.c 2011-04-17 15:57:32.000000000 -0400 |
29211 |
@@ -700,7 +700,18 @@ out: |
29212 |
return retval; |
29213 |
} |
29214 |
@@ -28653,21 +28015,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/pty.c linux-2.6.38.3/drivers/tty/pty.c |
29215 |
cdev_init(&ptmx_cdev, &ptmx_fops); |
29216 |
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || |
29217 |
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) |
29218 |
-diff -urNp linux-2.6.38.3/drivers/tty/serial/8250_pci.c linux-2.6.38.3/drivers/tty/serial/8250_pci.c |
29219 |
---- linux-2.6.38.3/drivers/tty/serial/8250_pci.c 2011-03-14 21:20:32.000000000 -0400 |
29220 |
-+++ linux-2.6.38.3/drivers/tty/serial/8250_pci.c 2011-04-17 15:57:32.000000000 -0400 |
29221 |
-@@ -3818,7 +3818,7 @@ static struct pci_device_id serial_pci_t |
29222 |
- PCI_ANY_ID, PCI_ANY_ID, |
29223 |
- PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, |
29224 |
- 0xffff00, pbn_default }, |
29225 |
-- { 0, } |
29226 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
29227 |
- }; |
29228 |
- |
29229 |
- static struct pci_driver serial_pci_driver = { |
29230 |
-diff -urNp linux-2.6.38.3/drivers/tty/serial/kgdboc.c linux-2.6.38.3/drivers/tty/serial/kgdboc.c |
29231 |
---- linux-2.6.38.3/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.000000000 -0400 |
29232 |
-+++ linux-2.6.38.3/drivers/tty/serial/kgdboc.c 2011-04-17 15:57:32.000000000 -0400 |
29233 |
+diff -urNp linux-2.6.38.4/drivers/tty/serial/kgdboc.c linux-2.6.38.4/drivers/tty/serial/kgdboc.c |
29234 |
+--- linux-2.6.38.4/drivers/tty/serial/kgdboc.c 2011-03-14 21:20:32.000000000 -0400 |
29235 |
++++ linux-2.6.38.4/drivers/tty/serial/kgdboc.c 2011-04-17 15:57:32.000000000 -0400 |
29236 |
@@ -22,7 +22,7 @@ |
29237 |
|
29238 |
#define MAX_CONFIG_LEN 40 |
29239 |
@@ -28686,9 +28036,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/serial/kgdboc.c linux-2.6.38.3/drivers/tty |
29240 |
.name = "kgdboc", |
29241 |
.read_char = kgdboc_get_char, |
29242 |
.write_char = kgdboc_put_char, |
29243 |
-diff -urNp linux-2.6.38.3/drivers/tty/tty_io.c linux-2.6.38.3/drivers/tty/tty_io.c |
29244 |
---- linux-2.6.38.3/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0400 |
29245 |
-+++ linux-2.6.38.3/drivers/tty/tty_io.c 2011-04-17 15:57:32.000000000 -0400 |
29246 |
+diff -urNp linux-2.6.38.4/drivers/tty/tty_io.c linux-2.6.38.4/drivers/tty/tty_io.c |
29247 |
+--- linux-2.6.38.4/drivers/tty/tty_io.c 2011-03-14 21:20:32.000000000 -0400 |
29248 |
++++ linux-2.6.38.4/drivers/tty/tty_io.c 2011-04-17 15:57:32.000000000 -0400 |
29249 |
@@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex); |
29250 |
/* Spinlock to protect the tty->tty_files list */ |
29251 |
DEFINE_SPINLOCK(tty_files_lock); |
29252 |
@@ -28826,9 +28176,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/tty_io.c linux-2.6.38.3/drivers/tty/tty_io |
29253 |
/* |
29254 |
* Initialize the console device. This is called *early*, so |
29255 |
* we can't necessarily depend on lots of kernel help here. |
29256 |
-diff -urNp linux-2.6.38.3/drivers/tty/tty_ldisc.c linux-2.6.38.3/drivers/tty/tty_ldisc.c |
29257 |
---- linux-2.6.38.3/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000 -0400 |
29258 |
-+++ linux-2.6.38.3/drivers/tty/tty_ldisc.c 2011-04-17 15:57:32.000000000 -0400 |
29259 |
+diff -urNp linux-2.6.38.4/drivers/tty/tty_ldisc.c linux-2.6.38.4/drivers/tty/tty_ldisc.c |
29260 |
+--- linux-2.6.38.4/drivers/tty/tty_ldisc.c 2011-03-14 21:20:32.000000000 -0400 |
29261 |
++++ linux-2.6.38.4/drivers/tty/tty_ldisc.c 2011-04-17 15:57:32.000000000 -0400 |
29262 |
@@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc * |
29263 |
if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { |
29264 |
struct tty_ldisc_ops *ldo = ld->ops; |
29265 |
@@ -28874,9 +28224,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/tty_ldisc.c linux-2.6.38.3/drivers/tty/tty |
29266 |
module_put(ldops->owner); |
29267 |
spin_unlock_irqrestore(&tty_ldisc_lock, flags); |
29268 |
} |
29269 |
-diff -urNp linux-2.6.38.3/drivers/tty/vt/keyboard.c linux-2.6.38.3/drivers/tty/vt/keyboard.c |
29270 |
---- linux-2.6.38.3/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.000000000 -0400 |
29271 |
-+++ linux-2.6.38.3/drivers/tty/vt/keyboard.c 2011-04-17 15:57:32.000000000 -0400 |
29272 |
+diff -urNp linux-2.6.38.4/drivers/tty/vt/keyboard.c linux-2.6.38.4/drivers/tty/vt/keyboard.c |
29273 |
+--- linux-2.6.38.4/drivers/tty/vt/keyboard.c 2011-03-14 21:20:32.000000000 -0400 |
29274 |
++++ linux-2.6.38.4/drivers/tty/vt/keyboard.c 2011-04-23 12:47:28.000000000 -0400 |
29275 |
@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u |
29276 |
kbd->kbdmode == VC_MEDIUMRAW) && |
29277 |
value != KVAL(K_SAK)) |
29278 |
@@ -28894,18 +28244,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/vt/keyboard.c linux-2.6.38.3/drivers/tty/v |
29279 |
fn_handler[value](vc); |
29280 |
} |
29281 |
|
29282 |
-@@ -1413,7 +1423,7 @@ static const struct input_device_id kbd_ |
29283 |
- .evbit = { BIT_MASK(EV_SND) }, |
29284 |
- }, |
29285 |
- |
29286 |
-- { }, /* Terminating entry */ |
29287 |
-+ { 0 }, /* Terminating entry */ |
29288 |
- }; |
29289 |
- |
29290 |
- MODULE_DEVICE_TABLE(input, kbd_ids); |
29291 |
-diff -urNp linux-2.6.38.3/drivers/tty/vt/vt.c linux-2.6.38.3/drivers/tty/vt/vt.c |
29292 |
---- linux-2.6.38.3/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -0400 |
29293 |
-+++ linux-2.6.38.3/drivers/tty/vt/vt.c 2011-04-17 15:57:32.000000000 -0400 |
29294 |
+diff -urNp linux-2.6.38.4/drivers/tty/vt/vt.c linux-2.6.38.4/drivers/tty/vt/vt.c |
29295 |
+--- linux-2.6.38.4/drivers/tty/vt/vt.c 2011-03-14 21:20:32.000000000 -0400 |
29296 |
++++ linux-2.6.38.4/drivers/tty/vt/vt.c 2011-04-17 15:57:32.000000000 -0400 |
29297 |
@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier |
29298 |
|
29299 |
static void notify_write(struct vc_data *vc, unsigned int unicode) |
29300 |
@@ -28915,9 +28256,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/vt/vt.c linux-2.6.38.3/drivers/tty/vt/vt.c |
29301 |
atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); |
29302 |
} |
29303 |
|
29304 |
-diff -urNp linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c |
29305 |
---- linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
29306 |
-+++ linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
29307 |
+diff -urNp linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c |
29308 |
+--- linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
29309 |
++++ linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
29310 |
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ |
29311 |
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) |
29312 |
return -EFAULT; |
29313 |
@@ -28958,9 +28299,9 @@ diff -urNp linux-2.6.38.3/drivers/tty/vt/vt_ioctl.c linux-2.6.38.3/drivers/tty/v |
29314 |
if (!perm) { |
29315 |
ret = -EPERM; |
29316 |
goto reterr; |
29317 |
-diff -urNp linux-2.6.38.3/drivers/uio/uio.c linux-2.6.38.3/drivers/uio/uio.c |
29318 |
---- linux-2.6.38.3/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400 |
29319 |
-+++ linux-2.6.38.3/drivers/uio/uio.c 2011-04-17 15:57:32.000000000 -0400 |
29320 |
+diff -urNp linux-2.6.38.4/drivers/uio/uio.c linux-2.6.38.4/drivers/uio/uio.c |
29321 |
+--- linux-2.6.38.4/drivers/uio/uio.c 2011-03-14 21:20:32.000000000 -0400 |
29322 |
++++ linux-2.6.38.4/drivers/uio/uio.c 2011-04-17 15:57:32.000000000 -0400 |
29323 |
@@ -25,6 +25,7 @@ |
29324 |
#include <linux/kobject.h> |
29325 |
#include <linux/cdev.h> |
29326 |
@@ -28994,9 +28335,9 @@ diff -urNp linux-2.6.38.3/drivers/uio/uio.c linux-2.6.38.3/drivers/uio/uio.c |
29327 |
} |
29328 |
|
29329 |
static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) |
29330 |
-diff -urNp linux-2.6.38.3/drivers/usb/atm/cxacru.c linux-2.6.38.3/drivers/usb/atm/cxacru.c |
29331 |
---- linux-2.6.38.3/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.000000000 -0400 |
29332 |
-+++ linux-2.6.38.3/drivers/usb/atm/cxacru.c 2011-04-17 15:57:32.000000000 -0400 |
29333 |
+diff -urNp linux-2.6.38.4/drivers/usb/atm/cxacru.c linux-2.6.38.4/drivers/usb/atm/cxacru.c |
29334 |
+--- linux-2.6.38.4/drivers/usb/atm/cxacru.c 2011-03-14 21:20:32.000000000 -0400 |
29335 |
++++ linux-2.6.38.4/drivers/usb/atm/cxacru.c 2011-04-17 15:57:32.000000000 -0400 |
29336 |
@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c |
29337 |
ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp); |
29338 |
if (ret < 2) |
29339 |
@@ -29006,9 +28347,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/atm/cxacru.c linux-2.6.38.3/drivers/usb/at |
29340 |
return -EINVAL; |
29341 |
pos += tmp; |
29342 |
|
29343 |
-diff -urNp linux-2.6.38.3/drivers/usb/atm/usbatm.c linux-2.6.38.3/drivers/usb/atm/usbatm.c |
29344 |
---- linux-2.6.38.3/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.000000000 -0400 |
29345 |
-+++ linux-2.6.38.3/drivers/usb/atm/usbatm.c 2011-04-17 15:57:32.000000000 -0400 |
29346 |
+diff -urNp linux-2.6.38.4/drivers/usb/atm/usbatm.c linux-2.6.38.4/drivers/usb/atm/usbatm.c |
29347 |
+--- linux-2.6.38.4/drivers/usb/atm/usbatm.c 2011-03-14 21:20:32.000000000 -0400 |
29348 |
++++ linux-2.6.38.4/drivers/usb/atm/usbatm.c 2011-04-17 15:57:32.000000000 -0400 |
29349 |
@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru |
29350 |
if (printk_ratelimit()) |
29351 |
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", |
29352 |
@@ -29088,42 +28429,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/atm/usbatm.c linux-2.6.38.3/drivers/usb/at |
29353 |
|
29354 |
if (!left--) { |
29355 |
if (instance->disconnected) |
29356 |
-diff -urNp linux-2.6.38.3/drivers/usb/class/cdc-acm.c linux-2.6.38.3/drivers/usb/class/cdc-acm.c |
29357 |
---- linux-2.6.38.3/drivers/usb/class/cdc-acm.c 2011-04-18 17:27:16.000000000 -0400 |
29358 |
-+++ linux-2.6.38.3/drivers/usb/class/cdc-acm.c 2011-04-17 15:57:32.000000000 -0400 |
29359 |
-@@ -1640,7 +1640,7 @@ static const struct usb_device_id acm_id |
29360 |
- { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, |
29361 |
- USB_CDC_ACM_PROTO_AT_CDMA) }, |
29362 |
- |
29363 |
-- { } |
29364 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } |
29365 |
- }; |
29366 |
- |
29367 |
- MODULE_DEVICE_TABLE(usb, acm_ids); |
29368 |
-diff -urNp linux-2.6.38.3/drivers/usb/class/usblp.c linux-2.6.38.3/drivers/usb/class/usblp.c |
29369 |
---- linux-2.6.38.3/drivers/usb/class/usblp.c 2011-03-14 21:20:32.000000000 -0400 |
29370 |
-+++ linux-2.6.38.3/drivers/usb/class/usblp.c 2011-04-17 15:57:32.000000000 -0400 |
29371 |
-@@ -227,7 +227,7 @@ static const struct quirk_printer_struct |
29372 |
- { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@×××.de> */ |
29373 |
- { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ |
29374 |
- { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */ |
29375 |
-- { 0, 0 } |
29376 |
-+ { 0, 0, 0 } |
29377 |
- }; |
29378 |
- |
29379 |
- static int usblp_wwait(struct usblp *usblp, int nonblock); |
29380 |
-@@ -1398,7 +1398,7 @@ static const struct usb_device_id usblp_ |
29381 |
- { USB_INTERFACE_INFO(7, 1, 2) }, |
29382 |
- { USB_INTERFACE_INFO(7, 1, 3) }, |
29383 |
- { USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C */ |
29384 |
-- { } /* Terminating entry */ |
29385 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ |
29386 |
- }; |
29387 |
- |
29388 |
- MODULE_DEVICE_TABLE(usb, usblp_ids); |
29389 |
-diff -urNp linux-2.6.38.3/drivers/usb/core/hcd.c linux-2.6.38.3/drivers/usb/core/hcd.c |
29390 |
---- linux-2.6.38.3/drivers/usb/core/hcd.c 2011-04-18 17:27:14.000000000 -0400 |
29391 |
-+++ linux-2.6.38.3/drivers/usb/core/hcd.c 2011-04-17 15:57:32.000000000 -0400 |
29392 |
+diff -urNp linux-2.6.38.4/drivers/usb/core/hcd.c linux-2.6.38.4/drivers/usb/core/hcd.c |
29393 |
+--- linux-2.6.38.4/drivers/usb/core/hcd.c 2011-04-22 19:20:59.000000000 -0400 |
29394 |
++++ linux-2.6.38.4/drivers/usb/core/hcd.c 2011-04-22 19:21:23.000000000 -0400 |
29395 |
@@ -2457,7 +2457,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd |
29396 |
|
29397 |
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) |
29398 |
@@ -29142,21 +28450,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/core/hcd.c linux-2.6.38.3/drivers/usb/core |
29399 |
{ |
29400 |
|
29401 |
if (mon_ops) |
29402 |
-diff -urNp linux-2.6.38.3/drivers/usb/core/hub.c linux-2.6.38.3/drivers/usb/core/hub.c |
29403 |
---- linux-2.6.38.3/drivers/usb/core/hub.c 2011-03-14 21:20:32.000000000 -0400 |
29404 |
-+++ linux-2.6.38.3/drivers/usb/core/hub.c 2011-04-17 15:57:32.000000000 -0400 |
29405 |
-@@ -3492,7 +3492,7 @@ static const struct usb_device_id hub_id |
29406 |
- .bDeviceClass = USB_CLASS_HUB}, |
29407 |
- { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, |
29408 |
- .bInterfaceClass = USB_CLASS_HUB}, |
29409 |
-- { } /* Terminating entry */ |
29410 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ |
29411 |
- }; |
29412 |
- |
29413 |
- MODULE_DEVICE_TABLE (usb, hub_id_table); |
29414 |
-diff -urNp linux-2.6.38.3/drivers/usb/core/message.c linux-2.6.38.3/drivers/usb/core/message.c |
29415 |
---- linux-2.6.38.3/drivers/usb/core/message.c 2011-03-14 21:20:32.000000000 -0400 |
29416 |
-+++ linux-2.6.38.3/drivers/usb/core/message.c 2011-04-17 15:57:32.000000000 -0400 |
29417 |
+diff -urNp linux-2.6.38.4/drivers/usb/core/message.c linux-2.6.38.4/drivers/usb/core/message.c |
29418 |
+--- linux-2.6.38.4/drivers/usb/core/message.c 2011-03-14 21:20:32.000000000 -0400 |
29419 |
++++ linux-2.6.38.4/drivers/usb/core/message.c 2011-04-17 15:57:32.000000000 -0400 |
29420 |
@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device |
29421 |
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); |
29422 |
if (buf) { |
29423 |
@@ -29168,9 +28464,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/core/message.c linux-2.6.38.3/drivers/usb/ |
29424 |
if (!smallbuf) |
29425 |
return buf; |
29426 |
memcpy(smallbuf, buf, len); |
29427 |
-diff -urNp linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c |
29428 |
---- linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000000000 -0400 |
29429 |
-+++ linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c 2011-04-17 15:57:32.000000000 -0400 |
29430 |
+diff -urNp linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c |
29431 |
+--- linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c 2011-03-14 21:20:32.000000000 -0400 |
29432 |
++++ linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c 2011-04-17 15:57:32.000000000 -0400 |
29433 |
@@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x, |
29434 |
} |
29435 |
|
29436 |
@@ -29189,33 +28485,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/early/ehci-dbgp.c linux-2.6.38.3/drivers/u |
29437 |
.name = "kgdbdbgp", |
29438 |
.read_char = kgdbdbgp_read_char, |
29439 |
.write_char = kgdbdbgp_write_char, |
29440 |
-diff -urNp linux-2.6.38.3/drivers/usb/host/ehci-pci.c linux-2.6.38.3/drivers/usb/host/ehci-pci.c |
29441 |
---- linux-2.6.38.3/drivers/usb/host/ehci-pci.c 2011-03-14 21:20:32.000000000 -0400 |
29442 |
-+++ linux-2.6.38.3/drivers/usb/host/ehci-pci.c 2011-04-17 15:57:32.000000000 -0400 |
29443 |
-@@ -516,7 +516,7 @@ static const struct pci_device_id pci_id |
29444 |
- PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), |
29445 |
- .driver_data = (unsigned long) &ehci_pci_hc_driver, |
29446 |
- }, |
29447 |
-- { /* end: all zeroes */ } |
29448 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
29449 |
- }; |
29450 |
- MODULE_DEVICE_TABLE(pci, pci_ids); |
29451 |
- |
29452 |
-diff -urNp linux-2.6.38.3/drivers/usb/host/uhci-hcd.c linux-2.6.38.3/drivers/usb/host/uhci-hcd.c |
29453 |
---- linux-2.6.38.3/drivers/usb/host/uhci-hcd.c 2011-03-14 21:20:32.000000000 -0400 |
29454 |
-+++ linux-2.6.38.3/drivers/usb/host/uhci-hcd.c 2011-04-17 15:57:32.000000000 -0400 |
29455 |
-@@ -948,7 +948,7 @@ static const struct pci_device_id uhci_p |
29456 |
- /* handle any USB UHCI controller */ |
29457 |
- PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), |
29458 |
- .driver_data = (unsigned long) &uhci_driver, |
29459 |
-- }, { /* end: all zeroes */ } |
29460 |
-+ }, { 0, 0, 0, 0, 0, 0, 0 } |
29461 |
- }; |
29462 |
- |
29463 |
- MODULE_DEVICE_TABLE(pci, uhci_pci_ids); |
29464 |
-diff -urNp linux-2.6.38.3/drivers/usb/mon/mon_main.c linux-2.6.38.3/drivers/usb/mon/mon_main.c |
29465 |
---- linux-2.6.38.3/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000000 -0400 |
29466 |
-+++ linux-2.6.38.3/drivers/usb/mon/mon_main.c 2011-04-17 15:57:32.000000000 -0400 |
29467 |
+diff -urNp linux-2.6.38.4/drivers/usb/mon/mon_main.c linux-2.6.38.4/drivers/usb/mon/mon_main.c |
29468 |
+--- linux-2.6.38.4/drivers/usb/mon/mon_main.c 2011-03-14 21:20:32.000000000 -0400 |
29469 |
++++ linux-2.6.38.4/drivers/usb/mon/mon_main.c 2011-04-17 15:57:32.000000000 -0400 |
29470 |
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { |
29471 |
/* |
29472 |
* Ops |
29473 |
@@ -29225,49 +28497,9 @@ diff -urNp linux-2.6.38.3/drivers/usb/mon/mon_main.c linux-2.6.38.3/drivers/usb/ |
29474 |
.urb_submit = mon_submit, |
29475 |
.urb_submit_error = mon_submit_error, |
29476 |
.urb_complete = mon_complete, |
29477 |
-diff -urNp linux-2.6.38.3/drivers/usb/storage/debug.h linux-2.6.38.3/drivers/usb/storage/debug.h |
29478 |
---- linux-2.6.38.3/drivers/usb/storage/debug.h 2011-03-14 21:20:32.000000000 -0400 |
29479 |
-+++ linux-2.6.38.3/drivers/usb/storage/debug.h 2011-04-17 15:57:32.000000000 -0400 |
29480 |
-@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char |
29481 |
- #define US_DEBUGPX(x...) printk( x ) |
29482 |
- #define US_DEBUG(x) x |
29483 |
- #else |
29484 |
--#define US_DEBUGP(x...) |
29485 |
--#define US_DEBUGPX(x...) |
29486 |
--#define US_DEBUG(x) |
29487 |
-+#define US_DEBUGP(x...) do {} while (0) |
29488 |
-+#define US_DEBUGPX(x...) do {} while (0) |
29489 |
-+#define US_DEBUG(x) do {} while (0) |
29490 |
- #endif |
29491 |
- |
29492 |
- #endif |
29493 |
-diff -urNp linux-2.6.38.3/drivers/usb/storage/usb.c linux-2.6.38.3/drivers/usb/storage/usb.c |
29494 |
---- linux-2.6.38.3/drivers/usb/storage/usb.c 2011-03-14 21:20:32.000000000 -0400 |
29495 |
-+++ linux-2.6.38.3/drivers/usb/storage/usb.c 2011-04-17 15:57:32.000000000 -0400 |
29496 |
-@@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l |
29497 |
- |
29498 |
- static struct us_unusual_dev us_unusual_dev_list[] = { |
29499 |
- # include "unusual_devs.h" |
29500 |
-- { } /* Terminating entry */ |
29501 |
-+ { NULL, NULL, 0, 0, NULL } /* Terminating entry */ |
29502 |
- }; |
29503 |
- |
29504 |
- #undef UNUSUAL_DEV |
29505 |
-diff -urNp linux-2.6.38.3/drivers/usb/storage/usual-tables.c linux-2.6.38.3/drivers/usb/storage/usual-tables.c |
29506 |
---- linux-2.6.38.3/drivers/usb/storage/usual-tables.c 2011-03-14 21:20:32.000000000 -0400 |
29507 |
-+++ linux-2.6.38.3/drivers/usb/storage/usual-tables.c 2011-04-17 15:57:32.000000000 -0400 |
29508 |
-@@ -48,7 +48,7 @@ |
29509 |
- |
29510 |
- struct usb_device_id usb_storage_usb_ids[] = { |
29511 |
- # include "unusual_devs.h" |
29512 |
-- { } /* Terminating entry */ |
29513 |
-+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ |
29514 |
- }; |
29515 |
- EXPORT_SYMBOL_GPL(usb_storage_usb_ids); |
29516 |
- |
29517 |
-diff -urNp linux-2.6.38.3/drivers/vhost/vhost.c linux-2.6.38.3/drivers/vhost/vhost.c |
29518 |
---- linux-2.6.38.3/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -0400 |
29519 |
-+++ linux-2.6.38.3/drivers/vhost/vhost.c 2011-04-17 15:57:32.000000000 -0400 |
29520 |
+diff -urNp linux-2.6.38.4/drivers/vhost/vhost.c linux-2.6.38.4/drivers/vhost/vhost.c |
29521 |
+--- linux-2.6.38.4/drivers/vhost/vhost.c 2011-03-14 21:20:32.000000000 -0400 |
29522 |
++++ linux-2.6.38.4/drivers/vhost/vhost.c 2011-04-17 15:57:32.000000000 -0400 |
29523 |
@@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqu |
29524 |
return get_user(vq->last_used_idx, &used->idx); |
29525 |
} |
29526 |
@@ -29277,9 +28509,9 @@ diff -urNp linux-2.6.38.3/drivers/vhost/vhost.c linux-2.6.38.3/drivers/vhost/vho |
29527 |
{ |
29528 |
struct file *eventfp, *filep = NULL, |
29529 |
*pollstart = NULL, *pollstop = NULL; |
29530 |
-diff -urNp linux-2.6.38.3/drivers/video/fbcmap.c linux-2.6.38.3/drivers/video/fbcmap.c |
29531 |
---- linux-2.6.38.3/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 -0400 |
29532 |
-+++ linux-2.6.38.3/drivers/video/fbcmap.c 2011-04-17 15:57:32.000000000 -0400 |
29533 |
+diff -urNp linux-2.6.38.4/drivers/video/fbcmap.c linux-2.6.38.4/drivers/video/fbcmap.c |
29534 |
+--- linux-2.6.38.4/drivers/video/fbcmap.c 2011-03-14 21:20:32.000000000 -0400 |
29535 |
++++ linux-2.6.38.4/drivers/video/fbcmap.c 2011-04-17 15:57:32.000000000 -0400 |
29536 |
@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user |
29537 |
rc = -ENODEV; |
29538 |
goto out; |
29539 |
@@ -29290,9 +28522,9 @@ diff -urNp linux-2.6.38.3/drivers/video/fbcmap.c linux-2.6.38.3/drivers/video/fb |
29540 |
rc = -EINVAL; |
29541 |
goto out1; |
29542 |
} |
29543 |
-diff -urNp linux-2.6.38.3/drivers/video/fbmem.c linux-2.6.38.3/drivers/video/fbmem.c |
29544 |
---- linux-2.6.38.3/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -0400 |
29545 |
-+++ linux-2.6.38.3/drivers/video/fbmem.c 2011-04-17 15:57:32.000000000 -0400 |
29546 |
+diff -urNp linux-2.6.38.4/drivers/video/fbmem.c linux-2.6.38.4/drivers/video/fbmem.c |
29547 |
+--- linux-2.6.38.4/drivers/video/fbmem.c 2011-03-14 21:20:32.000000000 -0400 |
29548 |
++++ linux-2.6.38.4/drivers/video/fbmem.c 2011-04-17 15:57:32.000000000 -0400 |
29549 |
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in |
29550 |
image->dx += image->width + 8; |
29551 |
} |
29552 |
@@ -29320,21 +28552,9 @@ diff -urNp linux-2.6.38.3/drivers/video/fbmem.c linux-2.6.38.3/drivers/video/fbm |
29553 |
return -EINVAL; |
29554 |
if (!registered_fb[con2fb.framebuffer]) |
29555 |
request_module("fb%d", con2fb.framebuffer); |
29556 |
-diff -urNp linux-2.6.38.3/drivers/video/fbmon.c linux-2.6.38.3/drivers/video/fbmon.c |
29557 |
---- linux-2.6.38.3/drivers/video/fbmon.c 2011-03-14 21:20:32.000000000 -0400 |
29558 |
-+++ linux-2.6.38.3/drivers/video/fbmon.c 2011-04-17 15:57:32.000000000 -0400 |
29559 |
-@@ -46,7 +46,7 @@ |
29560 |
- #ifdef DEBUG |
29561 |
- #define DPRINTK(fmt, args...) printk(fmt,## args) |
29562 |
- #else |
29563 |
--#define DPRINTK(fmt, args...) |
29564 |
-+#define DPRINTK(fmt, args...) do {} while (0) |
29565 |
- #endif |
29566 |
- |
29567 |
- #define FBMON_FIX_HEADER 1 |
29568 |
-diff -urNp linux-2.6.38.3/drivers/video/i810/i810_accel.c linux-2.6.38.3/drivers/video/i810/i810_accel.c |
29569 |
---- linux-2.6.38.3/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.000000000 -0400 |
29570 |
-+++ linux-2.6.38.3/drivers/video/i810/i810_accel.c 2011-04-17 15:57:32.000000000 -0400 |
29571 |
+diff -urNp linux-2.6.38.4/drivers/video/i810/i810_accel.c linux-2.6.38.4/drivers/video/i810/i810_accel.c |
29572 |
+--- linux-2.6.38.4/drivers/video/i810/i810_accel.c 2011-03-14 21:20:32.000000000 -0400 |
29573 |
++++ linux-2.6.38.4/drivers/video/i810/i810_accel.c 2011-04-17 15:57:32.000000000 -0400 |
29574 |
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct |
29575 |
} |
29576 |
} |
29577 |
@@ -29343,340 +28563,9 @@ diff -urNp linux-2.6.38.3/drivers/video/i810/i810_accel.c linux-2.6.38.3/drivers |
29578 |
i810_report_error(mmio); |
29579 |
par->dev_flags |= LOCKUP; |
29580 |
info->pixmap.scan_align = 1; |
29581 |
-diff -urNp linux-2.6.38.3/drivers/video/i810/i810_main.c linux-2.6.38.3/drivers/video/i810/i810_main.c |
29582 |
---- linux-2.6.38.3/drivers/video/i810/i810_main.c 2011-03-14 21:20:32.000000000 -0400 |
29583 |
-+++ linux-2.6.38.3/drivers/video/i810/i810_main.c 2011-04-17 15:57:32.000000000 -0400 |
29584 |
-@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t |
29585 |
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, |
29586 |
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, |
29587 |
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 }, |
29588 |
-- { 0 }, |
29589 |
-+ { 0, 0, 0, 0, 0, 0, 0 }, |
29590 |
- }; |
29591 |
- |
29592 |
- static struct pci_driver i810fb_driver = { |
29593 |
-diff -urNp linux-2.6.38.3/drivers/video/modedb.c linux-2.6.38.3/drivers/video/modedb.c |
29594 |
---- linux-2.6.38.3/drivers/video/modedb.c 2011-03-14 21:20:32.000000000 -0400 |
29595 |
-+++ linux-2.6.38.3/drivers/video/modedb.c 2011-04-17 15:57:32.000000000 -0400 |
29596 |
-@@ -40,255 +40,255 @@ static const struct fb_videomode modedb[ |
29597 |
- |
29598 |
- /* 640x400 @ 70 Hz, 31.5 kHz hsync */ |
29599 |
- { NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, 0, |
29600 |
-- FB_VMODE_NONINTERLACED }, |
29601 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29602 |
- |
29603 |
- /* 640x480 @ 60 Hz, 31.5 kHz hsync */ |
29604 |
- { NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, |
29605 |
-- FB_VMODE_NONINTERLACED }, |
29606 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29607 |
- |
29608 |
- /* 800x600 @ 56 Hz, 35.15 kHz hsync */ |
29609 |
- { NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, 0, |
29610 |
-- FB_VMODE_NONINTERLACED }, |
29611 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29612 |
- |
29613 |
- /* 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync */ |
29614 |
- { NULL, 87, 1024, 768, 22271, 56, 24, 33, 8, 160, 8, 0, |
29615 |
-- FB_VMODE_INTERLACED }, |
29616 |
-+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, |
29617 |
- |
29618 |
- /* 640x400 @ 85 Hz, 37.86 kHz hsync */ |
29619 |
- { NULL, 85, 640, 400, 31746, 96, 32, 41, 1, 64, 3, |
29620 |
-- FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED }, |
29621 |
-+ FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29622 |
- |
29623 |
- /* 640x480 @ 72 Hz, 36.5 kHz hsync */ |
29624 |
- { NULL, 72, 640, 480, 31746, 144, 40, 30, 8, 40, 3, 0, |
29625 |
-- FB_VMODE_NONINTERLACED }, |
29626 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29627 |
- |
29628 |
- /* 640x480 @ 75 Hz, 37.50 kHz hsync */ |
29629 |
- { NULL, 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3, 0, |
29630 |
-- FB_VMODE_NONINTERLACED }, |
29631 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29632 |
- |
29633 |
- /* 800x600 @ 60 Hz, 37.8 kHz hsync */ |
29634 |
- { NULL, 60, 800, 600, 25000, 88, 40, 23, 1, 128, 4, |
29635 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29636 |
-- FB_VMODE_NONINTERLACED }, |
29637 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29638 |
- |
29639 |
- /* 640x480 @ 85 Hz, 43.27 kHz hsync */ |
29640 |
- { NULL, 85, 640, 480, 27777, 80, 56, 25, 1, 56, 3, 0, |
29641 |
-- FB_VMODE_NONINTERLACED }, |
29642 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29643 |
- |
29644 |
- /* 1152x864 @ 89 Hz interlaced, 44 kHz hsync */ |
29645 |
- { NULL, 89, 1152, 864, 15384, 96, 16, 110, 1, 216, 10, 0, |
29646 |
-- FB_VMODE_INTERLACED }, |
29647 |
-+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, |
29648 |
- /* 800x600 @ 72 Hz, 48.0 kHz hsync */ |
29649 |
- { NULL, 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6, |
29650 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29651 |
-- FB_VMODE_NONINTERLACED }, |
29652 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29653 |
- |
29654 |
- /* 1024x768 @ 60 Hz, 48.4 kHz hsync */ |
29655 |
- { NULL, 60, 1024, 768, 15384, 168, 8, 29, 3, 144, 6, 0, |
29656 |
-- FB_VMODE_NONINTERLACED }, |
29657 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29658 |
- |
29659 |
- /* 640x480 @ 100 Hz, 53.01 kHz hsync */ |
29660 |
- { NULL, 100, 640, 480, 21834, 96, 32, 36, 8, 96, 6, 0, |
29661 |
-- FB_VMODE_NONINTERLACED }, |
29662 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29663 |
- |
29664 |
- /* 1152x864 @ 60 Hz, 53.5 kHz hsync */ |
29665 |
- { NULL, 60, 1152, 864, 11123, 208, 64, 16, 4, 256, 8, 0, |
29666 |
-- FB_VMODE_NONINTERLACED }, |
29667 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29668 |
- |
29669 |
- /* 800x600 @ 85 Hz, 55.84 kHz hsync */ |
29670 |
- { NULL, 85, 800, 600, 16460, 160, 64, 36, 16, 64, 5, 0, |
29671 |
-- FB_VMODE_NONINTERLACED }, |
29672 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29673 |
- |
29674 |
- /* 1024x768 @ 70 Hz, 56.5 kHz hsync */ |
29675 |
- { NULL, 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, 0, |
29676 |
-- FB_VMODE_NONINTERLACED }, |
29677 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29678 |
- |
29679 |
- /* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */ |
29680 |
- { NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12, 0, |
29681 |
-- FB_VMODE_INTERLACED }, |
29682 |
-+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, |
29683 |
- |
29684 |
- /* 800x600 @ 100 Hz, 64.02 kHz hsync */ |
29685 |
- { NULL, 100, 800, 600, 14357, 160, 64, 30, 4, 64, 6, 0, |
29686 |
-- FB_VMODE_NONINTERLACED }, |
29687 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29688 |
- |
29689 |
- /* 1024x768 @ 76 Hz, 62.5 kHz hsync */ |
29690 |
- { NULL, 76, 1024, 768, 11764, 208, 8, 36, 16, 120, 3, 0, |
29691 |
-- FB_VMODE_NONINTERLACED }, |
29692 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29693 |
- |
29694 |
- /* 1152x864 @ 70 Hz, 62.4 kHz hsync */ |
29695 |
- { NULL, 70, 1152, 864, 10869, 106, 56, 20, 1, 160, 10, 0, |
29696 |
-- FB_VMODE_NONINTERLACED }, |
29697 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29698 |
- |
29699 |
- /* 1280x1024 @ 61 Hz, 64.2 kHz hsync */ |
29700 |
- { NULL, 61, 1280, 1024, 9090, 200, 48, 26, 1, 184, 3, 0, |
29701 |
-- FB_VMODE_NONINTERLACED }, |
29702 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29703 |
- |
29704 |
- /* 1400x1050 @ 60Hz, 63.9 kHz hsync */ |
29705 |
- { NULL, 60, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3, 0, |
29706 |
-- FB_VMODE_NONINTERLACED }, |
29707 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29708 |
- |
29709 |
- /* 1400x1050 @ 75,107 Hz, 82,392 kHz +hsync +vsync*/ |
29710 |
- { NULL, 75, 1400, 1050, 7190, 120, 56, 23, 10, 112, 13, |
29711 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29712 |
-- FB_VMODE_NONINTERLACED }, |
29713 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29714 |
- |
29715 |
- /* 1400x1050 @ 60 Hz, ? kHz +hsync +vsync*/ |
29716 |
- { NULL, 60, 1400, 1050, 9259, 128, 40, 12, 0, 112, 3, |
29717 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29718 |
-- FB_VMODE_NONINTERLACED }, |
29719 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29720 |
- |
29721 |
- /* 1024x768 @ 85 Hz, 70.24 kHz hsync */ |
29722 |
- { NULL, 85, 1024, 768, 10111, 192, 32, 34, 14, 160, 6, 0, |
29723 |
-- FB_VMODE_NONINTERLACED }, |
29724 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29725 |
- |
29726 |
- /* 1152x864 @ 78 Hz, 70.8 kHz hsync */ |
29727 |
- { NULL, 78, 1152, 864, 9090, 228, 88, 32, 0, 84, 12, 0, |
29728 |
-- FB_VMODE_NONINTERLACED }, |
29729 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29730 |
- |
29731 |
- /* 1280x1024 @ 70 Hz, 74.59 kHz hsync */ |
29732 |
- { NULL, 70, 1280, 1024, 7905, 224, 32, 28, 8, 160, 8, 0, |
29733 |
-- FB_VMODE_NONINTERLACED }, |
29734 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29735 |
- |
29736 |
- /* 1600x1200 @ 60Hz, 75.00 kHz hsync */ |
29737 |
- { NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3, |
29738 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29739 |
-- FB_VMODE_NONINTERLACED }, |
29740 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29741 |
- |
29742 |
- /* 1152x864 @ 84 Hz, 76.0 kHz hsync */ |
29743 |
- { NULL, 84, 1152, 864, 7407, 184, 312, 32, 0, 128, 12, 0, |
29744 |
-- FB_VMODE_NONINTERLACED }, |
29745 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29746 |
- |
29747 |
- /* 1280x1024 @ 74 Hz, 78.85 kHz hsync */ |
29748 |
- { NULL, 74, 1280, 1024, 7407, 256, 32, 34, 3, 144, 3, 0, |
29749 |
-- FB_VMODE_NONINTERLACED }, |
29750 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29751 |
- |
29752 |
- /* 1024x768 @ 100Hz, 80.21 kHz hsync */ |
29753 |
- { NULL, 100, 1024, 768, 8658, 192, 32, 21, 3, 192, 10, 0, |
29754 |
-- FB_VMODE_NONINTERLACED }, |
29755 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29756 |
- |
29757 |
- /* 1280x1024 @ 76 Hz, 81.13 kHz hsync */ |
29758 |
- { NULL, 76, 1280, 1024, 7407, 248, 32, 34, 3, 104, 3, 0, |
29759 |
-- FB_VMODE_NONINTERLACED }, |
29760 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29761 |
- |
29762 |
- /* 1600x1200 @ 70 Hz, 87.50 kHz hsync */ |
29763 |
- { NULL, 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3, 0, |
29764 |
-- FB_VMODE_NONINTERLACED }, |
29765 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29766 |
- |
29767 |
- /* 1152x864 @ 100 Hz, 89.62 kHz hsync */ |
29768 |
- { NULL, 100, 1152, 864, 7264, 224, 32, 17, 2, 128, 19, 0, |
29769 |
-- FB_VMODE_NONINTERLACED }, |
29770 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29771 |
- |
29772 |
- /* 1280x1024 @ 85 Hz, 91.15 kHz hsync */ |
29773 |
- { NULL, 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3, |
29774 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29775 |
-- FB_VMODE_NONINTERLACED }, |
29776 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29777 |
- |
29778 |
- /* 1600x1200 @ 75 Hz, 93.75 kHz hsync */ |
29779 |
- { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, |
29780 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29781 |
-- FB_VMODE_NONINTERLACED }, |
29782 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29783 |
- |
29784 |
- /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */ |
29785 |
- { NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6, |
29786 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29787 |
-- FB_VMODE_NONINTERLACED }, |
29788 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29789 |
- |
29790 |
- /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */ |
29791 |
- { NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3, |
29792 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29793 |
-- FB_VMODE_NONINTERLACED }, |
29794 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29795 |
- |
29796 |
- /* 1280x1024 @ 100 Hz, 107.16 kHz hsync */ |
29797 |
- { NULL, 100, 1280, 1024, 5502, 256, 32, 26, 7, 128, 15, 0, |
29798 |
-- FB_VMODE_NONINTERLACED }, |
29799 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29800 |
- |
29801 |
- /* 1800x1440 @ 64Hz, 96.15 kHz hsync */ |
29802 |
- { NULL, 64, 1800, 1440, 4347, 304, 96, 46, 1, 192, 3, |
29803 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29804 |
-- FB_VMODE_NONINTERLACED }, |
29805 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29806 |
- |
29807 |
- /* 1800x1440 @ 70Hz, 104.52 kHz hsync */ |
29808 |
- { NULL, 70, 1800, 1440, 4000, 304, 96, 46, 1, 192, 3, |
29809 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29810 |
-- FB_VMODE_NONINTERLACED }, |
29811 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29812 |
- |
29813 |
- /* 512x384 @ 78 Hz, 31.50 kHz hsync */ |
29814 |
- { NULL, 78, 512, 384, 49603, 48, 16, 16, 1, 64, 3, 0, |
29815 |
-- FB_VMODE_NONINTERLACED }, |
29816 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29817 |
- |
29818 |
- /* 512x384 @ 85 Hz, 34.38 kHz hsync */ |
29819 |
- { NULL, 85, 512, 384, 45454, 48, 16, 16, 1, 64, 3, 0, |
29820 |
-- FB_VMODE_NONINTERLACED }, |
29821 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29822 |
- |
29823 |
- /* 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio */ |
29824 |
- { NULL, 70, 320, 200, 79440, 16, 16, 20, 4, 48, 1, 0, |
29825 |
-- FB_VMODE_DOUBLE }, |
29826 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29827 |
- |
29828 |
- /* 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio */ |
29829 |
- { NULL, 60, 320, 240, 79440, 16, 16, 16, 5, 48, 1, 0, |
29830 |
-- FB_VMODE_DOUBLE }, |
29831 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29832 |
- |
29833 |
- /* 320x240 @ 72 Hz, 36.5 kHz hsync */ |
29834 |
- { NULL, 72, 320, 240, 63492, 16, 16, 16, 4, 48, 2, 0, |
29835 |
-- FB_VMODE_DOUBLE }, |
29836 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29837 |
- |
29838 |
- /* 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio */ |
29839 |
- { NULL, 56, 400, 300, 55555, 64, 16, 10, 1, 32, 1, 0, |
29840 |
-- FB_VMODE_DOUBLE }, |
29841 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29842 |
- |
29843 |
- /* 400x300 @ 60 Hz, 37.8 kHz hsync */ |
29844 |
- { NULL, 60, 400, 300, 50000, 48, 16, 11, 1, 64, 2, 0, |
29845 |
-- FB_VMODE_DOUBLE }, |
29846 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29847 |
- |
29848 |
- /* 400x300 @ 72 Hz, 48.0 kHz hsync */ |
29849 |
- { NULL, 72, 400, 300, 40000, 32, 24, 11, 19, 64, 3, 0, |
29850 |
-- FB_VMODE_DOUBLE }, |
29851 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29852 |
- |
29853 |
- /* 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio */ |
29854 |
- { NULL, 56, 480, 300, 46176, 80, 16, 10, 1, 40, 1, 0, |
29855 |
-- FB_VMODE_DOUBLE }, |
29856 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29857 |
- |
29858 |
- /* 480x300 @ 60 Hz, 37.8 kHz hsync */ |
29859 |
- { NULL, 60, 480, 300, 41858, 56, 16, 11, 1, 80, 2, 0, |
29860 |
-- FB_VMODE_DOUBLE }, |
29861 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29862 |
- |
29863 |
- /* 480x300 @ 63 Hz, 39.6 kHz hsync */ |
29864 |
- { NULL, 63, 480, 300, 40000, 56, 16, 11, 1, 80, 2, 0, |
29865 |
-- FB_VMODE_DOUBLE }, |
29866 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29867 |
- |
29868 |
- /* 480x300 @ 72 Hz, 48.0 kHz hsync */ |
29869 |
- { NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, 0, |
29870 |
-- FB_VMODE_DOUBLE }, |
29871 |
-+ FB_VMODE_DOUBLE, FB_MODE_IS_UNKNOWN }, |
29872 |
- |
29873 |
- /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ |
29874 |
- { NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, |
29875 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29876 |
-- FB_VMODE_NONINTERLACED }, |
29877 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29878 |
- |
29879 |
- /* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */ |
29880 |
- { NULL, 60, 1152, 768, 14047, 158, 26, 29, 3, 136, 6, |
29881 |
- FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
29882 |
-- FB_VMODE_NONINTERLACED }, |
29883 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29884 |
- |
29885 |
- /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */ |
29886 |
- { NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5, 0, |
29887 |
-- FB_VMODE_NONINTERLACED }, |
29888 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29889 |
- |
29890 |
- /* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */ |
29891 |
- { NULL, 60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3, 0, |
29892 |
-- FB_VMODE_NONINTERLACED }, |
29893 |
-+ FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29894 |
- |
29895 |
- /* 720x576i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ |
29896 |
- { NULL, 50, 720, 576, 74074, 64, 16, 39, 5, 64, 5, 0, |
29897 |
-- FB_VMODE_INTERLACED }, |
29898 |
-+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, |
29899 |
- |
29900 |
- /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ |
29901 |
- { NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5, 0, |
29902 |
-- FB_VMODE_INTERLACED }, |
29903 |
-+ FB_VMODE_INTERLACED, FB_MODE_IS_UNKNOWN }, |
29904 |
- |
29905 |
- /* 864x480 @ 60 Hz, 35.15 kHz hsync */ |
29906 |
- { NULL, 60, 864, 480, 27777, 1, 1, 1, 1, 0, 0, |
29907 |
-- 0, FB_VMODE_NONINTERLACED }, |
29908 |
-+ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_UNKNOWN }, |
29909 |
- }; |
29910 |
- |
29911 |
- #ifdef CONFIG_FB_MODE_HELPERS |
29912 |
-diff -urNp linux-2.6.38.3/drivers/video/pxa3xx-gcu.c linux-2.6.38.3/drivers/video/pxa3xx-gcu.c |
29913 |
---- linux-2.6.38.3/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000000 -0400 |
29914 |
-+++ linux-2.6.38.3/drivers/video/pxa3xx-gcu.c 2011-04-17 15:57:32.000000000 -0400 |
29915 |
+diff -urNp linux-2.6.38.4/drivers/video/pxa3xx-gcu.c linux-2.6.38.4/drivers/video/pxa3xx-gcu.c |
29916 |
+--- linux-2.6.38.4/drivers/video/pxa3xx-gcu.c 2011-03-14 21:20:32.000000000 -0400 |
29917 |
++++ linux-2.6.38.4/drivers/video/pxa3xx-gcu.c 2011-04-17 15:57:32.000000000 -0400 |
29918 |
@@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv { |
29919 |
dma_addr_t shared_phys; |
29920 |
struct resource *resource_mem; |
29921 |
@@ -29686,9 +28575,9 @@ diff -urNp linux-2.6.38.3/drivers/video/pxa3xx-gcu.c linux-2.6.38.3/drivers/vide |
29922 |
wait_queue_head_t wait_idle; |
29923 |
wait_queue_head_t wait_free; |
29924 |
spinlock_t spinlock; |
29925 |
-diff -urNp linux-2.6.38.3/drivers/video/uvesafb.c linux-2.6.38.3/drivers/video/uvesafb.c |
29926 |
---- linux-2.6.38.3/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000 -0400 |
29927 |
-+++ linux-2.6.38.3/drivers/video/uvesafb.c 2011-04-17 15:57:32.000000000 -0400 |
29928 |
+diff -urNp linux-2.6.38.4/drivers/video/uvesafb.c linux-2.6.38.4/drivers/video/uvesafb.c |
29929 |
+--- linux-2.6.38.4/drivers/video/uvesafb.c 2011-03-14 21:20:32.000000000 -0400 |
29930 |
++++ linux-2.6.38.4/drivers/video/uvesafb.c 2011-04-17 15:57:32.000000000 -0400 |
29931 |
@@ -19,6 +19,7 @@ |
29932 |
#include <linux/io.h> |
29933 |
#include <linux/mutex.h> |
29934 |
@@ -29764,9 +28653,9 @@ diff -urNp linux-2.6.38.3/drivers/video/uvesafb.c linux-2.6.38.3/drivers/video/u |
29935 |
} |
29936 |
|
29937 |
framebuffer_release(info); |
29938 |
-diff -urNp linux-2.6.38.3/drivers/video/vesafb.c linux-2.6.38.3/drivers/video/vesafb.c |
29939 |
---- linux-2.6.38.3/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 -0400 |
29940 |
-+++ linux-2.6.38.3/drivers/video/vesafb.c 2011-04-17 15:57:32.000000000 -0400 |
29941 |
+diff -urNp linux-2.6.38.4/drivers/video/vesafb.c linux-2.6.38.4/drivers/video/vesafb.c |
29942 |
+--- linux-2.6.38.4/drivers/video/vesafb.c 2011-03-14 21:20:32.000000000 -0400 |
29943 |
++++ linux-2.6.38.4/drivers/video/vesafb.c 2011-04-17 15:57:32.000000000 -0400 |
29944 |
@@ -9,6 +9,7 @@ |
29945 |
*/ |
29946 |
|
29947 |
@@ -29870,9 +28759,9 @@ diff -urNp linux-2.6.38.3/drivers/video/vesafb.c linux-2.6.38.3/drivers/video/ve |
29948 |
if (info->screen_base) |
29949 |
iounmap(info->screen_base); |
29950 |
framebuffer_release(info); |
29951 |
-diff -urNp linux-2.6.38.3/fs/9p/vfs_inode.c linux-2.6.38.3/fs/9p/vfs_inode.c |
29952 |
---- linux-2.6.38.3/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400 |
29953 |
-+++ linux-2.6.38.3/fs/9p/vfs_inode.c 2011-04-17 15:57:32.000000000 -0400 |
29954 |
+diff -urNp linux-2.6.38.4/fs/9p/vfs_inode.c linux-2.6.38.4/fs/9p/vfs_inode.c |
29955 |
+--- linux-2.6.38.4/fs/9p/vfs_inode.c 2011-03-14 21:20:32.000000000 -0400 |
29956 |
++++ linux-2.6.38.4/fs/9p/vfs_inode.c 2011-04-17 15:57:32.000000000 -0400 |
29957 |
@@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct |
29958 |
void |
29959 |
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) |
29960 |
@@ -29882,9 +28771,9 @@ diff -urNp linux-2.6.38.3/fs/9p/vfs_inode.c linux-2.6.38.3/fs/9p/vfs_inode.c |
29961 |
|
29962 |
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, |
29963 |
IS_ERR(s) ? "<error>" : s); |
29964 |
-diff -urNp linux-2.6.38.3/fs/aio.c linux-2.6.38.3/fs/aio.c |
29965 |
---- linux-2.6.38.3/fs/aio.c 2011-04-18 17:27:16.000000000 -0400 |
29966 |
-+++ linux-2.6.38.3/fs/aio.c 2011-04-17 15:57:32.000000000 -0400 |
29967 |
+diff -urNp linux-2.6.38.4/fs/aio.c linux-2.6.38.4/fs/aio.c |
29968 |
+--- linux-2.6.38.4/fs/aio.c 2011-04-18 17:27:16.000000000 -0400 |
29969 |
++++ linux-2.6.38.4/fs/aio.c 2011-04-17 15:57:32.000000000 -0400 |
29970 |
@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx |
29971 |
size += sizeof(struct io_event) * nr_events; |
29972 |
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; |
29973 |
@@ -29894,9 +28783,9 @@ diff -urNp linux-2.6.38.3/fs/aio.c linux-2.6.38.3/fs/aio.c |
29974 |
return -EINVAL; |
29975 |
|
29976 |
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); |
29977 |
-diff -urNp linux-2.6.38.3/fs/attr.c linux-2.6.38.3/fs/attr.c |
29978 |
---- linux-2.6.38.3/fs/attr.c 2011-03-14 21:20:32.000000000 -0400 |
29979 |
-+++ linux-2.6.38.3/fs/attr.c 2011-04-17 15:57:32.000000000 -0400 |
29980 |
+diff -urNp linux-2.6.38.4/fs/attr.c linux-2.6.38.4/fs/attr.c |
29981 |
+--- linux-2.6.38.4/fs/attr.c 2011-03-14 21:20:32.000000000 -0400 |
29982 |
++++ linux-2.6.38.4/fs/attr.c 2011-04-17 15:57:32.000000000 -0400 |
29983 |
@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode |
29984 |
unsigned long limit; |
29985 |
|
29986 |
@@ -29905,9 +28794,9 @@ diff -urNp linux-2.6.38.3/fs/attr.c linux-2.6.38.3/fs/attr.c |
29987 |
if (limit != RLIM_INFINITY && offset > limit) |
29988 |
goto out_sig; |
29989 |
if (offset > inode->i_sb->s_maxbytes) |
29990 |
-diff -urNp linux-2.6.38.3/fs/befs/linuxvfs.c linux-2.6.38.3/fs/befs/linuxvfs.c |
29991 |
---- linux-2.6.38.3/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -0400 |
29992 |
-+++ linux-2.6.38.3/fs/befs/linuxvfs.c 2011-04-17 15:57:32.000000000 -0400 |
29993 |
+diff -urNp linux-2.6.38.4/fs/befs/linuxvfs.c linux-2.6.38.4/fs/befs/linuxvfs.c |
29994 |
+--- linux-2.6.38.4/fs/befs/linuxvfs.c 2011-03-14 21:20:32.000000000 -0400 |
29995 |
++++ linux-2.6.38.4/fs/befs/linuxvfs.c 2011-04-17 15:57:32.000000000 -0400 |
29996 |
@@ -499,7 +499,7 @@ static void befs_put_link(struct dentry |
29997 |
{ |
29998 |
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); |
29999 |
@@ -29917,9 +28806,9 @@ diff -urNp linux-2.6.38.3/fs/befs/linuxvfs.c linux-2.6.38.3/fs/befs/linuxvfs.c |
30000 |
if (!IS_ERR(link)) |
30001 |
kfree(link); |
30002 |
} |
30003 |
-diff -urNp linux-2.6.38.3/fs/binfmt_aout.c linux-2.6.38.3/fs/binfmt_aout.c |
30004 |
---- linux-2.6.38.3/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400 |
30005 |
-+++ linux-2.6.38.3/fs/binfmt_aout.c 2011-04-17 15:57:32.000000000 -0400 |
30006 |
+diff -urNp linux-2.6.38.4/fs/binfmt_aout.c linux-2.6.38.4/fs/binfmt_aout.c |
30007 |
+--- linux-2.6.38.4/fs/binfmt_aout.c 2011-03-14 21:20:32.000000000 -0400 |
30008 |
++++ linux-2.6.38.4/fs/binfmt_aout.c 2011-04-17 15:57:32.000000000 -0400 |
30009 |
@@ -16,6 +16,7 @@ |
30010 |
#include <linux/string.h> |
30011 |
#include <linux/fs.h> |
30012 |
@@ -29996,9 +28885,9 @@ diff -urNp linux-2.6.38.3/fs/binfmt_aout.c linux-2.6.38.3/fs/binfmt_aout.c |
30013 |
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, |
30014 |
fd_offset + ex.a_text); |
30015 |
up_write(¤t->mm->mmap_sem); |
30016 |
-diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30017 |
---- linux-2.6.38.3/fs/binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400 |
30018 |
-+++ linux-2.6.38.3/fs/binfmt_elf.c 2011-04-17 15:57:32.000000000 -0400 |
30019 |
+diff -urNp linux-2.6.38.4/fs/binfmt_elf.c linux-2.6.38.4/fs/binfmt_elf.c |
30020 |
+--- linux-2.6.38.4/fs/binfmt_elf.c 2011-04-22 19:20:59.000000000 -0400 |
30021 |
++++ linux-2.6.38.4/fs/binfmt_elf.c 2011-04-22 19:21:23.000000000 -0400 |
30022 |
@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump |
30023 |
#define elf_core_dump NULL |
30024 |
#endif |
30025 |
@@ -30490,7 +29379,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30026 |
} |
30027 |
|
30028 |
if (elf_interpreter) { |
30029 |
-@@ -1086,7 +1391,7 @@ out: |
30030 |
+@@ -1090,7 +1395,7 @@ out: |
30031 |
* Decide what to dump of a segment, part, all or none. |
30032 |
*/ |
30033 |
static unsigned long vma_dump_size(struct vm_area_struct *vma, |
30034 |
@@ -30499,7 +29388,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30035 |
{ |
30036 |
#define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) |
30037 |
|
30038 |
-@@ -1120,7 +1425,7 @@ static unsigned long vma_dump_size(struc |
30039 |
+@@ -1124,7 +1429,7 @@ static unsigned long vma_dump_size(struc |
30040 |
if (vma->vm_file == NULL) |
30041 |
return 0; |
30042 |
|
30043 |
@@ -30508,7 +29397,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30044 |
goto whole; |
30045 |
|
30046 |
/* |
30047 |
-@@ -1342,9 +1647,9 @@ static void fill_auxv_note(struct memelf |
30048 |
+@@ -1346,9 +1651,9 @@ static void fill_auxv_note(struct memelf |
30049 |
{ |
30050 |
elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv; |
30051 |
int i = 0; |
30052 |
@@ -30520,7 +29409,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30053 |
fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); |
30054 |
} |
30055 |
|
30056 |
-@@ -1850,14 +2155,14 @@ static void fill_extnum_info(struct elfh |
30057 |
+@@ -1854,14 +2159,14 @@ static void fill_extnum_info(struct elfh |
30058 |
} |
30059 |
|
30060 |
static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma, |
30061 |
@@ -30537,7 +29426,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30062 |
return size; |
30063 |
} |
30064 |
|
30065 |
-@@ -1951,7 +2256,7 @@ static int elf_core_dump(struct coredump |
30066 |
+@@ -1955,7 +2260,7 @@ static int elf_core_dump(struct coredump |
30067 |
|
30068 |
dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE); |
30069 |
|
30070 |
@@ -30546,7 +29435,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30071 |
offset += elf_core_extra_data_size(); |
30072 |
e_shoff = offset; |
30073 |
|
30074 |
-@@ -1965,10 +2270,12 @@ static int elf_core_dump(struct coredump |
30075 |
+@@ -1969,10 +2274,12 @@ static int elf_core_dump(struct coredump |
30076 |
offset = dataoff; |
30077 |
|
30078 |
size += sizeof(*elf); |
30079 |
@@ -30559,7 +29448,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30080 |
if (size > cprm->limit |
30081 |
|| !dump_write(cprm->file, phdr4note, sizeof(*phdr4note))) |
30082 |
goto end_coredump; |
30083 |
-@@ -1982,7 +2289,7 @@ static int elf_core_dump(struct coredump |
30084 |
+@@ -1986,7 +2293,7 @@ static int elf_core_dump(struct coredump |
30085 |
phdr.p_offset = offset; |
30086 |
phdr.p_vaddr = vma->vm_start; |
30087 |
phdr.p_paddr = 0; |
30088 |
@@ -30568,7 +29457,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30089 |
phdr.p_memsz = vma->vm_end - vma->vm_start; |
30090 |
offset += phdr.p_filesz; |
30091 |
phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0; |
30092 |
-@@ -1993,6 +2300,7 @@ static int elf_core_dump(struct coredump |
30093 |
+@@ -1997,6 +2304,7 @@ static int elf_core_dump(struct coredump |
30094 |
phdr.p_align = ELF_EXEC_PAGESIZE; |
30095 |
|
30096 |
size += sizeof(phdr); |
30097 |
@@ -30576,7 +29465,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30098 |
if (size > cprm->limit |
30099 |
|| !dump_write(cprm->file, &phdr, sizeof(phdr))) |
30100 |
goto end_coredump; |
30101 |
-@@ -2017,7 +2325,7 @@ static int elf_core_dump(struct coredump |
30102 |
+@@ -2021,7 +2329,7 @@ static int elf_core_dump(struct coredump |
30103 |
unsigned long addr; |
30104 |
unsigned long end; |
30105 |
|
30106 |
@@ -30585,7 +29474,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30107 |
|
30108 |
for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { |
30109 |
struct page *page; |
30110 |
-@@ -2026,6 +2334,7 @@ static int elf_core_dump(struct coredump |
30111 |
+@@ -2030,6 +2338,7 @@ static int elf_core_dump(struct coredump |
30112 |
page = get_dump_page(addr); |
30113 |
if (page) { |
30114 |
void *kaddr = kmap(page); |
30115 |
@@ -30593,7 +29482,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30116 |
stop = ((size += PAGE_SIZE) > cprm->limit) || |
30117 |
!dump_write(cprm->file, kaddr, |
30118 |
PAGE_SIZE); |
30119 |
-@@ -2043,6 +2352,7 @@ static int elf_core_dump(struct coredump |
30120 |
+@@ -2047,6 +2356,7 @@ static int elf_core_dump(struct coredump |
30121 |
|
30122 |
if (e_phnum == PN_XNUM) { |
30123 |
size += sizeof(*shdr4extnum); |
30124 |
@@ -30601,7 +29490,7 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30125 |
if (size > cprm->limit |
30126 |
|| !dump_write(cprm->file, shdr4extnum, |
30127 |
sizeof(*shdr4extnum))) |
30128 |
-@@ -2063,6 +2373,97 @@ out: |
30129 |
+@@ -2067,6 +2377,97 @@ out: |
30130 |
|
30131 |
#endif /* CONFIG_ELF_CORE */ |
30132 |
|
30133 |
@@ -30699,9 +29588,9 @@ diff -urNp linux-2.6.38.3/fs/binfmt_elf.c linux-2.6.38.3/fs/binfmt_elf.c |
30134 |
static int __init init_elf_binfmt(void) |
30135 |
{ |
30136 |
return register_binfmt(&elf_format); |
30137 |
-diff -urNp linux-2.6.38.3/fs/binfmt_flat.c linux-2.6.38.3/fs/binfmt_flat.c |
30138 |
---- linux-2.6.38.3/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400 |
30139 |
-+++ linux-2.6.38.3/fs/binfmt_flat.c 2011-04-17 15:57:32.000000000 -0400 |
30140 |
+diff -urNp linux-2.6.38.4/fs/binfmt_flat.c linux-2.6.38.4/fs/binfmt_flat.c |
30141 |
+--- linux-2.6.38.4/fs/binfmt_flat.c 2011-03-14 21:20:32.000000000 -0400 |
30142 |
++++ linux-2.6.38.4/fs/binfmt_flat.c 2011-04-17 15:57:32.000000000 -0400 |
30143 |
@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b |
30144 |
realdatastart = (unsigned long) -ENOMEM; |
30145 |
printk("Unable to allocate RAM for process data, errno %d\n", |
30146 |
@@ -30734,21 +29623,9 @@ diff -urNp linux-2.6.38.3/fs/binfmt_flat.c linux-2.6.38.3/fs/binfmt_flat.c |
30147 |
ret = result; |
30148 |
goto err; |
30149 |
} |
30150 |
-diff -urNp linux-2.6.38.3/fs/binfmt_misc.c linux-2.6.38.3/fs/binfmt_misc.c |
30151 |
---- linux-2.6.38.3/fs/binfmt_misc.c 2011-03-14 21:20:32.000000000 -0400 |
30152 |
-+++ linux-2.6.38.3/fs/binfmt_misc.c 2011-04-17 15:57:32.000000000 -0400 |
30153 |
-@@ -698,7 +698,7 @@ static int bm_fill_super(struct super_bl |
30154 |
- static struct tree_descr bm_files[] = { |
30155 |
- [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, |
30156 |
- [3] = {"register", &bm_register_operations, S_IWUSR}, |
30157 |
-- /* last one */ {""} |
30158 |
-+ /* last one */ {"", NULL, 0} |
30159 |
- }; |
30160 |
- int err = simple_fill_super(sb, 0x42494e4d, bm_files); |
30161 |
- if (!err) |
30162 |
-diff -urNp linux-2.6.38.3/fs/bio.c linux-2.6.38.3/fs/bio.c |
30163 |
---- linux-2.6.38.3/fs/bio.c 2011-03-14 21:20:32.000000000 -0400 |
30164 |
-+++ linux-2.6.38.3/fs/bio.c 2011-04-17 15:57:32.000000000 -0400 |
30165 |
+diff -urNp linux-2.6.38.4/fs/bio.c linux-2.6.38.4/fs/bio.c |
30166 |
+--- linux-2.6.38.4/fs/bio.c 2011-03-14 21:20:32.000000000 -0400 |
30167 |
++++ linux-2.6.38.4/fs/bio.c 2011-04-17 15:57:32.000000000 -0400 |
30168 |
@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b |
30169 |
const int read = bio_data_dir(bio) == READ; |
30170 |
struct bio_map_data *bmd = bio->bi_private; |
30171 |
@@ -30758,9 +29635,9 @@ diff -urNp linux-2.6.38.3/fs/bio.c linux-2.6.38.3/fs/bio.c |
30172 |
|
30173 |
__bio_for_each_segment(bvec, bio, i, 0) { |
30174 |
char *addr = page_address(bvec->bv_page); |
30175 |
-diff -urNp linux-2.6.38.3/fs/block_dev.c linux-2.6.38.3/fs/block_dev.c |
30176 |
---- linux-2.6.38.3/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400 |
30177 |
-+++ linux-2.6.38.3/fs/block_dev.c 2011-04-17 15:57:32.000000000 -0400 |
30178 |
+diff -urNp linux-2.6.38.4/fs/block_dev.c linux-2.6.38.4/fs/block_dev.c |
30179 |
+--- linux-2.6.38.4/fs/block_dev.c 2011-03-14 21:20:32.000000000 -0400 |
30180 |
++++ linux-2.6.38.4/fs/block_dev.c 2011-04-17 15:57:32.000000000 -0400 |
30181 |
@@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_de |
30182 |
else if (bdev->bd_contains == bdev) |
30183 |
return true; /* is a whole device which isn't held */ |
30184 |
@@ -30770,9 +29647,9 @@ diff -urNp linux-2.6.38.3/fs/block_dev.c linux-2.6.38.3/fs/block_dev.c |
30185 |
return true; /* is a partition of a device that is being partitioned */ |
30186 |
else if (whole->bd_holder != NULL) |
30187 |
return false; /* is a partition of a held device */ |
30188 |
-diff -urNp linux-2.6.38.3/fs/btrfs/ctree.c linux-2.6.38.3/fs/btrfs/ctree.c |
30189 |
---- linux-2.6.38.3/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400 |
30190 |
-+++ linux-2.6.38.3/fs/btrfs/ctree.c 2011-04-17 15:57:32.000000000 -0400 |
30191 |
+diff -urNp linux-2.6.38.4/fs/btrfs/ctree.c linux-2.6.38.4/fs/btrfs/ctree.c |
30192 |
+--- linux-2.6.38.4/fs/btrfs/ctree.c 2011-03-14 21:20:32.000000000 -0400 |
30193 |
++++ linux-2.6.38.4/fs/btrfs/ctree.c 2011-04-17 15:57:32.000000000 -0400 |
30194 |
@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st |
30195 |
free_extent_buffer(buf); |
30196 |
add_root_to_dirty_list(root); |
30197 |
@@ -30797,9 +29674,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/ctree.c linux-2.6.38.3/fs/btrfs/ctree.c |
30198 |
btrfs_cpu_key_to_disk(&disk_key, cpu_key); |
30199 |
ret = fixup_low_keys(trans, root, path, &disk_key, 1); |
30200 |
} |
30201 |
-diff -urNp linux-2.6.38.3/fs/btrfs/disk-io.c linux-2.6.38.3/fs/btrfs/disk-io.c |
30202 |
---- linux-2.6.38.3/fs/btrfs/disk-io.c 2011-04-18 17:27:18.000000000 -0400 |
30203 |
-+++ linux-2.6.38.3/fs/btrfs/disk-io.c 2011-04-17 16:53:48.000000000 -0400 |
30204 |
+diff -urNp linux-2.6.38.4/fs/btrfs/disk-io.c linux-2.6.38.4/fs/btrfs/disk-io.c |
30205 |
+--- linux-2.6.38.4/fs/btrfs/disk-io.c 2011-04-18 17:27:18.000000000 -0400 |
30206 |
++++ linux-2.6.38.4/fs/btrfs/disk-io.c 2011-04-17 16:53:48.000000000 -0400 |
30207 |
@@ -41,7 +41,7 @@ |
30208 |
#include "tree-log.h" |
30209 |
#include "free-space-cache.h" |
30210 |
@@ -30818,9 +29695,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/disk-io.c linux-2.6.38.3/fs/btrfs/disk-io.c |
30211 |
.write_cache_pages_lock_hook = btree_lock_page_hook, |
30212 |
.readpage_end_io_hook = btree_readpage_end_io_hook, |
30213 |
.submit_bio_hook = btree_submit_bio_hook, |
30214 |
-diff -urNp linux-2.6.38.3/fs/btrfs/extent_io.h linux-2.6.38.3/fs/btrfs/extent_io.h |
30215 |
---- linux-2.6.38.3/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0400 |
30216 |
-+++ linux-2.6.38.3/fs/btrfs/extent_io.h 2011-04-17 15:57:32.000000000 -0400 |
30217 |
+diff -urNp linux-2.6.38.4/fs/btrfs/extent_io.h linux-2.6.38.4/fs/btrfs/extent_io.h |
30218 |
+--- linux-2.6.38.4/fs/btrfs/extent_io.h 2011-03-14 21:20:32.000000000 -0400 |
30219 |
++++ linux-2.6.38.4/fs/btrfs/extent_io.h 2011-04-17 15:57:32.000000000 -0400 |
30220 |
@@ -55,36 +55,36 @@ typedef int (extent_submit_bio_hook_t)(s |
30221 |
struct bio *bio, int mirror_num, |
30222 |
unsigned long bio_flags, u64 bio_offset); |
30223 |
@@ -30881,9 +29758,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/extent_io.h linux-2.6.38.3/fs/btrfs/extent_io |
30224 |
}; |
30225 |
|
30226 |
struct extent_state { |
30227 |
-diff -urNp linux-2.6.38.3/fs/btrfs/free-space-cache.c linux-2.6.38.3/fs/btrfs/free-space-cache.c |
30228 |
---- linux-2.6.38.3/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.000000000 -0400 |
30229 |
-+++ linux-2.6.38.3/fs/btrfs/free-space-cache.c 2011-04-17 15:57:32.000000000 -0400 |
30230 |
+diff -urNp linux-2.6.38.4/fs/btrfs/free-space-cache.c linux-2.6.38.4/fs/btrfs/free-space-cache.c |
30231 |
+--- linux-2.6.38.4/fs/btrfs/free-space-cache.c 2011-03-14 21:20:32.000000000 -0400 |
30232 |
++++ linux-2.6.38.4/fs/btrfs/free-space-cache.c 2011-04-17 15:57:32.000000000 -0400 |
30233 |
@@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrf |
30234 |
|
30235 |
while(1) { |
30236 |
@@ -30902,9 +29779,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/free-space-cache.c linux-2.6.38.3/fs/btrfs/fr |
30237 |
|
30238 |
if (entry->bitmap && entry->bytes > bytes + empty_size) { |
30239 |
ret = btrfs_bitmap_cluster(block_group, entry, cluster, |
30240 |
-diff -urNp linux-2.6.38.3/fs/btrfs/inode.c linux-2.6.38.3/fs/btrfs/inode.c |
30241 |
---- linux-2.6.38.3/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30242 |
-+++ linux-2.6.38.3/fs/btrfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30243 |
+diff -urNp linux-2.6.38.4/fs/btrfs/inode.c linux-2.6.38.4/fs/btrfs/inode.c |
30244 |
+--- linux-2.6.38.4/fs/btrfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30245 |
++++ linux-2.6.38.4/fs/btrfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30246 |
@@ -64,7 +64,7 @@ static const struct inode_operations btr |
30247 |
static const struct address_space_operations btrfs_aops; |
30248 |
static const struct address_space_operations btrfs_symlink_aops; |
30249 |
@@ -30947,9 +29824,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/inode.c linux-2.6.38.3/fs/btrfs/inode.c |
30250 |
.fill_delalloc = run_delalloc_range, |
30251 |
.submit_bio_hook = btrfs_submit_bio_hook, |
30252 |
.merge_bio_hook = btrfs_merge_bio_hook, |
30253 |
-diff -urNp linux-2.6.38.3/fs/btrfs/ioctl.c linux-2.6.38.3/fs/btrfs/ioctl.c |
30254 |
---- linux-2.6.38.3/fs/btrfs/ioctl.c 2011-04-18 17:27:18.000000000 -0400 |
30255 |
-+++ linux-2.6.38.3/fs/btrfs/ioctl.c 2011-04-17 16:53:48.000000000 -0400 |
30256 |
+diff -urNp linux-2.6.38.4/fs/btrfs/ioctl.c linux-2.6.38.4/fs/btrfs/ioctl.c |
30257 |
+--- linux-2.6.38.4/fs/btrfs/ioctl.c 2011-04-18 17:27:18.000000000 -0400 |
30258 |
++++ linux-2.6.38.4/fs/btrfs/ioctl.c 2011-04-17 16:53:48.000000000 -0400 |
30259 |
@@ -2274,9 +2274,12 @@ long btrfs_ioctl_space_info(struct btrfs |
30260 |
for (i = 0; i < num_types; i++) { |
30261 |
struct btrfs_space_info *tmp; |
30262 |
@@ -30974,9 +29851,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/ioctl.c linux-2.6.38.3/fs/btrfs/ioctl.c |
30263 |
} |
30264 |
up_read(&info->groups_sem); |
30265 |
} |
30266 |
-diff -urNp linux-2.6.38.3/fs/btrfs/relocation.c linux-2.6.38.3/fs/btrfs/relocation.c |
30267 |
---- linux-2.6.38.3/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -0400 |
30268 |
-+++ linux-2.6.38.3/fs/btrfs/relocation.c 2011-04-17 15:57:32.000000000 -0400 |
30269 |
+diff -urNp linux-2.6.38.4/fs/btrfs/relocation.c linux-2.6.38.4/fs/btrfs/relocation.c |
30270 |
+--- linux-2.6.38.4/fs/btrfs/relocation.c 2011-03-14 21:20:32.000000000 -0400 |
30271 |
++++ linux-2.6.38.4/fs/btrfs/relocation.c 2011-04-17 15:57:32.000000000 -0400 |
30272 |
@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt |
30273 |
} |
30274 |
spin_unlock(&rc->reloc_root_tree.lock); |
30275 |
@@ -30986,9 +29863,9 @@ diff -urNp linux-2.6.38.3/fs/btrfs/relocation.c linux-2.6.38.3/fs/btrfs/relocati |
30276 |
|
30277 |
if (!del) { |
30278 |
spin_lock(&rc->reloc_root_tree.lock); |
30279 |
-diff -urNp linux-2.6.38.3/fs/cachefiles/bind.c linux-2.6.38.3/fs/cachefiles/bind.c |
30280 |
---- linux-2.6.38.3/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0400 |
30281 |
-+++ linux-2.6.38.3/fs/cachefiles/bind.c 2011-04-17 15:57:32.000000000 -0400 |
30282 |
+diff -urNp linux-2.6.38.4/fs/cachefiles/bind.c linux-2.6.38.4/fs/cachefiles/bind.c |
30283 |
+--- linux-2.6.38.4/fs/cachefiles/bind.c 2011-03-14 21:20:32.000000000 -0400 |
30284 |
++++ linux-2.6.38.4/fs/cachefiles/bind.c 2011-04-17 15:57:32.000000000 -0400 |
30285 |
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef |
30286 |
args); |
30287 |
|
30288 |
@@ -31005,9 +29882,9 @@ diff -urNp linux-2.6.38.3/fs/cachefiles/bind.c linux-2.6.38.3/fs/cachefiles/bind |
30289 |
cache->bcull_percent < cache->brun_percent && |
30290 |
cache->brun_percent < 100); |
30291 |
|
30292 |
-diff -urNp linux-2.6.38.3/fs/cachefiles/daemon.c linux-2.6.38.3/fs/cachefiles/daemon.c |
30293 |
---- linux-2.6.38.3/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 -0400 |
30294 |
-+++ linux-2.6.38.3/fs/cachefiles/daemon.c 2011-04-17 15:57:32.000000000 -0400 |
30295 |
+diff -urNp linux-2.6.38.4/fs/cachefiles/daemon.c linux-2.6.38.4/fs/cachefiles/daemon.c |
30296 |
+--- linux-2.6.38.4/fs/cachefiles/daemon.c 2011-03-14 21:20:32.000000000 -0400 |
30297 |
++++ linux-2.6.38.4/fs/cachefiles/daemon.c 2011-04-17 15:57:32.000000000 -0400 |
30298 |
@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st |
30299 |
if (n > buflen) |
30300 |
return -EMSGSIZE; |
30301 |
@@ -31044,9 +29921,9 @@ diff -urNp linux-2.6.38.3/fs/cachefiles/daemon.c linux-2.6.38.3/fs/cachefiles/da |
30302 |
return cachefiles_daemon_range_error(cache, args); |
30303 |
|
30304 |
cache->bstop_percent = bstop; |
30305 |
-diff -urNp linux-2.6.38.3/fs/cachefiles/rdwr.c linux-2.6.38.3/fs/cachefiles/rdwr.c |
30306 |
---- linux-2.6.38.3/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0400 |
30307 |
-+++ linux-2.6.38.3/fs/cachefiles/rdwr.c 2011-04-17 15:57:32.000000000 -0400 |
30308 |
+diff -urNp linux-2.6.38.4/fs/cachefiles/rdwr.c linux-2.6.38.4/fs/cachefiles/rdwr.c |
30309 |
+--- linux-2.6.38.4/fs/cachefiles/rdwr.c 2011-03-14 21:20:32.000000000 -0400 |
30310 |
++++ linux-2.6.38.4/fs/cachefiles/rdwr.c 2011-04-17 15:57:32.000000000 -0400 |
30311 |
@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache |
30312 |
old_fs = get_fs(); |
30313 |
set_fs(KERNEL_DS); |
30314 |
@@ -31056,9 +29933,9 @@ diff -urNp linux-2.6.38.3/fs/cachefiles/rdwr.c linux-2.6.38.3/fs/cachefiles/rdwr |
30315 |
set_fs(old_fs); |
30316 |
kunmap(page); |
30317 |
if (ret != len) |
30318 |
-diff -urNp linux-2.6.38.3/fs/ceph/dir.c linux-2.6.38.3/fs/ceph/dir.c |
30319 |
---- linux-2.6.38.3/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400 |
30320 |
-+++ linux-2.6.38.3/fs/ceph/dir.c 2011-04-17 15:57:32.000000000 -0400 |
30321 |
+diff -urNp linux-2.6.38.4/fs/ceph/dir.c linux-2.6.38.4/fs/ceph/dir.c |
30322 |
+--- linux-2.6.38.4/fs/ceph/dir.c 2011-03-14 21:20:32.000000000 -0400 |
30323 |
++++ linux-2.6.38.4/fs/ceph/dir.c 2011-04-17 15:57:32.000000000 -0400 |
30324 |
@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil |
30325 |
struct ceph_fs_client *fsc = ceph_inode_to_client(inode); |
30326 |
struct ceph_mds_client *mdsc = fsc->mdsc; |
30327 |
@@ -31077,21 +29954,9 @@ diff -urNp linux-2.6.38.3/fs/ceph/dir.c linux-2.6.38.3/fs/ceph/dir.c |
30328 |
u64 pos = ceph_make_fpos(frag, off); |
30329 |
struct ceph_mds_reply_inode *in = |
30330 |
rinfo->dir_in[off - fi->offset].in; |
30331 |
-diff -urNp linux-2.6.38.3/fs/cifs/cifs_uniupr.h linux-2.6.38.3/fs/cifs/cifs_uniupr.h |
30332 |
---- linux-2.6.38.3/fs/cifs/cifs_uniupr.h 2011-03-14 21:20:32.000000000 -0400 |
30333 |
-+++ linux-2.6.38.3/fs/cifs/cifs_uniupr.h 2011-04-17 15:57:32.000000000 -0400 |
30334 |
-@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa |
30335 |
- {0x0490, 0x04cc, UniCaseRangeU0490}, |
30336 |
- {0x1e00, 0x1ffc, UniCaseRangeU1e00}, |
30337 |
- {0xff40, 0xff5a, UniCaseRangeUff40}, |
30338 |
-- {0} |
30339 |
-+ {0, 0, NULL} |
30340 |
- }; |
30341 |
- #endif |
30342 |
- |
30343 |
-diff -urNp linux-2.6.38.3/fs/cifs/link.c linux-2.6.38.3/fs/cifs/link.c |
30344 |
---- linux-2.6.38.3/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400 |
30345 |
-+++ linux-2.6.38.3/fs/cifs/link.c 2011-04-17 15:57:32.000000000 -0400 |
30346 |
+diff -urNp linux-2.6.38.4/fs/cifs/link.c linux-2.6.38.4/fs/cifs/link.c |
30347 |
+--- linux-2.6.38.4/fs/cifs/link.c 2011-03-14 21:20:32.000000000 -0400 |
30348 |
++++ linux-2.6.38.4/fs/cifs/link.c 2011-04-17 15:57:32.000000000 -0400 |
30349 |
@@ -577,7 +577,7 @@ symlink_exit: |
30350 |
|
30351 |
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) |
30352 |
@@ -31101,9 +29966,9 @@ diff -urNp linux-2.6.38.3/fs/cifs/link.c linux-2.6.38.3/fs/cifs/link.c |
30353 |
if (!IS_ERR(p)) |
30354 |
kfree(p); |
30355 |
} |
30356 |
-diff -urNp linux-2.6.38.3/fs/compat_binfmt_elf.c linux-2.6.38.3/fs/compat_binfmt_elf.c |
30357 |
---- linux-2.6.38.3/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400 |
30358 |
-+++ linux-2.6.38.3/fs/compat_binfmt_elf.c 2011-04-17 15:57:32.000000000 -0400 |
30359 |
+diff -urNp linux-2.6.38.4/fs/compat_binfmt_elf.c linux-2.6.38.4/fs/compat_binfmt_elf.c |
30360 |
+--- linux-2.6.38.4/fs/compat_binfmt_elf.c 2011-03-14 21:20:32.000000000 -0400 |
30361 |
++++ linux-2.6.38.4/fs/compat_binfmt_elf.c 2011-04-17 15:57:32.000000000 -0400 |
30362 |
@@ -30,11 +30,13 @@ |
30363 |
#undef elf_phdr |
30364 |
#undef elf_shdr |
30365 |
@@ -31118,9 +29983,9 @@ diff -urNp linux-2.6.38.3/fs/compat_binfmt_elf.c linux-2.6.38.3/fs/compat_binfmt |
30366 |
#define elf_addr_t Elf32_Addr |
30367 |
|
30368 |
/* |
30369 |
-diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.38.3/fs/compat.c |
30370 |
---- linux-2.6.38.3/fs/compat.c 2011-03-14 21:20:32.000000000 -0400 |
30371 |
-+++ linux-2.6.38.3/fs/compat.c 2011-04-17 15:57:32.000000000 -0400 |
30372 |
+diff -urNp linux-2.6.38.4/fs/compat.c linux-2.6.38.4/fs/compat.c |
30373 |
+--- linux-2.6.38.4/fs/compat.c 2011-03-14 21:20:32.000000000 -0400 |
30374 |
++++ linux-2.6.38.4/fs/compat.c 2011-04-23 14:05:14.000000000 -0400 |
30375 |
@@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int |
30376 |
goto out; |
30377 |
|
30378 |
@@ -31211,15 +30076,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.38.3/fs/compat.c |
30379 |
|
30380 |
error = vfs_readdir(file, compat_filldir64, &buf); |
30381 |
if (error >= 0) |
30382 |
-@@ -1423,6 +1441,7 @@ static int compat_copy_strings(int argc, |
30383 |
- |
30384 |
- page = get_arg_page(bprm, pos, 1); |
30385 |
- if (!page) { |
30386 |
-+ /* We've exceed the stack rlimit. */ |
30387 |
- ret = -E2BIG; |
30388 |
- goto out; |
30389 |
- } |
30390 |
-@@ -1464,6 +1483,11 @@ int compat_do_execve(char * filename, |
30391 |
+@@ -1464,6 +1482,11 @@ int compat_do_execve(char * filename, |
30392 |
compat_uptr_t __user *envp, |
30393 |
struct pt_regs * regs) |
30394 |
{ |
30395 |
@@ -31231,7 +30088,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.38.3/fs/compat.c |
30396 |
struct linux_binprm *bprm; |
30397 |
struct file *file; |
30398 |
struct files_struct *displaced; |
30399 |
-@@ -1500,6 +1524,19 @@ int compat_do_execve(char * filename, |
30400 |
+@@ -1500,6 +1523,19 @@ int compat_do_execve(char * filename, |
30401 |
bprm->filename = filename; |
30402 |
bprm->interp = filename; |
30403 |
|
30404 |
@@ -31251,7 +30108,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.38.3/fs/compat.c |
30405 |
retval = bprm_mm_init(bprm); |
30406 |
if (retval) |
30407 |
goto out_file; |
30408 |
-@@ -1529,9 +1566,40 @@ int compat_do_execve(char * filename, |
30409 |
+@@ -1529,9 +1565,40 @@ int compat_do_execve(char * filename, |
30410 |
if (retval < 0) |
30411 |
goto out; |
30412 |
|
30413 |
@@ -31293,7 +30150,7 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.38.3/fs/compat.c |
30414 |
|
30415 |
/* execve succeeded */ |
30416 |
current->fs->in_exec = 0; |
30417 |
-@@ -1542,6 +1610,14 @@ int compat_do_execve(char * filename, |
30418 |
+@@ -1542,6 +1609,14 @@ int compat_do_execve(char * filename, |
30419 |
put_files_struct(displaced); |
30420 |
return retval; |
30421 |
|
30422 |
@@ -31308,9 +30165,9 @@ diff -urNp linux-2.6.38.3/fs/compat.c linux-2.6.38.3/fs/compat.c |
30423 |
out: |
30424 |
if (bprm->mm) { |
30425 |
acct_arg_size(bprm, 0); |
30426 |
-diff -urNp linux-2.6.38.3/fs/compat_ioctl.c linux-2.6.38.3/fs/compat_ioctl.c |
30427 |
---- linux-2.6.38.3/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
30428 |
-+++ linux-2.6.38.3/fs/compat_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
30429 |
+diff -urNp linux-2.6.38.4/fs/compat_ioctl.c linux-2.6.38.4/fs/compat_ioctl.c |
30430 |
+--- linux-2.6.38.4/fs/compat_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
30431 |
++++ linux-2.6.38.4/fs/compat_ioctl.c 2011-04-17 15:57:32.000000000 -0400 |
30432 |
@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi |
30433 |
|
30434 |
err = get_user(palp, &up->palette); |
30435 |
@@ -31331,9 +30188,9 @@ diff -urNp linux-2.6.38.3/fs/compat_ioctl.c linux-2.6.38.3/fs/compat_ioctl.c |
30436 |
if (a > b) |
30437 |
return 1; |
30438 |
if (a < b) |
30439 |
-diff -urNp linux-2.6.38.3/fs/dcache.c linux-2.6.38.3/fs/dcache.c |
30440 |
---- linux-2.6.38.3/fs/dcache.c 2011-04-18 17:27:16.000000000 -0400 |
30441 |
-+++ linux-2.6.38.3/fs/dcache.c 2011-04-17 15:57:32.000000000 -0400 |
30442 |
+diff -urNp linux-2.6.38.4/fs/dcache.c linux-2.6.38.4/fs/dcache.c |
30443 |
+--- linux-2.6.38.4/fs/dcache.c 2011-04-18 17:27:16.000000000 -0400 |
30444 |
++++ linux-2.6.38.4/fs/dcache.c 2011-04-17 15:57:32.000000000 -0400 |
30445 |
@@ -3092,7 +3092,7 @@ void __init vfs_caches_init(unsigned lon |
30446 |
mempages -= reserve; |
30447 |
|
30448 |
@@ -31343,21 +30200,9 @@ diff -urNp linux-2.6.38.3/fs/dcache.c linux-2.6.38.3/fs/dcache.c |
30449 |
|
30450 |
dcache_init(); |
30451 |
inode_init(); |
30452 |
-diff -urNp linux-2.6.38.3/fs/debugfs/inode.c linux-2.6.38.3/fs/debugfs/inode.c |
30453 |
---- linux-2.6.38.3/fs/debugfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30454 |
-+++ linux-2.6.38.3/fs/debugfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30455 |
-@@ -130,7 +130,7 @@ static inline int debugfs_positive(struc |
30456 |
- |
30457 |
- static int debug_fill_super(struct super_block *sb, void *data, int silent) |
30458 |
- { |
30459 |
-- static struct tree_descr debug_files[] = {{""}}; |
30460 |
-+ static struct tree_descr debug_files[] = {{"", NULL, 0}}; |
30461 |
- |
30462 |
- return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); |
30463 |
- } |
30464 |
-diff -urNp linux-2.6.38.3/fs/dlm/lockspace.c linux-2.6.38.3/fs/dlm/lockspace.c |
30465 |
---- linux-2.6.38.3/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -0400 |
30466 |
-+++ linux-2.6.38.3/fs/dlm/lockspace.c 2011-04-17 15:57:32.000000000 -0400 |
30467 |
+diff -urNp linux-2.6.38.4/fs/dlm/lockspace.c linux-2.6.38.4/fs/dlm/lockspace.c |
30468 |
+--- linux-2.6.38.4/fs/dlm/lockspace.c 2011-03-14 21:20:32.000000000 -0400 |
30469 |
++++ linux-2.6.38.4/fs/dlm/lockspace.c 2011-04-17 15:57:32.000000000 -0400 |
30470 |
@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset, |
30471 |
return 0; |
30472 |
} |
30473 |
@@ -31367,9 +30212,9 @@ diff -urNp linux-2.6.38.3/fs/dlm/lockspace.c linux-2.6.38.3/fs/dlm/lockspace.c |
30474 |
.uevent = dlm_uevent, |
30475 |
}; |
30476 |
|
30477 |
-diff -urNp linux-2.6.38.3/fs/ecryptfs/inode.c linux-2.6.38.3/fs/ecryptfs/inode.c |
30478 |
---- linux-2.6.38.3/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30479 |
-+++ linux-2.6.38.3/fs/ecryptfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30480 |
+diff -urNp linux-2.6.38.4/fs/ecryptfs/inode.c linux-2.6.38.4/fs/ecryptfs/inode.c |
30481 |
+--- linux-2.6.38.4/fs/ecryptfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30482 |
++++ linux-2.6.38.4/fs/ecryptfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30483 |
@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc |
30484 |
old_fs = get_fs(); |
30485 |
set_fs(get_ds()); |
30486 |
@@ -31397,9 +30242,9 @@ diff -urNp linux-2.6.38.3/fs/ecryptfs/inode.c linux-2.6.38.3/fs/ecryptfs/inode.c |
30487 |
if (!IS_ERR(buf)) { |
30488 |
/* Free the char* */ |
30489 |
kfree(buf); |
30490 |
-diff -urNp linux-2.6.38.3/fs/ecryptfs/miscdev.c linux-2.6.38.3/fs/ecryptfs/miscdev.c |
30491 |
---- linux-2.6.38.3/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -0400 |
30492 |
-+++ linux-2.6.38.3/fs/ecryptfs/miscdev.c 2011-04-17 15:57:32.000000000 -0400 |
30493 |
+diff -urNp linux-2.6.38.4/fs/ecryptfs/miscdev.c linux-2.6.38.4/fs/ecryptfs/miscdev.c |
30494 |
+--- linux-2.6.38.4/fs/ecryptfs/miscdev.c 2011-03-14 21:20:32.000000000 -0400 |
30495 |
++++ linux-2.6.38.4/fs/ecryptfs/miscdev.c 2011-04-17 15:57:32.000000000 -0400 |
30496 |
@@ -328,7 +328,7 @@ check_list: |
30497 |
goto out_unlock_msg_ctx; |
30498 |
i = 5; |
30499 |
@@ -31409,9 +30254,9 @@ diff -urNp linux-2.6.38.3/fs/ecryptfs/miscdev.c linux-2.6.38.3/fs/ecryptfs/miscd |
30500 |
goto out_unlock_msg_ctx; |
30501 |
i += packet_length_size; |
30502 |
if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) |
30503 |
-diff -urNp linux-2.6.38.3/fs/exec.c linux-2.6.38.3/fs/exec.c |
30504 |
---- linux-2.6.38.3/fs/exec.c 2011-03-14 21:20:32.000000000 -0400 |
30505 |
-+++ linux-2.6.38.3/fs/exec.c 2011-04-17 15:57:32.000000000 -0400 |
30506 |
+diff -urNp linux-2.6.38.4/fs/exec.c linux-2.6.38.4/fs/exec.c |
30507 |
+--- linux-2.6.38.4/fs/exec.c 2011-03-14 21:20:32.000000000 -0400 |
30508 |
++++ linux-2.6.38.4/fs/exec.c 2011-04-17 15:57:32.000000000 -0400 |
30509 |
@@ -55,12 +55,24 @@ |
30510 |
#include <linux/fs_struct.h> |
30511 |
#include <linux/pipe_fs_i.h> |
30512 |
@@ -31948,9 +30793,9 @@ diff -urNp linux-2.6.38.3/fs/exec.c linux-2.6.38.3/fs/exec.c |
30513 |
if (ispipe) { |
30514 |
int dump_count; |
30515 |
char **helper_argv; |
30516 |
-diff -urNp linux-2.6.38.3/fs/ext2/balloc.c linux-2.6.38.3/fs/ext2/balloc.c |
30517 |
---- linux-2.6.38.3/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400 |
30518 |
-+++ linux-2.6.38.3/fs/ext2/balloc.c 2011-04-17 15:57:32.000000000 -0400 |
30519 |
+diff -urNp linux-2.6.38.4/fs/ext2/balloc.c linux-2.6.38.4/fs/ext2/balloc.c |
30520 |
+--- linux-2.6.38.4/fs/ext2/balloc.c 2011-03-14 21:20:32.000000000 -0400 |
30521 |
++++ linux-2.6.38.4/fs/ext2/balloc.c 2011-04-17 15:57:32.000000000 -0400 |
30522 |
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e |
30523 |
|
30524 |
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
30525 |
@@ -31960,23 +30805,9 @@ diff -urNp linux-2.6.38.3/fs/ext2/balloc.c linux-2.6.38.3/fs/ext2/balloc.c |
30526 |
sbi->s_resuid != current_fsuid() && |
30527 |
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
30528 |
return 0; |
30529 |
-diff -urNp linux-2.6.38.3/fs/ext2/xattr.c linux-2.6.38.3/fs/ext2/xattr.c |
30530 |
---- linux-2.6.38.3/fs/ext2/xattr.c 2011-03-14 21:20:32.000000000 -0400 |
30531 |
-+++ linux-2.6.38.3/fs/ext2/xattr.c 2011-04-17 15:57:32.000000000 -0400 |
30532 |
-@@ -86,8 +86,8 @@ |
30533 |
- printk("\n"); \ |
30534 |
- } while (0) |
30535 |
- #else |
30536 |
--# define ea_idebug(f...) |
30537 |
--# define ea_bdebug(f...) |
30538 |
-+# define ea_idebug(inode, f...) do {} while (0) |
30539 |
-+# define ea_bdebug(bh, f...) do {} while (0) |
30540 |
- #endif |
30541 |
- |
30542 |
- static int ext2_xattr_set2(struct inode *, struct buffer_head *, |
30543 |
-diff -urNp linux-2.6.38.3/fs/ext3/balloc.c linux-2.6.38.3/fs/ext3/balloc.c |
30544 |
---- linux-2.6.38.3/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400 |
30545 |
-+++ linux-2.6.38.3/fs/ext3/balloc.c 2011-04-17 15:57:32.000000000 -0400 |
30546 |
+diff -urNp linux-2.6.38.4/fs/ext3/balloc.c linux-2.6.38.4/fs/ext3/balloc.c |
30547 |
+--- linux-2.6.38.4/fs/ext3/balloc.c 2011-03-14 21:20:32.000000000 -0400 |
30548 |
++++ linux-2.6.38.4/fs/ext3/balloc.c 2011-04-17 15:57:32.000000000 -0400 |
30549 |
@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e |
30550 |
|
30551 |
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); |
30552 |
@@ -31986,35 +30817,9 @@ diff -urNp linux-2.6.38.3/fs/ext3/balloc.c linux-2.6.38.3/fs/ext3/balloc.c |
30553 |
sbi->s_resuid != current_fsuid() && |
30554 |
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { |
30555 |
return 0; |
30556 |
-diff -urNp linux-2.6.38.3/fs/ext3/namei.c linux-2.6.38.3/fs/ext3/namei.c |
30557 |
---- linux-2.6.38.3/fs/ext3/namei.c 2011-04-18 17:27:14.000000000 -0400 |
30558 |
-+++ linux-2.6.38.3/fs/ext3/namei.c 2011-04-17 15:57:32.000000000 -0400 |
30559 |
-@@ -1159,7 +1159,7 @@ static struct ext3_dir_entry_2 *do_split |
30560 |
- char *data1 = (*bh)->b_data, *data2; |
30561 |
- unsigned split, move, size; |
30562 |
- struct ext3_dir_entry_2 *de = NULL, *de2; |
30563 |
-- int err = 0, i; |
30564 |
-+ int i, err = 0; |
30565 |
- |
30566 |
- bh2 = ext3_append (handle, dir, &newblock, &err); |
30567 |
- if (!(bh2)) { |
30568 |
-diff -urNp linux-2.6.38.3/fs/ext3/xattr.c linux-2.6.38.3/fs/ext3/xattr.c |
30569 |
---- linux-2.6.38.3/fs/ext3/xattr.c 2011-03-14 21:20:32.000000000 -0400 |
30570 |
-+++ linux-2.6.38.3/fs/ext3/xattr.c 2011-04-17 15:57:32.000000000 -0400 |
30571 |
-@@ -89,8 +89,8 @@ |
30572 |
- printk("\n"); \ |
30573 |
- } while (0) |
30574 |
- #else |
30575 |
--# define ea_idebug(f...) |
30576 |
--# define ea_bdebug(f...) |
30577 |
-+# define ea_idebug(f...) do {} while (0) |
30578 |
-+# define ea_bdebug(f...) do {} while (0) |
30579 |
- #endif |
30580 |
- |
30581 |
- static void ext3_xattr_cache_insert(struct buffer_head *); |
30582 |
-diff -urNp linux-2.6.38.3/fs/ext4/balloc.c linux-2.6.38.3/fs/ext4/balloc.c |
30583 |
---- linux-2.6.38.3/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400 |
30584 |
-+++ linux-2.6.38.3/fs/ext4/balloc.c 2011-04-17 15:57:32.000000000 -0400 |
30585 |
+diff -urNp linux-2.6.38.4/fs/ext4/balloc.c linux-2.6.38.4/fs/ext4/balloc.c |
30586 |
+--- linux-2.6.38.4/fs/ext4/balloc.c 2011-03-14 21:20:32.000000000 -0400 |
30587 |
++++ linux-2.6.38.4/fs/ext4/balloc.c 2011-04-17 15:57:32.000000000 -0400 |
30588 |
@@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e |
30589 |
/* Hm, nope. Are (enough) root reserved blocks available? */ |
30590 |
if (sbi->s_resuid == current_fsuid() || |
30591 |
@@ -32024,9 +30829,9 @@ diff -urNp linux-2.6.38.3/fs/ext4/balloc.c linux-2.6.38.3/fs/ext4/balloc.c |
30592 |
if (free_blocks >= (nblocks + dirty_blocks)) |
30593 |
return 1; |
30594 |
} |
30595 |
-diff -urNp linux-2.6.38.3/fs/ext4/ext4.h linux-2.6.38.3/fs/ext4/ext4.h |
30596 |
---- linux-2.6.38.3/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400 |
30597 |
-+++ linux-2.6.38.3/fs/ext4/ext4.h 2011-04-17 15:57:32.000000000 -0400 |
30598 |
+diff -urNp linux-2.6.38.4/fs/ext4/ext4.h linux-2.6.38.4/fs/ext4/ext4.h |
30599 |
+--- linux-2.6.38.4/fs/ext4/ext4.h 2011-03-14 21:20:32.000000000 -0400 |
30600 |
++++ linux-2.6.38.4/fs/ext4/ext4.h 2011-04-17 15:57:32.000000000 -0400 |
30601 |
@@ -1166,19 +1166,19 @@ struct ext4_sb_info { |
30602 |
unsigned long s_mb_last_start; |
30603 |
|
30604 |
@@ -32057,9 +30862,9 @@ diff -urNp linux-2.6.38.3/fs/ext4/ext4.h linux-2.6.38.3/fs/ext4/ext4.h |
30605 |
atomic_t s_lock_busy; |
30606 |
|
30607 |
/* locality groups */ |
30608 |
-diff -urNp linux-2.6.38.3/fs/ext4/mballoc.c linux-2.6.38.3/fs/ext4/mballoc.c |
30609 |
---- linux-2.6.38.3/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400 |
30610 |
-+++ linux-2.6.38.3/fs/ext4/mballoc.c 2011-04-17 15:57:32.000000000 -0400 |
30611 |
+diff -urNp linux-2.6.38.4/fs/ext4/mballoc.c linux-2.6.38.4/fs/ext4/mballoc.c |
30612 |
+--- linux-2.6.38.4/fs/ext4/mballoc.c 2011-03-14 21:20:32.000000000 -0400 |
30613 |
++++ linux-2.6.38.4/fs/ext4/mballoc.c 2011-04-17 15:57:32.000000000 -0400 |
30614 |
@@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex |
30615 |
BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len); |
30616 |
|
30617 |
@@ -32173,35 +30978,9 @@ diff -urNp linux-2.6.38.3/fs/ext4/mballoc.c linux-2.6.38.3/fs/ext4/mballoc.c |
30618 |
trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len); |
30619 |
|
30620 |
return 0; |
30621 |
-diff -urNp linux-2.6.38.3/fs/ext4/namei.c linux-2.6.38.3/fs/ext4/namei.c |
30622 |
---- linux-2.6.38.3/fs/ext4/namei.c 2011-03-14 21:20:32.000000000 -0400 |
30623 |
-+++ linux-2.6.38.3/fs/ext4/namei.c 2011-04-17 15:57:32.000000000 -0400 |
30624 |
-@@ -1161,7 +1161,7 @@ static struct ext4_dir_entry_2 *do_split |
30625 |
- char *data1 = (*bh)->b_data, *data2; |
30626 |
- unsigned split, move, size; |
30627 |
- struct ext4_dir_entry_2 *de = NULL, *de2; |
30628 |
-- int err = 0, i; |
30629 |
-+ int i, err = 0; |
30630 |
- |
30631 |
- bh2 = ext4_append (handle, dir, &newblock, &err); |
30632 |
- if (!(bh2)) { |
30633 |
-diff -urNp linux-2.6.38.3/fs/ext4/xattr.c linux-2.6.38.3/fs/ext4/xattr.c |
30634 |
---- linux-2.6.38.3/fs/ext4/xattr.c 2011-03-14 21:20:32.000000000 -0400 |
30635 |
-+++ linux-2.6.38.3/fs/ext4/xattr.c 2011-04-17 15:57:32.000000000 -0400 |
30636 |
-@@ -82,8 +82,8 @@ |
30637 |
- printk("\n"); \ |
30638 |
- } while (0) |
30639 |
- #else |
30640 |
--# define ea_idebug(f...) |
30641 |
--# define ea_bdebug(f...) |
30642 |
-+# define ea_idebug(inode, f...) do {} while (0) |
30643 |
-+# define ea_bdebug(bh, f...) do {} while (0) |
30644 |
- #endif |
30645 |
- |
30646 |
- static void ext4_xattr_cache_insert(struct buffer_head *); |
30647 |
-diff -urNp linux-2.6.38.3/fs/fcntl.c linux-2.6.38.3/fs/fcntl.c |
30648 |
---- linux-2.6.38.3/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400 |
30649 |
-+++ linux-2.6.38.3/fs/fcntl.c 2011-04-17 15:57:32.000000000 -0400 |
30650 |
+diff -urNp linux-2.6.38.4/fs/fcntl.c linux-2.6.38.4/fs/fcntl.c |
30651 |
+--- linux-2.6.38.4/fs/fcntl.c 2011-03-14 21:20:32.000000000 -0400 |
30652 |
++++ linux-2.6.38.4/fs/fcntl.c 2011-04-17 15:57:32.000000000 -0400 |
30653 |
@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct |
30654 |
if (err) |
30655 |
return err; |
30656 |
@@ -32239,9 +31018,9 @@ diff -urNp linux-2.6.38.3/fs/fcntl.c linux-2.6.38.3/fs/fcntl.c |
30657 |
)); |
30658 |
|
30659 |
fasync_cache = kmem_cache_create("fasync_cache", |
30660 |
-diff -urNp linux-2.6.38.3/fs/fifo.c linux-2.6.38.3/fs/fifo.c |
30661 |
---- linux-2.6.38.3/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400 |
30662 |
-+++ linux-2.6.38.3/fs/fifo.c 2011-04-17 15:57:32.000000000 -0400 |
30663 |
+diff -urNp linux-2.6.38.4/fs/fifo.c linux-2.6.38.4/fs/fifo.c |
30664 |
+--- linux-2.6.38.4/fs/fifo.c 2011-03-14 21:20:32.000000000 -0400 |
30665 |
++++ linux-2.6.38.4/fs/fifo.c 2011-04-17 15:57:32.000000000 -0400 |
30666 |
@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode |
30667 |
*/ |
30668 |
filp->f_op = &read_pipefifo_fops; |
30669 |
@@ -32312,9 +31091,9 @@ diff -urNp linux-2.6.38.3/fs/fifo.c linux-2.6.38.3/fs/fifo.c |
30670 |
free_pipe_info(inode); |
30671 |
|
30672 |
err_nocleanup: |
30673 |
-diff -urNp linux-2.6.38.3/fs/file.c linux-2.6.38.3/fs/file.c |
30674 |
---- linux-2.6.38.3/fs/file.c 2011-03-14 21:20:32.000000000 -0400 |
30675 |
-+++ linux-2.6.38.3/fs/file.c 2011-04-17 15:57:32.000000000 -0400 |
30676 |
+diff -urNp linux-2.6.38.4/fs/file.c linux-2.6.38.4/fs/file.c |
30677 |
+--- linux-2.6.38.4/fs/file.c 2011-03-14 21:20:32.000000000 -0400 |
30678 |
++++ linux-2.6.38.4/fs/file.c 2011-04-17 15:57:32.000000000 -0400 |
30679 |
@@ -14,6 +14,7 @@ |
30680 |
#include <linux/slab.h> |
30681 |
#include <linux/vmalloc.h> |
30682 |
@@ -32331,9 +31110,9 @@ diff -urNp linux-2.6.38.3/fs/file.c linux-2.6.38.3/fs/file.c |
30683 |
if (nr >= rlimit(RLIMIT_NOFILE)) |
30684 |
return -EMFILE; |
30685 |
|
30686 |
-diff -urNp linux-2.6.38.3/fs/filesystems.c linux-2.6.38.3/fs/filesystems.c |
30687 |
---- linux-2.6.38.3/fs/filesystems.c 2011-03-14 21:20:32.000000000 -0400 |
30688 |
-+++ linux-2.6.38.3/fs/filesystems.c 2011-04-17 15:57:32.000000000 -0400 |
30689 |
+diff -urNp linux-2.6.38.4/fs/filesystems.c linux-2.6.38.4/fs/filesystems.c |
30690 |
+--- linux-2.6.38.4/fs/filesystems.c 2011-03-14 21:20:32.000000000 -0400 |
30691 |
++++ linux-2.6.38.4/fs/filesystems.c 2011-04-17 15:57:32.000000000 -0400 |
30692 |
@@ -275,7 +275,12 @@ struct file_system_type *get_fs_type(con |
30693 |
int len = dot ? dot - name : strlen(name); |
30694 |
|
30695 |
@@ -32347,9 +31126,9 @@ diff -urNp linux-2.6.38.3/fs/filesystems.c linux-2.6.38.3/fs/filesystems.c |
30696 |
fs = __get_fs_type(name, len); |
30697 |
|
30698 |
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { |
30699 |
-diff -urNp linux-2.6.38.3/fs/fs_struct.c linux-2.6.38.3/fs/fs_struct.c |
30700 |
---- linux-2.6.38.3/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400 |
30701 |
-+++ linux-2.6.38.3/fs/fs_struct.c 2011-04-17 15:57:32.000000000 -0400 |
30702 |
+diff -urNp linux-2.6.38.4/fs/fs_struct.c linux-2.6.38.4/fs/fs_struct.c |
30703 |
+--- linux-2.6.38.4/fs/fs_struct.c 2011-03-14 21:20:32.000000000 -0400 |
30704 |
++++ linux-2.6.38.4/fs/fs_struct.c 2011-04-17 15:57:32.000000000 -0400 |
30705 |
@@ -4,6 +4,7 @@ |
30706 |
#include <linux/path.h> |
30707 |
#include <linux/slab.h> |
30708 |
@@ -32439,21 +31218,9 @@ diff -urNp linux-2.6.38.3/fs/fs_struct.c linux-2.6.38.3/fs/fs_struct.c |
30709 |
spin_unlock(&fs->lock); |
30710 |
|
30711 |
task_unlock(current); |
30712 |
-diff -urNp linux-2.6.38.3/fs/fuse/control.c linux-2.6.38.3/fs/fuse/control.c |
30713 |
---- linux-2.6.38.3/fs/fuse/control.c 2011-03-14 21:20:32.000000000 -0400 |
30714 |
-+++ linux-2.6.38.3/fs/fuse/control.c 2011-04-17 15:57:32.000000000 -0400 |
30715 |
-@@ -298,7 +298,7 @@ void fuse_ctl_remove_conn(struct fuse_co |
30716 |
- |
30717 |
- static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) |
30718 |
- { |
30719 |
-- struct tree_descr empty_descr = {""}; |
30720 |
-+ struct tree_descr empty_descr = {"", NULL, 0}; |
30721 |
- struct fuse_conn *fc; |
30722 |
- int err; |
30723 |
- |
30724 |
-diff -urNp linux-2.6.38.3/fs/fuse/cuse.c linux-2.6.38.3/fs/fuse/cuse.c |
30725 |
---- linux-2.6.38.3/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400 |
30726 |
-+++ linux-2.6.38.3/fs/fuse/cuse.c 2011-04-17 15:57:32.000000000 -0400 |
30727 |
+diff -urNp linux-2.6.38.4/fs/fuse/cuse.c linux-2.6.38.4/fs/fuse/cuse.c |
30728 |
+--- linux-2.6.38.4/fs/fuse/cuse.c 2011-03-14 21:20:32.000000000 -0400 |
30729 |
++++ linux-2.6.38.4/fs/fuse/cuse.c 2011-04-17 15:57:32.000000000 -0400 |
30730 |
@@ -530,8 +530,18 @@ static int cuse_channel_release(struct i |
30731 |
return rc; |
30732 |
} |
30733 |
@@ -32488,9 +31255,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/cuse.c linux-2.6.38.3/fs/fuse/cuse.c |
30734 |
cuse_class = class_create(THIS_MODULE, "cuse"); |
30735 |
if (IS_ERR(cuse_class)) |
30736 |
return PTR_ERR(cuse_class); |
30737 |
-diff -urNp linux-2.6.38.3/fs/fuse/dev.c linux-2.6.38.3/fs/fuse/dev.c |
30738 |
---- linux-2.6.38.3/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400 |
30739 |
-+++ linux-2.6.38.3/fs/fuse/dev.c 2011-04-17 15:57:32.000000000 -0400 |
30740 |
+diff -urNp linux-2.6.38.4/fs/fuse/dev.c linux-2.6.38.4/fs/fuse/dev.c |
30741 |
+--- linux-2.6.38.4/fs/fuse/dev.c 2011-03-14 21:20:32.000000000 -0400 |
30742 |
++++ linux-2.6.38.4/fs/fuse/dev.c 2011-04-17 15:57:32.000000000 -0400 |
30743 |
@@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct f |
30744 |
return err; |
30745 |
} |
30746 |
@@ -32572,9 +31339,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/dev.c linux-2.6.38.3/fs/fuse/dev.c |
30747 |
const struct file_operations fuse_dev_operations = { |
30748 |
.owner = THIS_MODULE, |
30749 |
.llseek = no_llseek, |
30750 |
-diff -urNp linux-2.6.38.3/fs/fuse/dir.c linux-2.6.38.3/fs/fuse/dir.c |
30751 |
---- linux-2.6.38.3/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400 |
30752 |
-+++ linux-2.6.38.3/fs/fuse/dir.c 2011-04-17 15:57:32.000000000 -0400 |
30753 |
+diff -urNp linux-2.6.38.4/fs/fuse/dir.c linux-2.6.38.4/fs/fuse/dir.c |
30754 |
+--- linux-2.6.38.4/fs/fuse/dir.c 2011-03-14 21:20:32.000000000 -0400 |
30755 |
++++ linux-2.6.38.4/fs/fuse/dir.c 2011-04-17 15:57:32.000000000 -0400 |
30756 |
@@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *de |
30757 |
return link; |
30758 |
} |
30759 |
@@ -32584,9 +31351,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/dir.c linux-2.6.38.3/fs/fuse/dir.c |
30760 |
{ |
30761 |
if (!IS_ERR(link)) |
30762 |
free_page((unsigned long) link); |
30763 |
-diff -urNp linux-2.6.38.3/fs/fuse/fuse_i.h linux-2.6.38.3/fs/fuse/fuse_i.h |
30764 |
---- linux-2.6.38.3/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400 |
30765 |
-+++ linux-2.6.38.3/fs/fuse/fuse_i.h 2011-04-17 15:57:32.000000000 -0400 |
30766 |
+diff -urNp linux-2.6.38.4/fs/fuse/fuse_i.h linux-2.6.38.4/fs/fuse/fuse_i.h |
30767 |
+--- linux-2.6.38.4/fs/fuse/fuse_i.h 2011-03-14 21:20:32.000000000 -0400 |
30768 |
++++ linux-2.6.38.4/fs/fuse/fuse_i.h 2011-04-17 15:57:32.000000000 -0400 |
30769 |
@@ -541,6 +541,16 @@ extern const struct file_operations fuse |
30770 |
|
30771 |
extern const struct dentry_operations fuse_dentry_operations; |
30772 |
@@ -32604,69 +31371,9 @@ diff -urNp linux-2.6.38.3/fs/fuse/fuse_i.h linux-2.6.38.3/fs/fuse/fuse_i.h |
30773 |
/** |
30774 |
* Inode to nodeid comparison. |
30775 |
*/ |
30776 |
-diff -urNp linux-2.6.38.3/fs/hfs/inode.c linux-2.6.38.3/fs/hfs/inode.c |
30777 |
---- linux-2.6.38.3/fs/hfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30778 |
-+++ linux-2.6.38.3/fs/hfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30779 |
-@@ -447,7 +447,7 @@ int hfs_write_inode(struct inode *inode, |
30780 |
- |
30781 |
- if (S_ISDIR(main_inode->i_mode)) { |
30782 |
- if (fd.entrylength < sizeof(struct hfs_cat_dir)) |
30783 |
-- /* panic? */; |
30784 |
-+ {/* panic? */} |
30785 |
- hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, |
30786 |
- sizeof(struct hfs_cat_dir)); |
30787 |
- if (rec.type != HFS_CDR_DIR || |
30788 |
-@@ -468,7 +468,7 @@ int hfs_write_inode(struct inode *inode, |
30789 |
- sizeof(struct hfs_cat_file)); |
30790 |
- } else { |
30791 |
- if (fd.entrylength < sizeof(struct hfs_cat_file)) |
30792 |
-- /* panic? */; |
30793 |
-+ {/* panic? */} |
30794 |
- hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, |
30795 |
- sizeof(struct hfs_cat_file)); |
30796 |
- if (rec.type != HFS_CDR_FIL || |
30797 |
-diff -urNp linux-2.6.38.3/fs/hfsplus/inode.c linux-2.6.38.3/fs/hfsplus/inode.c |
30798 |
---- linux-2.6.38.3/fs/hfsplus/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30799 |
-+++ linux-2.6.38.3/fs/hfsplus/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30800 |
-@@ -498,7 +498,7 @@ int hfsplus_cat_read_inode(struct inode |
30801 |
- struct hfsplus_cat_folder *folder = &entry.folder; |
30802 |
- |
30803 |
- if (fd->entrylength < sizeof(struct hfsplus_cat_folder)) |
30804 |
-- /* panic? */; |
30805 |
-+ {/* panic? */} |
30806 |
- hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, |
30807 |
- sizeof(struct hfsplus_cat_folder)); |
30808 |
- hfsplus_get_perms(inode, &folder->permissions, 1); |
30809 |
-@@ -515,7 +515,7 @@ int hfsplus_cat_read_inode(struct inode |
30810 |
- struct hfsplus_cat_file *file = &entry.file; |
30811 |
- |
30812 |
- if (fd->entrylength < sizeof(struct hfsplus_cat_file)) |
30813 |
-- /* panic? */; |
30814 |
-+ {/* panic? */} |
30815 |
- hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, |
30816 |
- sizeof(struct hfsplus_cat_file)); |
30817 |
- |
30818 |
-@@ -572,7 +572,7 @@ int hfsplus_cat_write_inode(struct inode |
30819 |
- struct hfsplus_cat_folder *folder = &entry.folder; |
30820 |
- |
30821 |
- if (fd.entrylength < sizeof(struct hfsplus_cat_folder)) |
30822 |
-- /* panic? */; |
30823 |
-+ {/* panic? */} |
30824 |
- hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, |
30825 |
- sizeof(struct hfsplus_cat_folder)); |
30826 |
- /* simple node checks? */ |
30827 |
-@@ -594,7 +594,7 @@ int hfsplus_cat_write_inode(struct inode |
30828 |
- struct hfsplus_cat_file *file = &entry.file; |
30829 |
- |
30830 |
- if (fd.entrylength < sizeof(struct hfsplus_cat_file)) |
30831 |
-- /* panic? */; |
30832 |
-+ {/* panic? */} |
30833 |
- hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, |
30834 |
- sizeof(struct hfsplus_cat_file)); |
30835 |
- hfsplus_inode_write_fork(inode, &file->data_fork); |
30836 |
-diff -urNp linux-2.6.38.3/fs/hugetlbfs/inode.c linux-2.6.38.3/fs/hugetlbfs/inode.c |
30837 |
---- linux-2.6.38.3/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30838 |
-+++ linux-2.6.38.3/fs/hugetlbfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30839 |
+diff -urNp linux-2.6.38.4/fs/hugetlbfs/inode.c linux-2.6.38.4/fs/hugetlbfs/inode.c |
30840 |
+--- linux-2.6.38.4/fs/hugetlbfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30841 |
++++ linux-2.6.38.4/fs/hugetlbfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
30842 |
@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs |
30843 |
.kill_sb = kill_litter_super, |
30844 |
}; |
30845 |
@@ -32676,113 +31383,23 @@ diff -urNp linux-2.6.38.3/fs/hugetlbfs/inode.c linux-2.6.38.3/fs/hugetlbfs/inode |
30846 |
|
30847 |
static int can_do_hugetlb_shm(void) |
30848 |
{ |
30849 |
-diff -urNp linux-2.6.38.3/fs/jffs2/debug.h linux-2.6.38.3/fs/jffs2/debug.h |
30850 |
---- linux-2.6.38.3/fs/jffs2/debug.h 2011-03-14 21:20:32.000000000 -0400 |
30851 |
-+++ linux-2.6.38.3/fs/jffs2/debug.h 2011-04-17 15:57:32.000000000 -0400 |
30852 |
-@@ -53,13 +53,13 @@ |
30853 |
- #if CONFIG_JFFS2_FS_DEBUG > 0 |
30854 |
- #define D1(x) x |
30855 |
- #else |
30856 |
--#define D1(x) |
30857 |
-+#define D1(x) do {} while (0); |
30858 |
- #endif |
30859 |
- |
30860 |
- #if CONFIG_JFFS2_FS_DEBUG > 1 |
30861 |
- #define D2(x) x |
30862 |
- #else |
30863 |
--#define D2(x) |
30864 |
-+#define D2(x) do {} while (0); |
30865 |
- #endif |
30866 |
- |
30867 |
- /* The prefixes of JFFS2 messages */ |
30868 |
-@@ -115,73 +115,73 @@ |
30869 |
- #ifdef JFFS2_DBG_READINODE_MESSAGES |
30870 |
- #define dbg_readinode(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30871 |
- #else |
30872 |
--#define dbg_readinode(fmt, ...) |
30873 |
-+#define dbg_readinode(fmt, ...) do {} while (0) |
30874 |
- #endif |
30875 |
- #ifdef JFFS2_DBG_READINODE2_MESSAGES |
30876 |
- #define dbg_readinode2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30877 |
- #else |
30878 |
--#define dbg_readinode2(fmt, ...) |
30879 |
-+#define dbg_readinode2(fmt, ...) do {} while (0) |
30880 |
- #endif |
30881 |
- |
30882 |
- /* Fragtree build debugging messages */ |
30883 |
- #ifdef JFFS2_DBG_FRAGTREE_MESSAGES |
30884 |
- #define dbg_fragtree(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30885 |
- #else |
30886 |
--#define dbg_fragtree(fmt, ...) |
30887 |
-+#define dbg_fragtree(fmt, ...) do {} while (0) |
30888 |
- #endif |
30889 |
- #ifdef JFFS2_DBG_FRAGTREE2_MESSAGES |
30890 |
- #define dbg_fragtree2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30891 |
- #else |
30892 |
--#define dbg_fragtree2(fmt, ...) |
30893 |
-+#define dbg_fragtree2(fmt, ...) do {} while (0) |
30894 |
- #endif |
30895 |
- |
30896 |
- /* Directory entry list manilulation debugging messages */ |
30897 |
- #ifdef JFFS2_DBG_DENTLIST_MESSAGES |
30898 |
- #define dbg_dentlist(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30899 |
- #else |
30900 |
--#define dbg_dentlist(fmt, ...) |
30901 |
-+#define dbg_dentlist(fmt, ...) do {} while (0) |
30902 |
- #endif |
30903 |
+diff -urNp linux-2.6.38.4/fs/inode.c linux-2.6.38.4/fs/inode.c |
30904 |
+--- linux-2.6.38.4/fs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
30905 |
++++ linux-2.6.38.4/fs/inode.c 2011-04-23 12:47:41.000000000 -0400 |
30906 |
+@@ -801,8 +801,8 @@ unsigned int get_next_ino(void) |
30907 |
|
30908 |
- /* Print the messages about manipulating node_refs */ |
30909 |
- #ifdef JFFS2_DBG_NODEREF_MESSAGES |
30910 |
- #define dbg_noderef(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30911 |
- #else |
30912 |
--#define dbg_noderef(fmt, ...) |
30913 |
-+#define dbg_noderef(fmt, ...) do {} while (0) |
30914 |
- #endif |
30915 |
- |
30916 |
- /* Manipulations with the list of inodes (JFFS2 inocache) */ |
30917 |
- #ifdef JFFS2_DBG_INOCACHE_MESSAGES |
30918 |
- #define dbg_inocache(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30919 |
- #else |
30920 |
--#define dbg_inocache(fmt, ...) |
30921 |
-+#define dbg_inocache(fmt, ...) do {} while (0) |
30922 |
- #endif |
30923 |
- |
30924 |
- /* Summary debugging messages */ |
30925 |
- #ifdef JFFS2_DBG_SUMMARY_MESSAGES |
30926 |
- #define dbg_summary(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30927 |
- #else |
30928 |
--#define dbg_summary(fmt, ...) |
30929 |
-+#define dbg_summary(fmt, ...) do {} while (0) |
30930 |
- #endif |
30931 |
- |
30932 |
- /* File system build messages */ |
30933 |
- #ifdef JFFS2_DBG_FSBUILD_MESSAGES |
30934 |
- #define dbg_fsbuild(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30935 |
- #else |
30936 |
--#define dbg_fsbuild(fmt, ...) |
30937 |
-+#define dbg_fsbuild(fmt, ...) do {} while (0) |
30938 |
- #endif |
30939 |
- |
30940 |
- /* Watch the object allocations */ |
30941 |
- #ifdef JFFS2_DBG_MEMALLOC_MESSAGES |
30942 |
- #define dbg_memalloc(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30943 |
- #else |
30944 |
--#define dbg_memalloc(fmt, ...) |
30945 |
-+#define dbg_memalloc(fmt, ...) do {} while (0) |
30946 |
- #endif |
30947 |
+ #ifdef CONFIG_SMP |
30948 |
+ if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { |
30949 |
+- static atomic_t shared_last_ino; |
30950 |
+- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino); |
30951 |
++ static atomic_unchecked_t shared_last_ino; |
30952 |
++ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino); |
30953 |
|
30954 |
- /* Watch the XATTR subsystem */ |
30955 |
- #ifdef JFFS2_DBG_XATTR_MESSAGES |
30956 |
- #define dbg_xattr(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__) |
30957 |
- #else |
30958 |
--#define dbg_xattr(fmt, ...) |
30959 |
-+#define dbg_xattr(fmt, ...) do {} while (0) |
30960 |
- #endif |
30961 |
- |
30962 |
- /* "Sanity" checks */ |
30963 |
-diff -urNp linux-2.6.38.3/fs/jffs2/erase.c linux-2.6.38.3/fs/jffs2/erase.c |
30964 |
---- linux-2.6.38.3/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400 |
30965 |
-+++ linux-2.6.38.3/fs/jffs2/erase.c 2011-04-17 15:57:32.000000000 -0400 |
30966 |
+ res = next - LAST_INO_BATCH; |
30967 |
+ } |
30968 |
+diff -urNp linux-2.6.38.4/fs/jffs2/erase.c linux-2.6.38.4/fs/jffs2/erase.c |
30969 |
+--- linux-2.6.38.4/fs/jffs2/erase.c 2011-03-14 21:20:32.000000000 -0400 |
30970 |
++++ linux-2.6.38.4/fs/jffs2/erase.c 2011-04-17 15:57:32.000000000 -0400 |
30971 |
@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru |
30972 |
struct jffs2_unknown_node marker = { |
30973 |
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), |
30974 |
@@ -32793,40 +31410,9 @@ diff -urNp linux-2.6.38.3/fs/jffs2/erase.c linux-2.6.38.3/fs/jffs2/erase.c |
30975 |
}; |
30976 |
|
30977 |
jffs2_prealloc_raw_node_refs(c, jeb, 1); |
30978 |
-diff -urNp linux-2.6.38.3/fs/jffs2/summary.h linux-2.6.38.3/fs/jffs2/summary.h |
30979 |
---- linux-2.6.38.3/fs/jffs2/summary.h 2011-03-14 21:20:32.000000000 -0400 |
30980 |
-+++ linux-2.6.38.3/fs/jffs2/summary.h 2011-04-17 15:57:32.000000000 -0400 |
30981 |
-@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ |
30982 |
- |
30983 |
- #define jffs2_sum_active() (0) |
30984 |
- #define jffs2_sum_init(a) (0) |
30985 |
--#define jffs2_sum_exit(a) |
30986 |
--#define jffs2_sum_disable_collecting(a) |
30987 |
-+#define jffs2_sum_exit(a) do {} while (0) |
30988 |
-+#define jffs2_sum_disable_collecting(a) do {} while (0) |
30989 |
- #define jffs2_sum_is_disabled(a) (0) |
30990 |
--#define jffs2_sum_reset_collected(a) |
30991 |
-+#define jffs2_sum_reset_collected(a) do {} while (0) |
30992 |
- #define jffs2_sum_add_kvec(a,b,c,d) (0) |
30993 |
--#define jffs2_sum_move_collected(a,b) |
30994 |
-+#define jffs2_sum_move_collected(a,b) do {} while (0) |
30995 |
- #define jffs2_sum_write_sumnode(a) (0) |
30996 |
--#define jffs2_sum_add_padding_mem(a,b) |
30997 |
--#define jffs2_sum_add_inode_mem(a,b,c) |
30998 |
--#define jffs2_sum_add_dirent_mem(a,b,c) |
30999 |
--#define jffs2_sum_add_xattr_mem(a,b,c) |
31000 |
--#define jffs2_sum_add_xref_mem(a,b,c) |
31001 |
-+#define jffs2_sum_add_padding_mem(a,b) do {} while (0) |
31002 |
-+#define jffs2_sum_add_inode_mem(a,b,c) do {} while (0) |
31003 |
-+#define jffs2_sum_add_dirent_mem(a,b,c) do {} while (0) |
31004 |
-+#define jffs2_sum_add_xattr_mem(a,b,c) do {} while (0) |
31005 |
-+#define jffs2_sum_add_xref_mem(a,b,c) do {} while (0) |
31006 |
- #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) |
31007 |
- |
31008 |
- #endif /* CONFIG_JFFS2_SUMMARY */ |
31009 |
-diff -urNp linux-2.6.38.3/fs/jffs2/wbuf.c linux-2.6.38.3/fs/jffs2/wbuf.c |
31010 |
---- linux-2.6.38.3/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400 |
31011 |
-+++ linux-2.6.38.3/fs/jffs2/wbuf.c 2011-04-17 15:57:32.000000000 -0400 |
31012 |
+diff -urNp linux-2.6.38.4/fs/jffs2/wbuf.c linux-2.6.38.4/fs/jffs2/wbuf.c |
31013 |
+--- linux-2.6.38.4/fs/jffs2/wbuf.c 2011-03-14 21:20:32.000000000 -0400 |
31014 |
++++ linux-2.6.38.4/fs/jffs2/wbuf.c 2011-04-17 15:57:32.000000000 -0400 |
31015 |
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o |
31016 |
{ |
31017 |
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), |
31018 |
@@ -32837,9 +31423,9 @@ diff -urNp linux-2.6.38.3/fs/jffs2/wbuf.c linux-2.6.38.3/fs/jffs2/wbuf.c |
31019 |
}; |
31020 |
|
31021 |
/* |
31022 |
-diff -urNp linux-2.6.38.3/fs/Kconfig.binfmt linux-2.6.38.3/fs/Kconfig.binfmt |
31023 |
---- linux-2.6.38.3/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400 |
31024 |
-+++ linux-2.6.38.3/fs/Kconfig.binfmt 2011-04-17 15:57:32.000000000 -0400 |
31025 |
+diff -urNp linux-2.6.38.4/fs/Kconfig.binfmt linux-2.6.38.4/fs/Kconfig.binfmt |
31026 |
+--- linux-2.6.38.4/fs/Kconfig.binfmt 2011-03-14 21:20:32.000000000 -0400 |
31027 |
++++ linux-2.6.38.4/fs/Kconfig.binfmt 2011-04-17 15:57:32.000000000 -0400 |
31028 |
@@ -86,7 +86,7 @@ config HAVE_AOUT |
31029 |
|
31030 |
config BINFMT_AOUT |
31031 |
@@ -32849,9 +31435,9 @@ diff -urNp linux-2.6.38.3/fs/Kconfig.binfmt linux-2.6.38.3/fs/Kconfig.binfmt |
31032 |
---help--- |
31033 |
A.out (Assembler.OUTput) is a set of formats for libraries and |
31034 |
executables used in the earliest versions of UNIX. Linux used |
31035 |
-diff -urNp linux-2.6.38.3/fs/libfs.c linux-2.6.38.3/fs/libfs.c |
31036 |
---- linux-2.6.38.3/fs/libfs.c 2011-03-14 21:20:32.000000000 -0400 |
31037 |
-+++ linux-2.6.38.3/fs/libfs.c 2011-04-17 15:57:32.000000000 -0400 |
31038 |
+diff -urNp linux-2.6.38.4/fs/libfs.c linux-2.6.38.4/fs/libfs.c |
31039 |
+--- linux-2.6.38.4/fs/libfs.c 2011-03-14 21:20:32.000000000 -0400 |
31040 |
++++ linux-2.6.38.4/fs/libfs.c 2011-04-17 15:57:32.000000000 -0400 |
31041 |
@@ -138,6 +138,8 @@ int dcache_readdir(struct file * filp, v |
31042 |
struct dentry *dentry = filp->f_path.dentry; |
31043 |
struct dentry *cursor = filp->private_data; |
31044 |
@@ -32875,9 +31461,9 @@ diff -urNp linux-2.6.38.3/fs/libfs.c linux-2.6.38.3/fs/libfs.c |
31045 |
next->d_name.len, filp->f_pos, |
31046 |
next->d_inode->i_ino, |
31047 |
dt_type(next->d_inode)) < 0) |
31048 |
-diff -urNp linux-2.6.38.3/fs/lockd/svc.c linux-2.6.38.3/fs/lockd/svc.c |
31049 |
---- linux-2.6.38.3/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400 |
31050 |
-+++ linux-2.6.38.3/fs/lockd/svc.c 2011-04-17 15:57:32.000000000 -0400 |
31051 |
+diff -urNp linux-2.6.38.4/fs/lockd/svc.c linux-2.6.38.4/fs/lockd/svc.c |
31052 |
+--- linux-2.6.38.4/fs/lockd/svc.c 2011-03-14 21:20:32.000000000 -0400 |
31053 |
++++ linux-2.6.38.4/fs/lockd/svc.c 2011-04-17 15:57:32.000000000 -0400 |
31054 |
@@ -41,7 +41,7 @@ |
31055 |
|
31056 |
static struct svc_program nlmsvc_program; |
31057 |
@@ -32887,9 +31473,9 @@ diff -urNp linux-2.6.38.3/fs/lockd/svc.c linux-2.6.38.3/fs/lockd/svc.c |
31058 |
EXPORT_SYMBOL_GPL(nlmsvc_ops); |
31059 |
|
31060 |
static DEFINE_MUTEX(nlmsvc_mutex); |
31061 |
-diff -urNp linux-2.6.38.3/fs/locks.c linux-2.6.38.3/fs/locks.c |
31062 |
---- linux-2.6.38.3/fs/locks.c 2011-03-14 21:20:32.000000000 -0400 |
31063 |
-+++ linux-2.6.38.3/fs/locks.c 2011-04-17 15:57:32.000000000 -0400 |
31064 |
+diff -urNp linux-2.6.38.4/fs/locks.c linux-2.6.38.4/fs/locks.c |
31065 |
+--- linux-2.6.38.4/fs/locks.c 2011-03-14 21:20:32.000000000 -0400 |
31066 |
++++ linux-2.6.38.4/fs/locks.c 2011-04-17 15:57:32.000000000 -0400 |
31067 |
@@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *fil |
31068 |
return; |
31069 |
|
31070 |
@@ -32911,9 +31497,9 @@ diff -urNp linux-2.6.38.3/fs/locks.c linux-2.6.38.3/fs/locks.c |
31071 |
} |
31072 |
|
31073 |
lock_flocks(); |
31074 |
-diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31075 |
---- linux-2.6.38.3/fs/namei.c 2011-03-14 21:20:32.000000000 -0400 |
31076 |
-+++ linux-2.6.38.3/fs/namei.c 2011-04-17 15:57:32.000000000 -0400 |
31077 |
+diff -urNp linux-2.6.38.4/fs/namei.c linux-2.6.38.4/fs/namei.c |
31078 |
+--- linux-2.6.38.4/fs/namei.c 2011-04-22 19:20:59.000000000 -0400 |
31079 |
++++ linux-2.6.38.4/fs/namei.c 2011-04-22 19:21:23.000000000 -0400 |
31080 |
@@ -226,14 +226,6 @@ int generic_permission(struct inode *ino |
31081 |
return ret; |
31082 |
|
31083 |
@@ -32954,7 +31540,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31084 |
goto ok; |
31085 |
|
31086 |
return ret; |
31087 |
-@@ -775,7 +776,7 @@ __do_follow_link(const struct path *link |
31088 |
+@@ -776,7 +777,7 @@ __do_follow_link(const struct path *link |
31089 |
*p = dentry->d_inode->i_op->follow_link(dentry, nd); |
31090 |
error = PTR_ERR(*p); |
31091 |
if (!IS_ERR(*p)) { |
31092 |
@@ -32963,7 +31549,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31093 |
error = 0; |
31094 |
if (s) |
31095 |
error = __vfs_follow_link(nd, s); |
31096 |
-@@ -814,6 +815,13 @@ static inline int do_follow_link(struct |
31097 |
+@@ -815,6 +816,13 @@ static inline int do_follow_link(struct |
31098 |
err = security_inode_follow_link(path->dentry, nd); |
31099 |
if (err) |
31100 |
goto loop; |
31101 |
@@ -32977,7 +31563,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31102 |
current->link_count++; |
31103 |
current->total_link_count++; |
31104 |
nd->depth++; |
31105 |
-@@ -1505,13 +1513,36 @@ return_reval: |
31106 |
+@@ -1506,13 +1514,36 @@ return_reval: |
31107 |
return_base: |
31108 |
if (nameidata_drop_rcu_last_maybe(nd)) |
31109 |
return -ECHILD; |
31110 |
@@ -33014,7 +31600,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31111 |
path_put(&nd->path); |
31112 |
return_err: |
31113 |
return err; |
31114 |
-@@ -1738,6 +1769,9 @@ static int do_path_lookup(int dfd, const |
31115 |
+@@ -1739,6 +1770,9 @@ static int do_path_lookup(int dfd, const |
31116 |
} |
31117 |
|
31118 |
if (likely(!retval)) { |
31119 |
@@ -33024,7 +31610,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31120 |
if (unlikely(!audit_dummy_context())) { |
31121 |
if (nd->path.dentry && nd->inode) |
31122 |
audit_inode(name, nd->path.dentry); |
31123 |
-@@ -2078,6 +2112,30 @@ int vfs_create(struct inode *dir, struct |
31124 |
+@@ -2079,6 +2113,30 @@ int vfs_create(struct inode *dir, struct |
31125 |
return error; |
31126 |
} |
31127 |
|
31128 |
@@ -33055,7 +31641,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31129 |
int may_open(struct path *path, int acc_mode, int flag) |
31130 |
{ |
31131 |
struct dentry *dentry = path->dentry; |
31132 |
-@@ -2126,7 +2184,27 @@ int may_open(struct path *path, int acc_ |
31133 |
+@@ -2127,7 +2185,27 @@ int may_open(struct path *path, int acc_ |
31134 |
/* |
31135 |
* Ensure there are no outstanding leases on the file. |
31136 |
*/ |
31137 |
@@ -33084,7 +31670,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31138 |
} |
31139 |
|
31140 |
static int handle_truncate(struct file *filp) |
31141 |
-@@ -2161,6 +2239,12 @@ static int __open_namei_create(struct na |
31142 |
+@@ -2162,6 +2240,12 @@ static int __open_namei_create(struct na |
31143 |
{ |
31144 |
int error; |
31145 |
struct dentry *dir = nd->path.dentry; |
31146 |
@@ -33097,7 +31683,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31147 |
|
31148 |
if (!IS_POSIXACL(dir->d_inode)) |
31149 |
mode &= ~current_umask(); |
31150 |
-@@ -2168,6 +2252,8 @@ static int __open_namei_create(struct na |
31151 |
+@@ -2169,6 +2253,8 @@ static int __open_namei_create(struct na |
31152 |
if (error) |
31153 |
goto out_unlock; |
31154 |
error = vfs_create(dir->d_inode, path->dentry, mode, nd); |
31155 |
@@ -33106,7 +31692,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31156 |
out_unlock: |
31157 |
mutex_unlock(&dir->d_inode->i_mutex); |
31158 |
dput(nd->path.dentry); |
31159 |
-@@ -2179,30 +2265,6 @@ out_unlock: |
31160 |
+@@ -2180,30 +2266,6 @@ out_unlock: |
31161 |
return may_open(&nd->path, 0, open_flag & ~O_TRUNC); |
31162 |
} |
31163 |
|
31164 |
@@ -33137,7 +31723,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31165 |
static int open_will_truncate(int flag, struct inode *inode) |
31166 |
{ |
31167 |
/* |
31168 |
-@@ -2273,6 +2335,7 @@ static struct file *do_last(struct namei |
31169 |
+@@ -2274,6 +2336,7 @@ static struct file *do_last(struct namei |
31170 |
int mode, const char *pathname) |
31171 |
{ |
31172 |
struct dentry *dir = nd->path.dentry; |
31173 |
@@ -33145,7 +31731,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31174 |
struct file *filp; |
31175 |
int error = -EISDIR; |
31176 |
|
31177 |
-@@ -2351,6 +2414,14 @@ static struct file *do_last(struct namei |
31178 |
+@@ -2352,6 +2415,14 @@ static struct file *do_last(struct namei |
31179 |
/* |
31180 |
* It already exists. |
31181 |
*/ |
31182 |
@@ -33160,7 +31746,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31183 |
mutex_unlock(&dir->d_inode->i_mutex); |
31184 |
audit_inode(pathname, path->dentry); |
31185 |
|
31186 |
-@@ -2534,6 +2605,11 @@ reval: |
31187 |
+@@ -2535,6 +2606,11 @@ reval: |
31188 |
error = security_inode_follow_link(link.dentry, &nd); |
31189 |
if (error) |
31190 |
goto exit_dput; |
31191 |
@@ -33172,7 +31758,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31192 |
error = __do_follow_link(&link, &nd, &cookie); |
31193 |
if (unlikely(error)) { |
31194 |
if (!IS_ERR(cookie) && linki->i_op->put_link) |
31195 |
-@@ -2704,6 +2780,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const |
31196 |
+@@ -2705,6 +2781,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const |
31197 |
error = may_mknod(mode); |
31198 |
if (error) |
31199 |
goto out_dput; |
31200 |
@@ -33190,7 +31776,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31201 |
error = mnt_want_write(nd.path.mnt); |
31202 |
if (error) |
31203 |
goto out_dput; |
31204 |
-@@ -2724,6 +2811,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const |
31205 |
+@@ -2725,6 +2812,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const |
31206 |
} |
31207 |
out_drop_write: |
31208 |
mnt_drop_write(nd.path.mnt); |
31209 |
@@ -33200,7 +31786,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31210 |
out_dput: |
31211 |
dput(dentry); |
31212 |
out_unlock: |
31213 |
-@@ -2776,6 +2866,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const |
31214 |
+@@ -2777,6 +2867,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const |
31215 |
if (IS_ERR(dentry)) |
31216 |
goto out_unlock; |
31217 |
|
31218 |
@@ -33212,7 +31798,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31219 |
if (!IS_POSIXACL(nd.path.dentry->d_inode)) |
31220 |
mode &= ~current_umask(); |
31221 |
error = mnt_want_write(nd.path.mnt); |
31222 |
-@@ -2787,6 +2882,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const |
31223 |
+@@ -2788,6 +2883,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const |
31224 |
error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode); |
31225 |
out_drop_write: |
31226 |
mnt_drop_write(nd.path.mnt); |
31227 |
@@ -33223,7 +31809,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31228 |
out_dput: |
31229 |
dput(dentry); |
31230 |
out_unlock: |
31231 |
-@@ -2866,6 +2965,8 @@ static long do_rmdir(int dfd, const char |
31232 |
+@@ -2867,6 +2966,8 @@ static long do_rmdir(int dfd, const char |
31233 |
char * name; |
31234 |
struct dentry *dentry; |
31235 |
struct nameidata nd; |
31236 |
@@ -33232,7 +31818,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31237 |
|
31238 |
error = user_path_parent(dfd, pathname, &nd, &name); |
31239 |
if (error) |
31240 |
-@@ -2890,6 +2991,19 @@ static long do_rmdir(int dfd, const char |
31241 |
+@@ -2891,6 +2992,19 @@ static long do_rmdir(int dfd, const char |
31242 |
error = PTR_ERR(dentry); |
31243 |
if (IS_ERR(dentry)) |
31244 |
goto exit2; |
31245 |
@@ -33252,7 +31838,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31246 |
error = mnt_want_write(nd.path.mnt); |
31247 |
if (error) |
31248 |
goto exit3; |
31249 |
-@@ -2897,6 +3011,8 @@ static long do_rmdir(int dfd, const char |
31250 |
+@@ -2898,6 +3012,8 @@ static long do_rmdir(int dfd, const char |
31251 |
if (error) |
31252 |
goto exit4; |
31253 |
error = vfs_rmdir(nd.path.dentry->d_inode, dentry); |
31254 |
@@ -33261,7 +31847,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31255 |
exit4: |
31256 |
mnt_drop_write(nd.path.mnt); |
31257 |
exit3: |
31258 |
-@@ -2959,6 +3075,8 @@ static long do_unlinkat(int dfd, const c |
31259 |
+@@ -2960,6 +3076,8 @@ static long do_unlinkat(int dfd, const c |
31260 |
struct dentry *dentry; |
31261 |
struct nameidata nd; |
31262 |
struct inode *inode = NULL; |
31263 |
@@ -33270,7 +31856,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31264 |
|
31265 |
error = user_path_parent(dfd, pathname, &nd, &name); |
31266 |
if (error) |
31267 |
-@@ -2978,8 +3096,17 @@ static long do_unlinkat(int dfd, const c |
31268 |
+@@ -2979,8 +3097,17 @@ static long do_unlinkat(int dfd, const c |
31269 |
if (nd.last.name[nd.last.len]) |
31270 |
goto slashes; |
31271 |
inode = dentry->d_inode; |
31272 |
@@ -33289,7 +31875,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31273 |
error = mnt_want_write(nd.path.mnt); |
31274 |
if (error) |
31275 |
goto exit2; |
31276 |
-@@ -2987,6 +3114,8 @@ static long do_unlinkat(int dfd, const c |
31277 |
+@@ -2988,6 +3115,8 @@ static long do_unlinkat(int dfd, const c |
31278 |
if (error) |
31279 |
goto exit3; |
31280 |
error = vfs_unlink(nd.path.dentry->d_inode, dentry); |
31281 |
@@ -33298,7 +31884,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31282 |
exit3: |
31283 |
mnt_drop_write(nd.path.mnt); |
31284 |
exit2: |
31285 |
-@@ -3064,6 +3193,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ |
31286 |
+@@ -3065,6 +3194,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ |
31287 |
if (IS_ERR(dentry)) |
31288 |
goto out_unlock; |
31289 |
|
31290 |
@@ -33310,7 +31896,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31291 |
error = mnt_want_write(nd.path.mnt); |
31292 |
if (error) |
31293 |
goto out_dput; |
31294 |
-@@ -3071,6 +3205,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ |
31295 |
+@@ -3072,6 +3206,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ |
31296 |
if (error) |
31297 |
goto out_drop_write; |
31298 |
error = vfs_symlink(nd.path.dentry->d_inode, dentry, from); |
31299 |
@@ -33319,7 +31905,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31300 |
out_drop_write: |
31301 |
mnt_drop_write(nd.path.mnt); |
31302 |
out_dput: |
31303 |
-@@ -3163,6 +3299,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con |
31304 |
+@@ -3164,6 +3300,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con |
31305 |
error = PTR_ERR(new_dentry); |
31306 |
if (IS_ERR(new_dentry)) |
31307 |
goto out_unlock; |
31308 |
@@ -33340,7 +31926,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31309 |
error = mnt_want_write(nd.path.mnt); |
31310 |
if (error) |
31311 |
goto out_dput; |
31312 |
-@@ -3170,6 +3320,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con |
31313 |
+@@ -3171,6 +3321,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con |
31314 |
if (error) |
31315 |
goto out_drop_write; |
31316 |
error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry); |
31317 |
@@ -33349,7 +31935,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31318 |
out_drop_write: |
31319 |
mnt_drop_write(nd.path.mnt); |
31320 |
out_dput: |
31321 |
-@@ -3403,6 +3555,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c |
31322 |
+@@ -3404,6 +3556,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c |
31323 |
if (new_dentry == trap) |
31324 |
goto exit5; |
31325 |
|
31326 |
@@ -33362,7 +31948,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31327 |
error = mnt_want_write(oldnd.path.mnt); |
31328 |
if (error) |
31329 |
goto exit5; |
31330 |
-@@ -3412,6 +3570,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c |
31331 |
+@@ -3413,6 +3571,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c |
31332 |
goto exit6; |
31333 |
error = vfs_rename(old_dir->d_inode, old_dentry, |
31334 |
new_dir->d_inode, new_dentry); |
31335 |
@@ -33372,7 +31958,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31336 |
exit6: |
31337 |
mnt_drop_write(oldnd.path.mnt); |
31338 |
exit5: |
31339 |
-@@ -3437,6 +3598,8 @@ SYSCALL_DEFINE2(rename, const char __use |
31340 |
+@@ -3438,6 +3599,8 @@ SYSCALL_DEFINE2(rename, const char __use |
31341 |
|
31342 |
int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link) |
31343 |
{ |
31344 |
@@ -33381,7 +31967,7 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31345 |
int len; |
31346 |
|
31347 |
len = PTR_ERR(link); |
31348 |
-@@ -3446,7 +3609,14 @@ int vfs_readlink(struct dentry *dentry, |
31349 |
+@@ -3447,7 +3610,14 @@ int vfs_readlink(struct dentry *dentry, |
31350 |
len = strlen(link); |
31351 |
if (len > (unsigned) buflen) |
31352 |
len = buflen; |
31353 |
@@ -33397,9 +31983,9 @@ diff -urNp linux-2.6.38.3/fs/namei.c linux-2.6.38.3/fs/namei.c |
31354 |
len = -EFAULT; |
31355 |
out: |
31356 |
return len; |
31357 |
-diff -urNp linux-2.6.38.3/fs/namespace.c linux-2.6.38.3/fs/namespace.c |
31358 |
---- linux-2.6.38.3/fs/namespace.c 2011-04-18 17:27:16.000000000 -0400 |
31359 |
-+++ linux-2.6.38.3/fs/namespace.c 2011-04-17 15:57:32.000000000 -0400 |
31360 |
+diff -urNp linux-2.6.38.4/fs/namespace.c linux-2.6.38.4/fs/namespace.c |
31361 |
+--- linux-2.6.38.4/fs/namespace.c 2011-04-18 17:27:16.000000000 -0400 |
31362 |
++++ linux-2.6.38.4/fs/namespace.c 2011-04-17 15:57:32.000000000 -0400 |
31363 |
@@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mn |
31364 |
if (!(sb->s_flags & MS_RDONLY)) |
31365 |
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); |
31366 |
@@ -33460,9 +32046,9 @@ diff -urNp linux-2.6.38.3/fs/namespace.c linux-2.6.38.3/fs/namespace.c |
31367 |
get_fs_root(current->fs, &root); |
31368 |
down_write(&namespace_sem); |
31369 |
mutex_lock(&old.dentry->d_inode->i_mutex); |
31370 |
-diff -urNp linux-2.6.38.3/fs/nfs/inode.c linux-2.6.38.3/fs/nfs/inode.c |
31371 |
---- linux-2.6.38.3/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
31372 |
-+++ linux-2.6.38.3/fs/nfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
31373 |
+diff -urNp linux-2.6.38.4/fs/nfs/inode.c linux-2.6.38.4/fs/nfs/inode.c |
31374 |
+--- linux-2.6.38.4/fs/nfs/inode.c 2011-03-14 21:20:32.000000000 -0400 |
31375 |
++++ linux-2.6.38.4/fs/nfs/inode.c 2011-04-17 15:57:32.000000000 -0400 |
31376 |
@@ -998,16 +998,16 @@ static int nfs_size_need_update(const st |
31377 |
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); |
31378 |
} |
31379 |
@@ -33483,282 +32069,9 @@ diff -urNp linux-2.6.38.3/fs/nfs/inode.c linux-2.6.38.3/fs/nfs/inode.c |
31380 |
} |
31381 |
|
31382 |
void nfs_fattr_init(struct nfs_fattr *fattr) |
31383 |
-diff -urNp linux-2.6.38.3/fs/nfs/nfs4proc.c linux-2.6.38.3/fs/nfs/nfs4proc.c |
31384 |
---- linux-2.6.38.3/fs/nfs/nfs4proc.c 2011-03-14 21:20:32.000000000 -0400 |
31385 |
-+++ linux-2.6.38.3/fs/nfs/nfs4proc.c 2011-04-17 15:57:32.000000000 -0400 |
31386 |
-@@ -1198,7 +1198,7 @@ static int _nfs4_do_open_reclaim(struct |
31387 |
- static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) |
31388 |
- { |
31389 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
31390 |
-- struct nfs4_exception exception = { }; |
31391 |
-+ struct nfs4_exception exception = {0, 0}; |
31392 |
- int err; |
31393 |
- do { |
31394 |
- err = _nfs4_do_open_reclaim(ctx, state); |
31395 |
-@@ -1240,7 +1240,7 @@ static int _nfs4_open_delegation_recall( |
31396 |
- |
31397 |
- int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid) |
31398 |
- { |
31399 |
-- struct nfs4_exception exception = { }; |
31400 |
-+ struct nfs4_exception exception = {0, 0}; |
31401 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
31402 |
- int err; |
31403 |
- do { |
31404 |
-@@ -1615,7 +1615,7 @@ static int _nfs4_open_expired(struct nfs |
31405 |
- static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state) |
31406 |
- { |
31407 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
31408 |
-- struct nfs4_exception exception = { }; |
31409 |
-+ struct nfs4_exception exception = {0, 0}; |
31410 |
- int err; |
31411 |
- |
31412 |
- do { |
31413 |
-@@ -1730,7 +1730,7 @@ out_err: |
31414 |
- |
31415 |
- static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred) |
31416 |
- { |
31417 |
-- struct nfs4_exception exception = { }; |
31418 |
-+ struct nfs4_exception exception = {0, 0}; |
31419 |
- struct nfs4_state *res; |
31420 |
- int status; |
31421 |
- |
31422 |
-@@ -1821,7 +1821,7 @@ static int nfs4_do_setattr(struct inode |
31423 |
- struct nfs4_state *state) |
31424 |
- { |
31425 |
- struct nfs_server *server = NFS_SERVER(inode); |
31426 |
-- struct nfs4_exception exception = { }; |
31427 |
-+ struct nfs4_exception exception = {0, 0}; |
31428 |
- int err; |
31429 |
- do { |
31430 |
- err = nfs4_handle_exception(server, |
31431 |
-@@ -2111,7 +2111,7 @@ static int _nfs4_server_capabilities(str |
31432 |
- |
31433 |
- int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) |
31434 |
- { |
31435 |
-- struct nfs4_exception exception = { }; |
31436 |
-+ struct nfs4_exception exception = {0, 0}; |
31437 |
- int err; |
31438 |
- do { |
31439 |
- err = nfs4_handle_exception(server, |
31440 |
-@@ -2145,7 +2145,7 @@ static int _nfs4_lookup_root(struct nfs_ |
31441 |
- static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, |
31442 |
- struct nfs_fsinfo *info) |
31443 |
- { |
31444 |
-- struct nfs4_exception exception = { }; |
31445 |
-+ struct nfs4_exception exception = {0, 0}; |
31446 |
- int err; |
31447 |
- do { |
31448 |
- err = nfs4_handle_exception(server, |
31449 |
-@@ -2233,7 +2233,7 @@ static int _nfs4_proc_getattr(struct nfs |
31450 |
- |
31451 |
- static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) |
31452 |
- { |
31453 |
-- struct nfs4_exception exception = { }; |
31454 |
-+ struct nfs4_exception exception = {0, 0}; |
31455 |
- int err; |
31456 |
- do { |
31457 |
- err = nfs4_handle_exception(server, |
31458 |
-@@ -2321,7 +2321,7 @@ static int nfs4_proc_lookupfh(struct nfs |
31459 |
- struct qstr *name, struct nfs_fh *fhandle, |
31460 |
- struct nfs_fattr *fattr) |
31461 |
- { |
31462 |
-- struct nfs4_exception exception = { }; |
31463 |
-+ struct nfs4_exception exception = {0, 0}; |
31464 |
- int err; |
31465 |
- do { |
31466 |
- err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); |
31467 |
-@@ -2350,7 +2350,7 @@ static int _nfs4_proc_lookup(struct inod |
31468 |
- |
31469 |
- static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) |
31470 |
- { |
31471 |
-- struct nfs4_exception exception = { }; |
31472 |
-+ struct nfs4_exception exception = {0, 0}; |
31473 |
- int err; |
31474 |
- do { |
31475 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
31476 |
-@@ -2417,7 +2417,7 @@ static int _nfs4_proc_access(struct inod |
31477 |
- |
31478 |
- static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) |
31479 |
- { |
31480 |
-- struct nfs4_exception exception = { }; |
31481 |
-+ struct nfs4_exception exception = {0, 0}; |
31482 |
- int err; |
31483 |
- do { |
31484 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
31485 |
-@@ -2473,7 +2473,7 @@ static int _nfs4_proc_readlink(struct in |
31486 |
- static int nfs4_proc_readlink(struct inode *inode, struct page *page, |
31487 |
- unsigned int pgbase, unsigned int pglen) |
31488 |
- { |
31489 |
-- struct nfs4_exception exception = { }; |
31490 |
-+ struct nfs4_exception exception = {0, 0}; |
31491 |
- int err; |
31492 |
- do { |
31493 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
31494 |
-@@ -2568,7 +2568,7 @@ out: |
31495 |
- |
31496 |
- static int nfs4_proc_remove(struct inode *dir, struct qstr *name) |
31497 |
- { |
31498 |
-- struct nfs4_exception exception = { }; |
31499 |
-+ struct nfs4_exception exception = {0, 0}; |
31500 |
- int err; |
31501 |
- do { |
31502 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
31503 |
-@@ -2673,7 +2673,7 @@ out: |
31504 |
- static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, |
31505 |
- struct inode *new_dir, struct qstr *new_name) |
31506 |
- { |
31507 |
-- struct nfs4_exception exception = { }; |
31508 |
-+ struct nfs4_exception exception = {0, 0}; |
31509 |
- int err; |
31510 |
- do { |
31511 |
- err = nfs4_handle_exception(NFS_SERVER(old_dir), |
31512 |
-@@ -2722,7 +2722,7 @@ out: |
31513 |
- |
31514 |
- static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) |
31515 |
- { |
31516 |
-- struct nfs4_exception exception = { }; |
31517 |
-+ struct nfs4_exception exception = {0, 0}; |
31518 |
- int err; |
31519 |
- do { |
31520 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
31521 |
-@@ -2814,7 +2814,7 @@ out: |
31522 |
- static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, |
31523 |
- struct page *page, unsigned int len, struct iattr *sattr) |
31524 |
- { |
31525 |
-- struct nfs4_exception exception = { }; |
31526 |
-+ struct nfs4_exception exception = {0, 0}; |
31527 |
- int err; |
31528 |
- do { |
31529 |
- err = nfs4_handle_exception(NFS_SERVER(dir), |
31530 |
-@@ -2845,7 +2845,7 @@ out: |
31531 |
- static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, |
31532 |
- struct iattr *sattr) |
31533 |
- { |
31534 |
-- struct nfs4_exception exception = { }; |
31535 |
-+ struct nfs4_exception exception = {0, 0}; |
31536 |
- int err; |
31537 |
- |
31538 |
- sattr->ia_mode &= ~current_umask(); |
31539 |
-@@ -2899,7 +2899,7 @@ static int _nfs4_proc_readdir(struct den |
31540 |
- static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, |
31541 |
- u64 cookie, struct page **pages, unsigned int count, int plus) |
31542 |
- { |
31543 |
-- struct nfs4_exception exception = { }; |
31544 |
-+ struct nfs4_exception exception = {0, 0}; |
31545 |
- int err; |
31546 |
- do { |
31547 |
- err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), |
31548 |
-@@ -2947,7 +2947,7 @@ out: |
31549 |
- static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, |
31550 |
- struct iattr *sattr, dev_t rdev) |
31551 |
- { |
31552 |
-- struct nfs4_exception exception = { }; |
31553 |
-+ struct nfs4_exception exception = {0, 0}; |
31554 |
- int err; |
31555 |
- |
31556 |
- sattr->ia_mode &= ~current_umask(); |
31557 |
-@@ -2981,7 +2981,7 @@ static int _nfs4_proc_statfs(struct nfs_ |
31558 |
- |
31559 |
- static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) |
31560 |
- { |
31561 |
-- struct nfs4_exception exception = { }; |
31562 |
-+ struct nfs4_exception exception = {0, 0}; |
31563 |
- int err; |
31564 |
- do { |
31565 |
- err = nfs4_handle_exception(server, |
31566 |
-@@ -3012,7 +3012,7 @@ static int _nfs4_do_fsinfo(struct nfs_se |
31567 |
- |
31568 |
- static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) |
31569 |
- { |
31570 |
-- struct nfs4_exception exception = { }; |
31571 |
-+ struct nfs4_exception exception = {0, 0}; |
31572 |
- int err; |
31573 |
- |
31574 |
- do { |
31575 |
-@@ -3058,7 +3058,7 @@ static int _nfs4_proc_pathconf(struct nf |
31576 |
- static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, |
31577 |
- struct nfs_pathconf *pathconf) |
31578 |
- { |
31579 |
-- struct nfs4_exception exception = { }; |
31580 |
-+ struct nfs4_exception exception = {0, 0}; |
31581 |
- int err; |
31582 |
- |
31583 |
- do { |
31584 |
-@@ -3404,7 +3404,7 @@ out_free: |
31585 |
- |
31586 |
- static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) |
31587 |
- { |
31588 |
-- struct nfs4_exception exception = { }; |
31589 |
-+ struct nfs4_exception exception = {0, 0}; |
31590 |
- ssize_t ret; |
31591 |
- do { |
31592 |
- ret = __nfs4_get_acl_uncached(inode, buf, buflen); |
31593 |
-@@ -3479,7 +3479,7 @@ static int __nfs4_proc_set_acl(struct in |
31594 |
- |
31595 |
- static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) |
31596 |
- { |
31597 |
-- struct nfs4_exception exception = { }; |
31598 |
-+ struct nfs4_exception exception = {0, 0}; |
31599 |
- int err; |
31600 |
- do { |
31601 |
- err = nfs4_handle_exception(NFS_SERVER(inode), |
31602 |
-@@ -3760,7 +3760,7 @@ out: |
31603 |
- int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) |
31604 |
- { |
31605 |
- struct nfs_server *server = NFS_SERVER(inode); |
31606 |
-- struct nfs4_exception exception = { }; |
31607 |
-+ struct nfs4_exception exception = {0, 0}; |
31608 |
- int err; |
31609 |
- do { |
31610 |
- err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); |
31611 |
-@@ -3834,7 +3834,7 @@ out: |
31612 |
- |
31613 |
- static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) |
31614 |
- { |
31615 |
-- struct nfs4_exception exception = { }; |
31616 |
-+ struct nfs4_exception exception = {0, 0}; |
31617 |
- int err; |
31618 |
- |
31619 |
- do { |
31620 |
-@@ -4239,7 +4239,7 @@ static int _nfs4_do_setlk(struct nfs4_st |
31621 |
- static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) |
31622 |
- { |
31623 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
31624 |
-- struct nfs4_exception exception = { }; |
31625 |
-+ struct nfs4_exception exception = {0, 0}; |
31626 |
- int err; |
31627 |
- |
31628 |
- do { |
31629 |
-@@ -4257,7 +4257,7 @@ static int nfs4_lock_reclaim(struct nfs4 |
31630 |
- static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) |
31631 |
- { |
31632 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
31633 |
-- struct nfs4_exception exception = { }; |
31634 |
-+ struct nfs4_exception exception = {0, 0}; |
31635 |
- int err; |
31636 |
- |
31637 |
- err = nfs4_set_lock_state(state, request); |
31638 |
-@@ -4321,7 +4321,7 @@ out: |
31639 |
- |
31640 |
- static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) |
31641 |
- { |
31642 |
-- struct nfs4_exception exception = { }; |
31643 |
-+ struct nfs4_exception exception = {0, 0}; |
31644 |
- int err; |
31645 |
- |
31646 |
- do { |
31647 |
-@@ -4381,7 +4381,7 @@ nfs4_proc_lock(struct file *filp, int cm |
31648 |
- int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) |
31649 |
- { |
31650 |
- struct nfs_server *server = NFS_SERVER(state->inode); |
31651 |
-- struct nfs4_exception exception = { }; |
31652 |
-+ struct nfs4_exception exception = {0, 0}; |
31653 |
- int err; |
31654 |
- |
31655 |
- err = nfs4_set_lock_state(state, fl); |
31656 |
-diff -urNp linux-2.6.38.3/fs/nfsd/lockd.c linux-2.6.38.3/fs/nfsd/lockd.c |
31657 |
---- linux-2.6.38.3/fs/nfsd/lockd.c 2011-04-18 17:27:18.000000000 -0400 |
31658 |
-+++ linux-2.6.38.3/fs/nfsd/lockd.c 2011-04-17 16:53:48.000000000 -0400 |
31659 |
+diff -urNp linux-2.6.38.4/fs/nfsd/lockd.c linux-2.6.38.4/fs/nfsd/lockd.c |
31660 |
+--- linux-2.6.38.4/fs/nfsd/lockd.c 2011-04-18 17:27:18.000000000 -0400 |
31661 |
++++ linux-2.6.38.4/fs/nfsd/lockd.c 2011-04-17 16:53:48.000000000 -0400 |
31662 |
@@ -60,7 +60,7 @@ nlm_fclose(struct file *filp) |
31663 |
fput(filp); |
31664 |
} |
31665 |
@@ -33768,9 +32081,9 @@ diff -urNp linux-2.6.38.3/fs/nfsd/lockd.c linux-2.6.38.3/fs/nfsd/lockd.c |
31666 |
.fopen = nlm_fopen, /* open file for locking */ |
31667 |
.fclose = nlm_fclose, /* close file */ |
31668 |
}; |
31669 |
-diff -urNp linux-2.6.38.3/fs/nfsd/nfsctl.c linux-2.6.38.3/fs/nfsd/nfsctl.c |
31670 |
---- linux-2.6.38.3/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400 |
31671 |
-+++ linux-2.6.38.3/fs/nfsd/nfsctl.c 2011-04-17 15:57:32.000000000 -0400 |
31672 |
+diff -urNp linux-2.6.38.4/fs/nfsd/nfsctl.c linux-2.6.38.4/fs/nfsd/nfsctl.c |
31673 |
+--- linux-2.6.38.4/fs/nfsd/nfsctl.c 2011-03-14 21:20:32.000000000 -0400 |
31674 |
++++ linux-2.6.38.4/fs/nfsd/nfsctl.c 2011-04-17 15:57:32.000000000 -0400 |
31675 |
@@ -180,7 +180,7 @@ static int export_features_open(struct i |
31676 |
return single_open(file, export_features_show, NULL); |
31677 |
} |
31678 |
@@ -33780,9 +32093,9 @@ diff -urNp linux-2.6.38.3/fs/nfsd/nfsctl.c linux-2.6.38.3/fs/nfsd/nfsctl.c |
31679 |
.open = export_features_open, |
31680 |
.read = seq_read, |
31681 |
.llseek = seq_lseek, |
31682 |
-diff -urNp linux-2.6.38.3/fs/nfsd/vfs.c linux-2.6.38.3/fs/nfsd/vfs.c |
31683 |
---- linux-2.6.38.3/fs/nfsd/vfs.c 2011-03-14 21:20:32.000000000 -0400 |
31684 |
-+++ linux-2.6.38.3/fs/nfsd/vfs.c 2011-04-17 15:57:32.000000000 -0400 |
31685 |
+diff -urNp linux-2.6.38.4/fs/nfsd/vfs.c linux-2.6.38.4/fs/nfsd/vfs.c |
31686 |
+--- linux-2.6.38.4/fs/nfsd/vfs.c 2011-03-14 21:20:32.000000000 -0400 |
31687 |
++++ linux-2.6.38.4/fs/nfsd/vfs.c 2011-04-17 15:57:32.000000000 -0400 |
31688 |
@@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st |
31689 |
} else { |
31690 |
oldfs = get_fs(); |
31691 |
@@ -33810,21 +32123,9 @@ diff -urNp linux-2.6.38.3/fs/nfsd/vfs.c linux-2.6.38.3/fs/nfsd/vfs.c |
31692 |
set_fs(oldfs); |
31693 |
|
31694 |
if (host_err < 0) |
31695 |
-diff -urNp linux-2.6.38.3/fs/nls/nls_base.c linux-2.6.38.3/fs/nls/nls_base.c |
31696 |
---- linux-2.6.38.3/fs/nls/nls_base.c 2011-03-14 21:20:32.000000000 -0400 |
31697 |
-+++ linux-2.6.38.3/fs/nls/nls_base.c 2011-04-17 15:57:32.000000000 -0400 |
31698 |
-@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl |
31699 |
- {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, |
31700 |
- {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, |
31701 |
- {0xFE, 0xFC, 5*6, 0x7FFFFFFF, 0x4000000, /* 6 byte sequence */}, |
31702 |
-- {0, /* end of table */} |
31703 |
-+ {0, 0, 0, 0, 0, /* end of table */} |
31704 |
- }; |
31705 |
- |
31706 |
- #define UNICODE_MAX 0x0010ffff |
31707 |
-diff -urNp linux-2.6.38.3/fs/notify/dnotify/dnotify.c linux-2.6.38.3/fs/notify/dnotify/dnotify.c |
31708 |
---- linux-2.6.38.3/fs/notify/dnotify/dnotify.c 2011-03-14 21:20:32.000000000 -0400 |
31709 |
-+++ linux-2.6.38.3/fs/notify/dnotify/dnotify.c 2011-04-17 15:57:32.000000000 -0400 |
31710 |
+diff -urNp linux-2.6.38.4/fs/notify/dnotify/dnotify.c linux-2.6.38.4/fs/notify/dnotify/dnotify.c |
31711 |
+--- linux-2.6.38.4/fs/notify/dnotify/dnotify.c 2011-03-14 21:20:32.000000000 -0400 |
31712 |
++++ linux-2.6.38.4/fs/notify/dnotify/dnotify.c 2011-04-17 15:57:32.000000000 -0400 |
31713 |
@@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsn |
31714 |
kmem_cache_free(dnotify_mark_cache, dn_mark); |
31715 |
} |
31716 |
@@ -33834,9 +32135,9 @@ diff -urNp linux-2.6.38.3/fs/notify/dnotify/dnotify.c linux-2.6.38.3/fs/notify/d |
31717 |
.handle_event = dnotify_handle_event, |
31718 |
.should_send_event = dnotify_should_send_event, |
31719 |
.free_group_priv = NULL, |
31720 |
-diff -urNp linux-2.6.38.3/fs/ntfs/dir.c linux-2.6.38.3/fs/ntfs/dir.c |
31721 |
---- linux-2.6.38.3/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400 |
31722 |
-+++ linux-2.6.38.3/fs/ntfs/dir.c 2011-04-17 15:57:32.000000000 -0400 |
31723 |
+diff -urNp linux-2.6.38.4/fs/ntfs/dir.c linux-2.6.38.4/fs/ntfs/dir.c |
31724 |
+--- linux-2.6.38.4/fs/ntfs/dir.c 2011-03-14 21:20:32.000000000 -0400 |
31725 |
++++ linux-2.6.38.4/fs/ntfs/dir.c 2011-04-17 15:57:32.000000000 -0400 |
31726 |
@@ -1329,7 +1329,7 @@ find_next_index_buffer: |
31727 |
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & |
31728 |
~(s64)(ndir->itype.index.block_size - 1))); |
31729 |
@@ -33846,9 +32147,9 @@ diff -urNp linux-2.6.38.3/fs/ntfs/dir.c linux-2.6.38.3/fs/ntfs/dir.c |
31730 |
ntfs_error(sb, "Out of bounds check failed. Corrupt directory " |
31731 |
"inode 0x%lx or driver bug.", vdir->i_ino); |
31732 |
goto err_out; |
31733 |
-diff -urNp linux-2.6.38.3/fs/ntfs/file.c linux-2.6.38.3/fs/ntfs/file.c |
31734 |
---- linux-2.6.38.3/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400 |
31735 |
-+++ linux-2.6.38.3/fs/ntfs/file.c 2011-04-17 15:57:32.000000000 -0400 |
31736 |
+diff -urNp linux-2.6.38.4/fs/ntfs/file.c linux-2.6.38.4/fs/ntfs/file.c |
31737 |
+--- linux-2.6.38.4/fs/ntfs/file.c 2011-03-14 21:20:32.000000000 -0400 |
31738 |
++++ linux-2.6.38.4/fs/ntfs/file.c 2011-04-17 15:57:32.000000000 -0400 |
31739 |
@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_ |
31740 |
#endif /* NTFS_RW */ |
31741 |
}; |
31742 |
@@ -33858,9 +32159,9 @@ diff -urNp linux-2.6.38.3/fs/ntfs/file.c linux-2.6.38.3/fs/ntfs/file.c |
31743 |
|
31744 |
-const struct inode_operations ntfs_empty_inode_ops = {}; |
31745 |
+const struct inode_operations ntfs_empty_inode_ops __read_only; |
31746 |
-diff -urNp linux-2.6.38.3/fs/ocfs2/localalloc.c linux-2.6.38.3/fs/ocfs2/localalloc.c |
31747 |
---- linux-2.6.38.3/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -0400 |
31748 |
-+++ linux-2.6.38.3/fs/ocfs2/localalloc.c 2011-04-17 15:57:32.000000000 -0400 |
31749 |
+diff -urNp linux-2.6.38.4/fs/ocfs2/localalloc.c linux-2.6.38.4/fs/ocfs2/localalloc.c |
31750 |
+--- linux-2.6.38.4/fs/ocfs2/localalloc.c 2011-03-14 21:20:32.000000000 -0400 |
31751 |
++++ linux-2.6.38.4/fs/ocfs2/localalloc.c 2011-04-17 15:57:32.000000000 -0400 |
31752 |
@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo |
31753 |
goto bail; |
31754 |
} |
31755 |
@@ -33870,9 +32171,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/localalloc.c linux-2.6.38.3/fs/ocfs2/localall |
31756 |
|
31757 |
bail: |
31758 |
if (handle) |
31759 |
-diff -urNp linux-2.6.38.3/fs/ocfs2/ocfs2.h linux-2.6.38.3/fs/ocfs2/ocfs2.h |
31760 |
---- linux-2.6.38.3/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400 |
31761 |
-+++ linux-2.6.38.3/fs/ocfs2/ocfs2.h 2011-04-17 15:57:32.000000000 -0400 |
31762 |
+diff -urNp linux-2.6.38.4/fs/ocfs2/ocfs2.h linux-2.6.38.4/fs/ocfs2/ocfs2.h |
31763 |
+--- linux-2.6.38.4/fs/ocfs2/ocfs2.h 2011-03-14 21:20:32.000000000 -0400 |
31764 |
++++ linux-2.6.38.4/fs/ocfs2/ocfs2.h 2011-04-17 15:57:32.000000000 -0400 |
31765 |
@@ -230,11 +230,11 @@ enum ocfs2_vol_state |
31766 |
|
31767 |
struct ocfs2_alloc_stats |
31768 |
@@ -33890,9 +32191,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/ocfs2.h linux-2.6.38.3/fs/ocfs2/ocfs2.h |
31769 |
}; |
31770 |
|
31771 |
enum ocfs2_local_alloc_state |
31772 |
-diff -urNp linux-2.6.38.3/fs/ocfs2/suballoc.c linux-2.6.38.3/fs/ocfs2/suballoc.c |
31773 |
---- linux-2.6.38.3/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -0400 |
31774 |
-+++ linux-2.6.38.3/fs/ocfs2/suballoc.c 2011-04-17 15:57:32.000000000 -0400 |
31775 |
+diff -urNp linux-2.6.38.4/fs/ocfs2/suballoc.c linux-2.6.38.4/fs/ocfs2/suballoc.c |
31776 |
+--- linux-2.6.38.4/fs/ocfs2/suballoc.c 2011-03-14 21:20:32.000000000 -0400 |
31777 |
++++ linux-2.6.38.4/fs/ocfs2/suballoc.c 2011-04-17 15:57:32.000000000 -0400 |
31778 |
@@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s |
31779 |
mlog_errno(status); |
31780 |
goto bail; |
31781 |
@@ -33938,9 +32239,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/suballoc.c linux-2.6.38.3/fs/ocfs2/suballoc.c |
31782 |
*num_clusters = res.sr_bits; |
31783 |
} |
31784 |
} |
31785 |
-diff -urNp linux-2.6.38.3/fs/ocfs2/super.c linux-2.6.38.3/fs/ocfs2/super.c |
31786 |
---- linux-2.6.38.3/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400 |
31787 |
-+++ linux-2.6.38.3/fs/ocfs2/super.c 2011-04-17 15:57:32.000000000 -0400 |
31788 |
+diff -urNp linux-2.6.38.4/fs/ocfs2/super.c linux-2.6.38.4/fs/ocfs2/super.c |
31789 |
+--- linux-2.6.38.4/fs/ocfs2/super.c 2011-03-14 21:20:32.000000000 -0400 |
31790 |
++++ linux-2.6.38.4/fs/ocfs2/super.c 2011-04-17 15:57:32.000000000 -0400 |
31791 |
@@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s |
31792 |
"%10s => GlobalAllocs: %d LocalAllocs: %d " |
31793 |
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", |
31794 |
@@ -33975,9 +32276,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/super.c linux-2.6.38.3/fs/ocfs2/super.c |
31795 |
|
31796 |
/* Copy the blockcheck stats from the superblock probe */ |
31797 |
osb->osb_ecc_stats = *stats; |
31798 |
-diff -urNp linux-2.6.38.3/fs/ocfs2/symlink.c linux-2.6.38.3/fs/ocfs2/symlink.c |
31799 |
---- linux-2.6.38.3/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -0400 |
31800 |
-+++ linux-2.6.38.3/fs/ocfs2/symlink.c 2011-04-17 15:57:32.000000000 -0400 |
31801 |
+diff -urNp linux-2.6.38.4/fs/ocfs2/symlink.c linux-2.6.38.4/fs/ocfs2/symlink.c |
31802 |
+--- linux-2.6.38.4/fs/ocfs2/symlink.c 2011-03-14 21:20:32.000000000 -0400 |
31803 |
++++ linux-2.6.38.4/fs/ocfs2/symlink.c 2011-04-17 15:57:32.000000000 -0400 |
31804 |
@@ -148,7 +148,7 @@ bail: |
31805 |
|
31806 |
static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) |
31807 |
@@ -33987,9 +32288,9 @@ diff -urNp linux-2.6.38.3/fs/ocfs2/symlink.c linux-2.6.38.3/fs/ocfs2/symlink.c |
31808 |
if (!IS_ERR(link)) |
31809 |
kfree(link); |
31810 |
} |
31811 |
-diff -urNp linux-2.6.38.3/fs/open.c linux-2.6.38.3/fs/open.c |
31812 |
---- linux-2.6.38.3/fs/open.c 2011-03-14 21:20:32.000000000 -0400 |
31813 |
-+++ linux-2.6.38.3/fs/open.c 2011-04-17 15:57:32.000000000 -0400 |
31814 |
+diff -urNp linux-2.6.38.4/fs/open.c linux-2.6.38.4/fs/open.c |
31815 |
+--- linux-2.6.38.4/fs/open.c 2011-03-14 21:20:32.000000000 -0400 |
31816 |
++++ linux-2.6.38.4/fs/open.c 2011-04-17 15:57:32.000000000 -0400 |
31817 |
@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _ |
31818 |
error = locks_verify_truncate(inode, NULL, length); |
31819 |
if (!error) |
31820 |
@@ -34127,9 +32428,9 @@ diff -urNp linux-2.6.38.3/fs/open.c linux-2.6.38.3/fs/open.c |
31821 |
if (IS_ERR(f)) { |
31822 |
put_unused_fd(fd); |
31823 |
fd = PTR_ERR(f); |
31824 |
-diff -urNp linux-2.6.38.3/fs/partitions/ldm.c linux-2.6.38.3/fs/partitions/ldm.c |
31825 |
---- linux-2.6.38.3/fs/partitions/ldm.c 2011-03-14 21:20:32.000000000 -0400 |
31826 |
-+++ linux-2.6.38.3/fs/partitions/ldm.c 2011-04-18 19:31:25.000000000 -0400 |
31827 |
+diff -urNp linux-2.6.38.4/fs/partitions/ldm.c linux-2.6.38.4/fs/partitions/ldm.c |
31828 |
+--- linux-2.6.38.4/fs/partitions/ldm.c 2011-03-14 21:20:32.000000000 -0400 |
31829 |
++++ linux-2.6.38.4/fs/partitions/ldm.c 2011-04-18 19:31:25.000000000 -0400 |
31830 |
@@ -1299,6 +1299,11 @@ static bool ldm_frag_add (const u8 *data |
31831 |
|
31832 |
BUG_ON (!data || !frags); |
31833 |
@@ -34176,9 +32477,9 @@ diff -urNp linux-2.6.38.3/fs/partitions/ldm.c linux-2.6.38.3/fs/partitions/ldm.c |
31834 |
memcpy (f->data+rec*(size-VBLK_SIZE_HEAD)+VBLK_SIZE_HEAD, data, size); |
31835 |
|
31836 |
return true; |
31837 |
-diff -urNp linux-2.6.38.3/fs/pipe.c linux-2.6.38.3/fs/pipe.c |
31838 |
---- linux-2.6.38.3/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400 |
31839 |
-+++ linux-2.6.38.3/fs/pipe.c 2011-04-17 15:57:32.000000000 -0400 |
31840 |
+diff -urNp linux-2.6.38.4/fs/pipe.c linux-2.6.38.4/fs/pipe.c |
31841 |
+--- linux-2.6.38.4/fs/pipe.c 2011-03-14 21:20:32.000000000 -0400 |
31842 |
++++ linux-2.6.38.4/fs/pipe.c 2011-04-17 15:57:32.000000000 -0400 |
31843 |
@@ -420,9 +420,9 @@ redo: |
31844 |
} |
31845 |
if (bufs) /* More to do? */ |
31846 |
@@ -34302,9 +32603,9 @@ diff -urNp linux-2.6.38.3/fs/pipe.c linux-2.6.38.3/fs/pipe.c |
31847 |
inode->i_fop = &rdwr_pipefifo_fops; |
31848 |
|
31849 |
/* |
31850 |
-diff -urNp linux-2.6.38.3/fs/proc/array.c linux-2.6.38.3/fs/proc/array.c |
31851 |
---- linux-2.6.38.3/fs/proc/array.c 2011-04-18 17:27:16.000000000 -0400 |
31852 |
-+++ linux-2.6.38.3/fs/proc/array.c 2011-04-17 15:57:32.000000000 -0400 |
31853 |
+diff -urNp linux-2.6.38.4/fs/proc/array.c linux-2.6.38.4/fs/proc/array.c |
31854 |
+--- linux-2.6.38.4/fs/proc/array.c 2011-04-18 17:27:16.000000000 -0400 |
31855 |
++++ linux-2.6.38.4/fs/proc/array.c 2011-04-20 18:14:54.000000000 -0400 |
31856 |
@@ -60,6 +60,7 @@ |
31857 |
#include <linux/tty.h> |
31858 |
#include <linux/string.h> |
31859 |
@@ -34396,7 +32697,7 @@ diff -urNp linux-2.6.38.3/fs/proc/array.c linux-2.6.38.3/fs/proc/array.c |
31860 |
esp, |
31861 |
eip, |
31862 |
/* The signal information here is obsolete. |
31863 |
-@@ -544,3 +594,10 @@ int proc_pid_statm(struct seq_file *m, s |
31864 |
+@@ -544,3 +594,18 @@ int proc_pid_statm(struct seq_file *m, s |
31865 |
|
31866 |
return 0; |
31867 |
} |
31868 |
@@ -34404,12 +32705,20 @@ diff -urNp linux-2.6.38.3/fs/proc/array.c linux-2.6.38.3/fs/proc/array.c |
31869 |
+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR |
31870 |
+int proc_pid_ipaddr(struct task_struct *task, char *buffer) |
31871 |
+{ |
31872 |
-+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); |
31873 |
++ u32 curr_ip = 0; |
31874 |
++ unsigned long flags; |
31875 |
++ |
31876 |
++ if (lock_task_sighand(task, &flags)) { |
31877 |
++ curr_ip = task->signal->curr_ip; |
31878 |
++ unlock_task_sighand(task, &flags); |
31879 |
++ } |
31880 |
++ |
31881 |
++ return sprintf(buffer, "%pI4\n", &curr_ip); |
31882 |
+} |
31883 |
+#endif |
31884 |
-diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c |
31885 |
---- linux-2.6.38.3/fs/proc/base.c 2011-03-14 21:20:32.000000000 -0400 |
31886 |
-+++ linux-2.6.38.3/fs/proc/base.c 2011-04-18 19:26:45.000000000 -0400 |
31887 |
+diff -urNp linux-2.6.38.4/fs/proc/base.c linux-2.6.38.4/fs/proc/base.c |
31888 |
+--- linux-2.6.38.4/fs/proc/base.c 2011-04-22 19:20:59.000000000 -0400 |
31889 |
++++ linux-2.6.38.4/fs/proc/base.c 2011-04-22 19:21:23.000000000 -0400 |
31890 |
@@ -104,6 +104,22 @@ struct pid_entry { |
31891 |
union proc_op op; |
31892 |
}; |
31893 |
@@ -34775,14 +33084,10 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c |
31894 |
put_task_struct(task); |
31895 |
out: |
31896 |
return result; |
31897 |
-@@ -3066,11 +3189,21 @@ static int proc_pid_fill_cache(struct fi |
31898 |
- /* for the /proc/ directory itself, after non-process stuff has been done */ |
31899 |
- int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) |
31900 |
- { |
31901 |
-- unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; |
31902 |
-- struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); |
31903 |
-+ unsigned int nr; |
31904 |
-+ struct task_struct *reaper; |
31905 |
+@@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp, |
31906 |
+ { |
31907 |
+ unsigned int nr; |
31908 |
+ struct task_struct *reaper; |
31909 |
+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) |
31910 |
+ const struct cred *tmpcred = current_cred(); |
31911 |
+ const struct cred *itercred; |
31912 |
@@ -34791,15 +33096,7 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c |
31913 |
struct tgid_iter iter; |
31914 |
struct pid_namespace *ns; |
31915 |
|
31916 |
-+ if (filp->f_pos >= PID_MAX_LIMIT + TGID_OFFSET) |
31917 |
-+ goto out_no_task; |
31918 |
-+ nr = filp->f_pos - FIRST_PROCESS_ENTRY; |
31919 |
-+ |
31920 |
-+ reaper = get_proc_task(filp->f_path.dentry->d_inode); |
31921 |
- if (!reaper) |
31922 |
- goto out_no_task; |
31923 |
- |
31924 |
-@@ -3086,8 +3219,27 @@ int proc_pid_readdir(struct file * filp, |
31925 |
+@@ -3091,8 +3219,27 @@ int proc_pid_readdir(struct file * filp, |
31926 |
for (iter = next_tgid(ns, iter); |
31927 |
iter.task; |
31928 |
iter.tgid += 1, iter = next_tgid(ns, iter)) { |
31929 |
@@ -34828,7 +33125,7 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c |
31930 |
put_task_struct(iter.task); |
31931 |
goto out; |
31932 |
} |
31933 |
-@@ -3114,7 +3266,7 @@ static const struct pid_entry tid_base_s |
31934 |
+@@ -3119,7 +3266,7 @@ static const struct pid_entry tid_base_s |
31935 |
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), |
31936 |
#endif |
31937 |
REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), |
31938 |
@@ -34837,7 +33134,7 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c |
31939 |
INF("syscall", S_IRUSR, proc_pid_syscall), |
31940 |
#endif |
31941 |
INF("cmdline", S_IRUGO, proc_pid_cmdline), |
31942 |
-@@ -3138,10 +3290,10 @@ static const struct pid_entry tid_base_s |
31943 |
+@@ -3143,10 +3290,10 @@ static const struct pid_entry tid_base_s |
31944 |
#ifdef CONFIG_SECURITY |
31945 |
DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), |
31946 |
#endif |
31947 |
@@ -34850,9 +33147,9 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c |
31948 |
ONE("stack", S_IRUSR, proc_pid_stack), |
31949 |
#endif |
31950 |
#ifdef CONFIG_SCHEDSTATS |
31951 |
-diff -urNp linux-2.6.38.3/fs/proc/cmdline.c linux-2.6.38.3/fs/proc/cmdline.c |
31952 |
---- linux-2.6.38.3/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400 |
31953 |
-+++ linux-2.6.38.3/fs/proc/cmdline.c 2011-04-17 15:57:32.000000000 -0400 |
31954 |
+diff -urNp linux-2.6.38.4/fs/proc/cmdline.c linux-2.6.38.4/fs/proc/cmdline.c |
31955 |
+--- linux-2.6.38.4/fs/proc/cmdline.c 2011-03-14 21:20:32.000000000 -0400 |
31956 |
++++ linux-2.6.38.4/fs/proc/cmdline.c 2011-04-17 15:57:32.000000000 -0400 |
31957 |
@@ -23,7 +23,11 @@ static const struct file_operations cmdl |
31958 |
|
31959 |
static int __init proc_cmdline_init(void) |
31960 |
@@ -34865,9 +33162,9 @@ diff -urNp linux-2.6.38.3/fs/proc/cmdline.c linux-2.6.38.3/fs/proc/cmdline.c |
31961 |
return 0; |
31962 |
} |
31963 |
module_init(proc_cmdline_init); |
31964 |
-diff -urNp linux-2.6.38.3/fs/proc/devices.c linux-2.6.38.3/fs/proc/devices.c |
31965 |
---- linux-2.6.38.3/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400 |
31966 |
-+++ linux-2.6.38.3/fs/proc/devices.c 2011-04-17 15:57:32.000000000 -0400 |
31967 |
+diff -urNp linux-2.6.38.4/fs/proc/devices.c linux-2.6.38.4/fs/proc/devices.c |
31968 |
+--- linux-2.6.38.4/fs/proc/devices.c 2011-03-14 21:20:32.000000000 -0400 |
31969 |
++++ linux-2.6.38.4/fs/proc/devices.c 2011-04-17 15:57:32.000000000 -0400 |
31970 |
@@ -64,7 +64,11 @@ static const struct file_operations proc |
31971 |
|
31972 |
static int __init proc_devices_init(void) |
31973 |
@@ -34880,9 +33177,9 @@ diff -urNp linux-2.6.38.3/fs/proc/devices.c linux-2.6.38.3/fs/proc/devices.c |
31974 |
return 0; |
31975 |
} |
31976 |
module_init(proc_devices_init); |
31977 |
-diff -urNp linux-2.6.38.3/fs/proc/inode.c linux-2.6.38.3/fs/proc/inode.c |
31978 |
---- linux-2.6.38.3/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400 |
31979 |
-+++ linux-2.6.38.3/fs/proc/inode.c 2011-04-17 15:57:32.000000000 -0400 |
31980 |
+diff -urNp linux-2.6.38.4/fs/proc/inode.c linux-2.6.38.4/fs/proc/inode.c |
31981 |
+--- linux-2.6.38.4/fs/proc/inode.c 2011-03-14 21:20:32.000000000 -0400 |
31982 |
++++ linux-2.6.38.4/fs/proc/inode.c 2011-04-17 15:57:32.000000000 -0400 |
31983 |
@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe |
31984 |
if (de->mode) { |
31985 |
inode->i_mode = de->mode; |
31986 |
@@ -34895,9 +33192,9 @@ diff -urNp linux-2.6.38.3/fs/proc/inode.c linux-2.6.38.3/fs/proc/inode.c |
31987 |
} |
31988 |
if (de->size) |
31989 |
inode->i_size = de->size; |
31990 |
-diff -urNp linux-2.6.38.3/fs/proc/internal.h linux-2.6.38.3/fs/proc/internal.h |
31991 |
---- linux-2.6.38.3/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -0400 |
31992 |
-+++ linux-2.6.38.3/fs/proc/internal.h 2011-04-17 15:57:32.000000000 -0400 |
31993 |
+diff -urNp linux-2.6.38.4/fs/proc/internal.h linux-2.6.38.4/fs/proc/internal.h |
31994 |
+--- linux-2.6.38.4/fs/proc/internal.h 2011-03-14 21:20:32.000000000 -0400 |
31995 |
++++ linux-2.6.38.4/fs/proc/internal.h 2011-04-17 15:57:32.000000000 -0400 |
31996 |
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi |
31997 |
struct pid *pid, struct task_struct *task); |
31998 |
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, |
31999 |
@@ -34908,9 +33205,9 @@ diff -urNp linux-2.6.38.3/fs/proc/internal.h linux-2.6.38.3/fs/proc/internal.h |
32000 |
extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); |
32001 |
|
32002 |
extern const struct file_operations proc_maps_operations; |
32003 |
-diff -urNp linux-2.6.38.3/fs/proc/Kconfig linux-2.6.38.3/fs/proc/Kconfig |
32004 |
---- linux-2.6.38.3/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
32005 |
-+++ linux-2.6.38.3/fs/proc/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
32006 |
+diff -urNp linux-2.6.38.4/fs/proc/Kconfig linux-2.6.38.4/fs/proc/Kconfig |
32007 |
+--- linux-2.6.38.4/fs/proc/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
32008 |
++++ linux-2.6.38.4/fs/proc/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
32009 |
@@ -30,12 +30,12 @@ config PROC_FS |
32010 |
|
32011 |
config PROC_KCORE |
32012 |
@@ -34938,9 +33235,9 @@ diff -urNp linux-2.6.38.3/fs/proc/Kconfig linux-2.6.38.3/fs/proc/Kconfig |
32013 |
bool "Enable /proc page monitoring" if EXPERT |
32014 |
help |
32015 |
Various /proc files exist to monitor process memory utilization: |
32016 |
-diff -urNp linux-2.6.38.3/fs/proc/kcore.c linux-2.6.38.3/fs/proc/kcore.c |
32017 |
---- linux-2.6.38.3/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400 |
32018 |
-+++ linux-2.6.38.3/fs/proc/kcore.c 2011-04-17 15:57:32.000000000 -0400 |
32019 |
+diff -urNp linux-2.6.38.4/fs/proc/kcore.c linux-2.6.38.4/fs/proc/kcore.c |
32020 |
+--- linux-2.6.38.4/fs/proc/kcore.c 2011-03-14 21:20:32.000000000 -0400 |
32021 |
++++ linux-2.6.38.4/fs/proc/kcore.c 2011-04-17 15:57:32.000000000 -0400 |
32022 |
@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use |
32023 |
* the addresses in the elf_phdr on our list. |
32024 |
*/ |
32025 |
@@ -34999,9 +33296,9 @@ diff -urNp linux-2.6.38.3/fs/proc/kcore.c linux-2.6.38.3/fs/proc/kcore.c |
32026 |
if (!capable(CAP_SYS_RAWIO)) |
32027 |
return -EPERM; |
32028 |
if (kcore_need_update) |
32029 |
-diff -urNp linux-2.6.38.3/fs/proc/meminfo.c linux-2.6.38.3/fs/proc/meminfo.c |
32030 |
---- linux-2.6.38.3/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400 |
32031 |
-+++ linux-2.6.38.3/fs/proc/meminfo.c 2011-04-17 15:57:32.000000000 -0400 |
32032 |
+diff -urNp linux-2.6.38.4/fs/proc/meminfo.c linux-2.6.38.4/fs/proc/meminfo.c |
32033 |
+--- linux-2.6.38.4/fs/proc/meminfo.c 2011-03-14 21:20:32.000000000 -0400 |
32034 |
++++ linux-2.6.38.4/fs/proc/meminfo.c 2011-04-17 15:57:32.000000000 -0400 |
32035 |
@@ -157,7 +157,7 @@ static int meminfo_proc_show(struct seq_ |
32036 |
vmi.used >> 10, |
32037 |
vmi.largest_chunk >> 10 |
32038 |
@@ -35011,9 +33308,9 @@ diff -urNp linux-2.6.38.3/fs/proc/meminfo.c linux-2.6.38.3/fs/proc/meminfo.c |
32039 |
#endif |
32040 |
#ifdef CONFIG_TRANSPARENT_HUGEPAGE |
32041 |
,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * |
32042 |
-diff -urNp linux-2.6.38.3/fs/proc/nommu.c linux-2.6.38.3/fs/proc/nommu.c |
32043 |
---- linux-2.6.38.3/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400 |
32044 |
-+++ linux-2.6.38.3/fs/proc/nommu.c 2011-04-17 15:57:32.000000000 -0400 |
32045 |
+diff -urNp linux-2.6.38.4/fs/proc/nommu.c linux-2.6.38.4/fs/proc/nommu.c |
32046 |
+--- linux-2.6.38.4/fs/proc/nommu.c 2011-03-14 21:20:32.000000000 -0400 |
32047 |
++++ linux-2.6.38.4/fs/proc/nommu.c 2011-04-17 15:57:32.000000000 -0400 |
32048 |
@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_ |
32049 |
if (len < 1) |
32050 |
len = 1; |
32051 |
@@ -35023,9 +33320,9 @@ diff -urNp linux-2.6.38.3/fs/proc/nommu.c linux-2.6.38.3/fs/proc/nommu.c |
32052 |
} |
32053 |
|
32054 |
seq_putc(m, '\n'); |
32055 |
-diff -urNp linux-2.6.38.3/fs/proc/proc_net.c linux-2.6.38.3/fs/proc/proc_net.c |
32056 |
---- linux-2.6.38.3/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -0400 |
32057 |
-+++ linux-2.6.38.3/fs/proc/proc_net.c 2011-04-17 15:57:32.000000000 -0400 |
32058 |
+diff -urNp linux-2.6.38.4/fs/proc/proc_net.c linux-2.6.38.4/fs/proc/proc_net.c |
32059 |
+--- linux-2.6.38.4/fs/proc/proc_net.c 2011-03-14 21:20:32.000000000 -0400 |
32060 |
++++ linux-2.6.38.4/fs/proc/proc_net.c 2011-04-17 15:57:32.000000000 -0400 |
32061 |
@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str |
32062 |
struct task_struct *task; |
32063 |
struct nsproxy *ns; |
32064 |
@@ -35044,9 +33341,9 @@ diff -urNp linux-2.6.38.3/fs/proc/proc_net.c linux-2.6.38.3/fs/proc/proc_net.c |
32065 |
|
32066 |
rcu_read_lock(); |
32067 |
task = pid_task(proc_pid(dir), PIDTYPE_PID); |
32068 |
-diff -urNp linux-2.6.38.3/fs/proc/proc_sysctl.c linux-2.6.38.3/fs/proc/proc_sysctl.c |
32069 |
---- linux-2.6.38.3/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -0400 |
32070 |
-+++ linux-2.6.38.3/fs/proc/proc_sysctl.c 2011-04-17 15:57:32.000000000 -0400 |
32071 |
+diff -urNp linux-2.6.38.4/fs/proc/proc_sysctl.c linux-2.6.38.4/fs/proc/proc_sysctl.c |
32072 |
+--- linux-2.6.38.4/fs/proc/proc_sysctl.c 2011-03-14 21:20:32.000000000 -0400 |
32073 |
++++ linux-2.6.38.4/fs/proc/proc_sysctl.c 2011-04-17 15:57:32.000000000 -0400 |
32074 |
@@ -8,6 +8,8 @@ |
32075 |
#include <linux/namei.h> |
32076 |
#include "internal.h" |
32077 |
@@ -35086,9 +33383,9 @@ diff -urNp linux-2.6.38.3/fs/proc/proc_sysctl.c linux-2.6.38.3/fs/proc/proc_sysc |
32078 |
generic_fillattr(inode, stat); |
32079 |
if (table) |
32080 |
stat->mode = (stat->mode & S_IFMT) | table->mode; |
32081 |
-diff -urNp linux-2.6.38.3/fs/proc/root.c linux-2.6.38.3/fs/proc/root.c |
32082 |
---- linux-2.6.38.3/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400 |
32083 |
-+++ linux-2.6.38.3/fs/proc/root.c 2011-04-17 15:57:32.000000000 -0400 |
32084 |
+diff -urNp linux-2.6.38.4/fs/proc/root.c linux-2.6.38.4/fs/proc/root.c |
32085 |
+--- linux-2.6.38.4/fs/proc/root.c 2011-03-14 21:20:32.000000000 -0400 |
32086 |
++++ linux-2.6.38.4/fs/proc/root.c 2011-04-17 15:57:32.000000000 -0400 |
32087 |
@@ -132,7 +132,15 @@ void __init proc_root_init(void) |
32088 |
#ifdef CONFIG_PROC_DEVICETREE |
32089 |
proc_device_tree_init(); |
32090 |
@@ -35105,9 +33402,9 @@ diff -urNp linux-2.6.38.3/fs/proc/root.c linux-2.6.38.3/fs/proc/root.c |
32091 |
proc_sys_init(); |
32092 |
} |
32093 |
|
32094 |
-diff -urNp linux-2.6.38.3/fs/proc/task_mmu.c linux-2.6.38.3/fs/proc/task_mmu.c |
32095 |
---- linux-2.6.38.3/fs/proc/task_mmu.c 2011-04-18 17:27:16.000000000 -0400 |
32096 |
-+++ linux-2.6.38.3/fs/proc/task_mmu.c 2011-04-18 19:35:47.000000000 -0400 |
32097 |
+diff -urNp linux-2.6.38.4/fs/proc/task_mmu.c linux-2.6.38.4/fs/proc/task_mmu.c |
32098 |
+--- linux-2.6.38.4/fs/proc/task_mmu.c 2011-04-18 17:27:16.000000000 -0400 |
32099 |
++++ linux-2.6.38.4/fs/proc/task_mmu.c 2011-04-18 19:35:47.000000000 -0400 |
32100 |
@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct |
32101 |
"VmExe:\t%8lu kB\n" |
32102 |
"VmLib:\t%8lu kB\n" |
32103 |
@@ -35257,9 +33554,9 @@ diff -urNp linux-2.6.38.3/fs/proc/task_mmu.c linux-2.6.38.3/fs/proc/task_mmu.c |
32104 |
mss.resident >> 10, |
32105 |
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)), |
32106 |
mss.shared_clean >> 10, |
32107 |
-diff -urNp linux-2.6.38.3/fs/proc/task_nommu.c linux-2.6.38.3/fs/proc/task_nommu.c |
32108 |
---- linux-2.6.38.3/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0400 |
32109 |
-+++ linux-2.6.38.3/fs/proc/task_nommu.c 2011-04-17 15:57:32.000000000 -0400 |
32110 |
+diff -urNp linux-2.6.38.4/fs/proc/task_nommu.c linux-2.6.38.4/fs/proc/task_nommu.c |
32111 |
+--- linux-2.6.38.4/fs/proc/task_nommu.c 2011-03-14 21:20:32.000000000 -0400 |
32112 |
++++ linux-2.6.38.4/fs/proc/task_nommu.c 2011-04-17 15:57:32.000000000 -0400 |
32113 |
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct |
32114 |
else |
32115 |
bytes += kobjsize(mm); |
32116 |
@@ -35278,9 +33575,9 @@ diff -urNp linux-2.6.38.3/fs/proc/task_nommu.c linux-2.6.38.3/fs/proc/task_nommu |
32117 |
} else if (mm) { |
32118 |
if (vma->vm_start <= mm->start_stack && |
32119 |
vma->vm_end >= mm->start_stack) { |
32120 |
-diff -urNp linux-2.6.38.3/fs/readdir.c linux-2.6.38.3/fs/readdir.c |
32121 |
---- linux-2.6.38.3/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400 |
32122 |
-+++ linux-2.6.38.3/fs/readdir.c 2011-04-17 15:57:32.000000000 -0400 |
32123 |
+diff -urNp linux-2.6.38.4/fs/readdir.c linux-2.6.38.4/fs/readdir.c |
32124 |
+--- linux-2.6.38.4/fs/readdir.c 2011-03-14 21:20:32.000000000 -0400 |
32125 |
++++ linux-2.6.38.4/fs/readdir.c 2011-04-17 15:57:32.000000000 -0400 |
32126 |
@@ -17,6 +17,7 @@ |
32127 |
#include <linux/security.h> |
32128 |
#include <linux/syscalls.h> |
32129 |
@@ -35370,9 +33667,9 @@ diff -urNp linux-2.6.38.3/fs/readdir.c linux-2.6.38.3/fs/readdir.c |
32130 |
buf.count = count; |
32131 |
buf.error = 0; |
32132 |
|
32133 |
-diff -urNp linux-2.6.38.3/fs/reiserfs/do_balan.c linux-2.6.38.3/fs/reiserfs/do_balan.c |
32134 |
---- linux-2.6.38.3/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 -0400 |
32135 |
-+++ linux-2.6.38.3/fs/reiserfs/do_balan.c 2011-04-17 15:57:32.000000000 -0400 |
32136 |
+diff -urNp linux-2.6.38.4/fs/reiserfs/do_balan.c linux-2.6.38.4/fs/reiserfs/do_balan.c |
32137 |
+--- linux-2.6.38.4/fs/reiserfs/do_balan.c 2011-03-14 21:20:32.000000000 -0400 |
32138 |
++++ linux-2.6.38.4/fs/reiserfs/do_balan.c 2011-04-17 15:57:32.000000000 -0400 |
32139 |
@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, |
32140 |
return; |
32141 |
} |
32142 |
@@ -35382,9 +33679,9 @@ diff -urNp linux-2.6.38.3/fs/reiserfs/do_balan.c linux-2.6.38.3/fs/reiserfs/do_b |
32143 |
do_balance_starts(tb); |
32144 |
|
32145 |
/* balance leaf returns 0 except if combining L R and S into |
32146 |
-diff -urNp linux-2.6.38.3/fs/reiserfs/item_ops.c linux-2.6.38.3/fs/reiserfs/item_ops.c |
32147 |
---- linux-2.6.38.3/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 -0400 |
32148 |
-+++ linux-2.6.38.3/fs/reiserfs/item_ops.c 2011-04-17 15:57:32.000000000 -0400 |
32149 |
+diff -urNp linux-2.6.38.4/fs/reiserfs/item_ops.c linux-2.6.38.4/fs/reiserfs/item_ops.c |
32150 |
+--- linux-2.6.38.4/fs/reiserfs/item_ops.c 2011-03-14 21:20:32.000000000 -0400 |
32151 |
++++ linux-2.6.38.4/fs/reiserfs/item_ops.c 2011-04-17 15:57:32.000000000 -0400 |
32152 |
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i |
32153 |
vi->vi_index, vi->vi_type, vi->vi_ih); |
32154 |
} |
32155 |
@@ -35439,9 +33736,9 @@ diff -urNp linux-2.6.38.3/fs/reiserfs/item_ops.c linux-2.6.38.3/fs/reiserfs/item |
32156 |
&stat_data_ops, |
32157 |
&indirect_ops, |
32158 |
&direct_ops, |
32159 |
-diff -urNp linux-2.6.38.3/fs/reiserfs/procfs.c linux-2.6.38.3/fs/reiserfs/procfs.c |
32160 |
---- linux-2.6.38.3/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0400 |
32161 |
-+++ linux-2.6.38.3/fs/reiserfs/procfs.c 2011-04-17 15:57:32.000000000 -0400 |
32162 |
+diff -urNp linux-2.6.38.4/fs/reiserfs/procfs.c linux-2.6.38.4/fs/reiserfs/procfs.c |
32163 |
+--- linux-2.6.38.4/fs/reiserfs/procfs.c 2011-03-14 21:20:32.000000000 -0400 |
32164 |
++++ linux-2.6.38.4/fs/reiserfs/procfs.c 2011-04-17 15:57:32.000000000 -0400 |
32165 |
@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m |
32166 |
"SMALL_TAILS " : "NO_TAILS ", |
32167 |
replay_only(sb) ? "REPLAY_ONLY " : "", |
32168 |
@@ -35451,9 +33748,9 @@ diff -urNp linux-2.6.38.3/fs/reiserfs/procfs.c linux-2.6.38.3/fs/reiserfs/procfs |
32169 |
SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), |
32170 |
SF(s_do_balance), SF(s_unneeded_left_neighbor), |
32171 |
SF(s_good_search_by_key_reada), SF(s_bmaps), |
32172 |
-diff -urNp linux-2.6.38.3/fs/select.c linux-2.6.38.3/fs/select.c |
32173 |
---- linux-2.6.38.3/fs/select.c 2011-03-14 21:20:32.000000000 -0400 |
32174 |
-+++ linux-2.6.38.3/fs/select.c 2011-04-17 15:57:32.000000000 -0400 |
32175 |
+diff -urNp linux-2.6.38.4/fs/select.c linux-2.6.38.4/fs/select.c |
32176 |
+--- linux-2.6.38.4/fs/select.c 2011-03-14 21:20:32.000000000 -0400 |
32177 |
++++ linux-2.6.38.4/fs/select.c 2011-04-17 15:57:32.000000000 -0400 |
32178 |
@@ -20,6 +20,7 @@ |
32179 |
#include <linux/module.h> |
32180 |
#include <linux/slab.h> |
32181 |
@@ -35470,9 +33767,9 @@ diff -urNp linux-2.6.38.3/fs/select.c linux-2.6.38.3/fs/select.c |
32182 |
if (nfds > rlimit(RLIMIT_NOFILE)) |
32183 |
return -EINVAL; |
32184 |
|
32185 |
-diff -urNp linux-2.6.38.3/fs/seq_file.c linux-2.6.38.3/fs/seq_file.c |
32186 |
---- linux-2.6.38.3/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400 |
32187 |
-+++ linux-2.6.38.3/fs/seq_file.c 2011-04-17 15:57:32.000000000 -0400 |
32188 |
+diff -urNp linux-2.6.38.4/fs/seq_file.c linux-2.6.38.4/fs/seq_file.c |
32189 |
+--- linux-2.6.38.4/fs/seq_file.c 2011-03-14 21:20:32.000000000 -0400 |
32190 |
++++ linux-2.6.38.4/fs/seq_file.c 2011-04-17 15:57:32.000000000 -0400 |
32191 |
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, |
32192 |
return 0; |
32193 |
} |
32194 |
@@ -35513,9 +33810,9 @@ diff -urNp linux-2.6.38.3/fs/seq_file.c linux-2.6.38.3/fs/seq_file.c |
32195 |
if (!m->buf) |
32196 |
goto Enomem; |
32197 |
m->count = 0; |
32198 |
-diff -urNp linux-2.6.38.3/fs/splice.c linux-2.6.38.3/fs/splice.c |
32199 |
---- linux-2.6.38.3/fs/splice.c 2011-03-14 21:20:32.000000000 -0400 |
32200 |
-+++ linux-2.6.38.3/fs/splice.c 2011-04-17 15:57:32.000000000 -0400 |
32201 |
+diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c |
32202 |
+--- linux-2.6.38.4/fs/splice.c 2011-03-14 21:20:32.000000000 -0400 |
32203 |
++++ linux-2.6.38.4/fs/splice.c 2011-04-17 15:57:32.000000000 -0400 |
32204 |
@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode |
32205 |
pipe_lock(pipe); |
32206 |
|
32207 |
@@ -35654,9 +33951,9 @@ diff -urNp linux-2.6.38.3/fs/splice.c linux-2.6.38.3/fs/splice.c |
32208 |
ret = -EAGAIN; |
32209 |
|
32210 |
pipe_unlock(ipipe); |
32211 |
-diff -urNp linux-2.6.38.3/fs/sysfs/mount.c linux-2.6.38.3/fs/sysfs/mount.c |
32212 |
---- linux-2.6.38.3/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400 |
32213 |
-+++ linux-2.6.38.3/fs/sysfs/mount.c 2011-04-17 15:57:32.000000000 -0400 |
32214 |
+diff -urNp linux-2.6.38.4/fs/sysfs/mount.c linux-2.6.38.4/fs/sysfs/mount.c |
32215 |
+--- linux-2.6.38.4/fs/sysfs/mount.c 2011-03-14 21:20:32.000000000 -0400 |
32216 |
++++ linux-2.6.38.4/fs/sysfs/mount.c 2011-04-17 15:57:32.000000000 -0400 |
32217 |
@@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = { |
32218 |
.s_name = "", |
32219 |
.s_count = ATOMIC_INIT(1), |
32220 |
@@ -35669,9 +33966,9 @@ diff -urNp linux-2.6.38.3/fs/sysfs/mount.c linux-2.6.38.3/fs/sysfs/mount.c |
32221 |
.s_ino = 1, |
32222 |
}; |
32223 |
|
32224 |
-diff -urNp linux-2.6.38.3/fs/sysfs/symlink.c linux-2.6.38.3/fs/sysfs/symlink.c |
32225 |
---- linux-2.6.38.3/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -0400 |
32226 |
-+++ linux-2.6.38.3/fs/sysfs/symlink.c 2011-04-17 15:57:32.000000000 -0400 |
32227 |
+diff -urNp linux-2.6.38.4/fs/sysfs/symlink.c linux-2.6.38.4/fs/sysfs/symlink.c |
32228 |
+--- linux-2.6.38.4/fs/sysfs/symlink.c 2011-03-14 21:20:32.000000000 -0400 |
32229 |
++++ linux-2.6.38.4/fs/sysfs/symlink.c 2011-04-17 15:57:32.000000000 -0400 |
32230 |
@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de |
32231 |
|
32232 |
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) |
32233 |
@@ -35681,46 +33978,9 @@ diff -urNp linux-2.6.38.3/fs/sysfs/symlink.c linux-2.6.38.3/fs/sysfs/symlink.c |
32234 |
if (!IS_ERR(page)) |
32235 |
free_page((unsigned long)page); |
32236 |
} |
32237 |
-diff -urNp linux-2.6.38.3/fs/ubifs/debug.c linux-2.6.38.3/fs/ubifs/debug.c |
32238 |
---- linux-2.6.38.3/fs/ubifs/debug.c 2011-04-18 17:27:18.000000000 -0400 |
32239 |
-+++ linux-2.6.38.3/fs/ubifs/debug.c 2011-04-17 16:53:48.000000000 -0400 |
32240 |
-@@ -2844,19 +2844,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf |
32241 |
- } |
32242 |
- |
32243 |
- fname = "dump_lprops"; |
32244 |
-- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
32245 |
-+ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
32246 |
- if (IS_ERR(dent)) |
32247 |
- goto out_remove; |
32248 |
- d->dfs_dump_lprops = dent; |
32249 |
- |
32250 |
- fname = "dump_budg"; |
32251 |
-- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
32252 |
-+ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
32253 |
- if (IS_ERR(dent)) |
32254 |
- goto out_remove; |
32255 |
- d->dfs_dump_budg = dent; |
32256 |
- |
32257 |
- fname = "dump_tnc"; |
32258 |
-- dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops); |
32259 |
-+ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops); |
32260 |
- if (IS_ERR(dent)) |
32261 |
- goto out_remove; |
32262 |
- d->dfs_dump_tnc = dent; |
32263 |
-diff -urNp linux-2.6.38.3/fs/udf/misc.c linux-2.6.38.3/fs/udf/misc.c |
32264 |
---- linux-2.6.38.3/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400 |
32265 |
-+++ linux-2.6.38.3/fs/udf/misc.c 2011-04-17 15:57:32.000000000 -0400 |
32266 |
-@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat |
32267 |
- iinfo->i_lenEAttr += size; |
32268 |
- return (struct genericFormat *)&ea[offset]; |
32269 |
- } |
32270 |
-- if (loc & 0x02) |
32271 |
-- ; |
32272 |
-+ if (loc & 0x02) { |
32273 |
-+ } |
32274 |
- |
32275 |
- return NULL; |
32276 |
- } |
32277 |
+diff -urNp linux-2.6.38.4/fs/udf/misc.c linux-2.6.38.4/fs/udf/misc.c |
32278 |
+--- linux-2.6.38.4/fs/udf/misc.c 2011-03-14 21:20:32.000000000 -0400 |
32279 |
++++ linux-2.6.38.4/fs/udf/misc.c 2011-04-23 12:47:28.000000000 -0400 |
32280 |
@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id |
32281 |
|
32282 |
u8 udf_tag_checksum(const struct tag *t) |
32283 |
@@ -35730,21 +33990,9 @@ diff -urNp linux-2.6.38.3/fs/udf/misc.c linux-2.6.38.3/fs/udf/misc.c |
32284 |
u8 checksum = 0; |
32285 |
int i; |
32286 |
for (i = 0; i < sizeof(struct tag); ++i) |
32287 |
-diff -urNp linux-2.6.38.3/fs/udf/udfdecl.h linux-2.6.38.3/fs/udf/udfdecl.h |
32288 |
---- linux-2.6.38.3/fs/udf/udfdecl.h 2011-03-14 21:20:32.000000000 -0400 |
32289 |
-+++ linux-2.6.38.3/fs/udf/udfdecl.h 2011-04-17 15:57:32.000000000 -0400 |
32290 |
-@@ -26,7 +26,7 @@ do { \ |
32291 |
- printk(f, ##a); \ |
32292 |
- } while (0) |
32293 |
- #else |
32294 |
--#define udf_debug(f, a...) /**/ |
32295 |
-+#define udf_debug(f, a...) do {} while (0) |
32296 |
- #endif |
32297 |
- |
32298 |
- #define udf_info(f, a...) \ |
32299 |
-diff -urNp linux-2.6.38.3/fs/utimes.c linux-2.6.38.3/fs/utimes.c |
32300 |
---- linux-2.6.38.3/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400 |
32301 |
-+++ linux-2.6.38.3/fs/utimes.c 2011-04-17 15:57:32.000000000 -0400 |
32302 |
+diff -urNp linux-2.6.38.4/fs/utimes.c linux-2.6.38.4/fs/utimes.c |
32303 |
+--- linux-2.6.38.4/fs/utimes.c 2011-03-14 21:20:32.000000000 -0400 |
32304 |
++++ linux-2.6.38.4/fs/utimes.c 2011-04-17 15:57:32.000000000 -0400 |
32305 |
@@ -1,6 +1,7 @@ |
32306 |
#include <linux/compiler.h> |
32307 |
#include <linux/file.h> |
32308 |
@@ -35766,9 +34014,9 @@ diff -urNp linux-2.6.38.3/fs/utimes.c linux-2.6.38.3/fs/utimes.c |
32309 |
mutex_lock(&inode->i_mutex); |
32310 |
error = notify_change(path->dentry, &newattrs); |
32311 |
mutex_unlock(&inode->i_mutex); |
32312 |
-diff -urNp linux-2.6.38.3/fs/xattr_acl.c linux-2.6.38.3/fs/xattr_acl.c |
32313 |
---- linux-2.6.38.3/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400 |
32314 |
-+++ linux-2.6.38.3/fs/xattr_acl.c 2011-04-17 15:57:32.000000000 -0400 |
32315 |
+diff -urNp linux-2.6.38.4/fs/xattr_acl.c linux-2.6.38.4/fs/xattr_acl.c |
32316 |
+--- linux-2.6.38.4/fs/xattr_acl.c 2011-03-14 21:20:32.000000000 -0400 |
32317 |
++++ linux-2.6.38.4/fs/xattr_acl.c 2011-04-17 15:57:32.000000000 -0400 |
32318 |
@@ -17,8 +17,8 @@ |
32319 |
struct posix_acl * |
32320 |
posix_acl_from_xattr(const void *value, size_t size) |
32321 |
@@ -35780,9 +34028,9 @@ diff -urNp linux-2.6.38.3/fs/xattr_acl.c linux-2.6.38.3/fs/xattr_acl.c |
32322 |
int count; |
32323 |
struct posix_acl *acl; |
32324 |
struct posix_acl_entry *acl_e; |
32325 |
-diff -urNp linux-2.6.38.3/fs/xattr.c linux-2.6.38.3/fs/xattr.c |
32326 |
---- linux-2.6.38.3/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400 |
32327 |
-+++ linux-2.6.38.3/fs/xattr.c 2011-04-17 15:57:32.000000000 -0400 |
32328 |
+diff -urNp linux-2.6.38.4/fs/xattr.c linux-2.6.38.4/fs/xattr.c |
32329 |
+--- linux-2.6.38.4/fs/xattr.c 2011-03-14 21:20:32.000000000 -0400 |
32330 |
++++ linux-2.6.38.4/fs/xattr.c 2011-04-17 15:57:32.000000000 -0400 |
32331 |
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); |
32332 |
* Extended attribute SET operations |
32333 |
*/ |
32334 |
@@ -35845,9 +34093,9 @@ diff -urNp linux-2.6.38.3/fs/xattr.c linux-2.6.38.3/fs/xattr.c |
32335 |
mnt_drop_write(f->f_path.mnt); |
32336 |
} |
32337 |
fput(f); |
32338 |
-diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c |
32339 |
---- linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.000000000 -0400 |
32340 |
-+++ linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:57:32.000000000 -0400 |
32341 |
+diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c |
32342 |
+--- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-14 21:20:32.000000000 -0400 |
32343 |
++++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:57:32.000000000 -0400 |
32344 |
@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( |
32345 |
xfs_fsop_geom_t fsgeo; |
32346 |
int error; |
32347 |
@@ -35856,9 +34104,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.3/fs/xfs/l |
32348 |
error = xfs_fs_geometry(mp, &fsgeo, 3); |
32349 |
if (error) |
32350 |
return -error; |
32351 |
-diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c |
32352 |
---- linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
32353 |
-+++ linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:08:09.000000000 -0400 |
32354 |
+diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c |
32355 |
+--- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-03-14 21:20:32.000000000 -0400 |
32356 |
++++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:08:09.000000000 -0400 |
32357 |
@@ -128,7 +128,7 @@ xfs_find_handle( |
32358 |
} |
32359 |
|
32360 |
@@ -35868,9 +34116,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.3/fs/xfs/lin |
32361 |
copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) |
32362 |
goto out_put; |
32363 |
|
32364 |
-diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c |
32365 |
---- linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.000000000 -0400 |
32366 |
-+++ linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:57:32.000000000 -0400 |
32367 |
+diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c |
32368 |
+--- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c 2011-03-14 21:20:32.000000000 -0400 |
32369 |
++++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:57:32.000000000 -0400 |
32370 |
@@ -436,7 +436,7 @@ xfs_vn_put_link( |
32371 |
struct nameidata *nd, |
32372 |
void *p) |
32373 |
@@ -35880,9 +34128,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.3/fs/xfs/linu |
32374 |
|
32375 |
if (!IS_ERR(s)) |
32376 |
kfree(s); |
32377 |
-diff -urNp linux-2.6.38.3/fs/xfs/xfs_bmap.c linux-2.6.38.3/fs/xfs/xfs_bmap.c |
32378 |
---- linux-2.6.38.3/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400 |
32379 |
-+++ linux-2.6.38.3/fs/xfs/xfs_bmap.c 2011-04-17 15:57:32.000000000 -0400 |
32380 |
+diff -urNp linux-2.6.38.4/fs/xfs/xfs_bmap.c linux-2.6.38.4/fs/xfs/xfs_bmap.c |
32381 |
+--- linux-2.6.38.4/fs/xfs/xfs_bmap.c 2011-03-14 21:20:32.000000000 -0400 |
32382 |
++++ linux-2.6.38.4/fs/xfs/xfs_bmap.c 2011-04-17 15:57:32.000000000 -0400 |
32383 |
@@ -287,7 +287,7 @@ xfs_bmap_validate_ret( |
32384 |
int nmap, |
32385 |
int ret_nmap); |
32386 |
@@ -35892,9 +34140,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/xfs_bmap.c linux-2.6.38.3/fs/xfs/xfs_bmap.c |
32387 |
#endif /* DEBUG */ |
32388 |
|
32389 |
STATIC int |
32390 |
-diff -urNp linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c |
32391 |
---- linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c 2011-03-14 21:20:32.000000000 -0400 |
32392 |
-+++ linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:03:12.000000000 -0400 |
32393 |
+diff -urNp linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c |
32394 |
+--- linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c 2011-03-14 21:20:32.000000000 -0400 |
32395 |
++++ linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:03:12.000000000 -0400 |
32396 |
@@ -780,7 +780,15 @@ xfs_dir2_sf_getdents( |
32397 |
} |
32398 |
|
32399 |
@@ -35912,9 +34160,9 @@ diff -urNp linux-2.6.38.3/fs/xfs/xfs_dir2_sf.c linux-2.6.38.3/fs/xfs/xfs_dir2_sf |
32400 |
off & 0x7fffffff, ino, DT_UNKNOWN)) { |
32401 |
*offset = off & 0x7fffffff; |
32402 |
return 0; |
32403 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_alloc.c linux-2.6.38.3/grsecurity/gracl_alloc.c |
32404 |
---- linux-2.6.38.3/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 |
32405 |
-+++ linux-2.6.38.3/grsecurity/gracl_alloc.c 2011-04-17 15:57:32.000000000 -0400 |
32406 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_alloc.c linux-2.6.38.4/grsecurity/gracl_alloc.c |
32407 |
+--- linux-2.6.38.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 |
32408 |
++++ linux-2.6.38.4/grsecurity/gracl_alloc.c 2011-04-17 15:57:32.000000000 -0400 |
32409 |
@@ -0,0 +1,105 @@ |
32410 |
+#include <linux/kernel.h> |
32411 |
+#include <linux/mm.h> |
32412 |
@@ -36021,9 +34269,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_alloc.c linux-2.6.38.3/grsecurity/gra |
32413 |
+ else |
32414 |
+ return 1; |
32415 |
+} |
32416 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl.c linux-2.6.38.3/grsecurity/gracl.c |
32417 |
---- linux-2.6.38.3/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 |
32418 |
-+++ linux-2.6.38.3/grsecurity/gracl.c 2011-04-17 15:57:32.000000000 -0400 |
32419 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl.c linux-2.6.38.4/grsecurity/gracl.c |
32420 |
+--- linux-2.6.38.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 |
32421 |
++++ linux-2.6.38.4/grsecurity/gracl.c 2011-04-17 15:57:32.000000000 -0400 |
32422 |
@@ -0,0 +1,4074 @@ |
32423 |
+#include <linux/kernel.h> |
32424 |
+#include <linux/module.h> |
32425 |
@@ -40099,9 +38347,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl.c linux-2.6.38.3/grsecurity/gracl.c |
32426 |
+EXPORT_SYMBOL(gr_check_group_change); |
32427 |
+#endif |
32428 |
+ |
32429 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_cap.c linux-2.6.38.3/grsecurity/gracl_cap.c |
32430 |
---- linux-2.6.38.3/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 |
32431 |
-+++ linux-2.6.38.3/grsecurity/gracl_cap.c 2011-04-17 15:57:32.000000000 -0400 |
32432 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_cap.c linux-2.6.38.4/grsecurity/gracl_cap.c |
32433 |
+--- linux-2.6.38.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 |
32434 |
++++ linux-2.6.38.4/grsecurity/gracl_cap.c 2011-04-17 15:57:32.000000000 -0400 |
32435 |
@@ -0,0 +1,139 @@ |
32436 |
+#include <linux/kernel.h> |
32437 |
+#include <linux/module.h> |
32438 |
@@ -40242,9 +38490,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_cap.c linux-2.6.38.3/grsecurity/gracl |
32439 |
+ return 0; |
32440 |
+} |
32441 |
+ |
32442 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_fs.c linux-2.6.38.3/grsecurity/gracl_fs.c |
32443 |
---- linux-2.6.38.3/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 |
32444 |
-+++ linux-2.6.38.3/grsecurity/gracl_fs.c 2011-04-17 15:57:32.000000000 -0400 |
32445 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_fs.c linux-2.6.38.4/grsecurity/gracl_fs.c |
32446 |
+--- linux-2.6.38.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 |
32447 |
++++ linux-2.6.38.4/grsecurity/gracl_fs.c 2011-04-17 15:57:32.000000000 -0400 |
32448 |
@@ -0,0 +1,431 @@ |
32449 |
+#include <linux/kernel.h> |
32450 |
+#include <linux/sched.h> |
32451 |
@@ -40677,9 +38925,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_fs.c linux-2.6.38.3/grsecurity/gracl_ |
32452 |
+ |
32453 |
+ return 0; |
32454 |
+} |
32455 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_ip.c linux-2.6.38.3/grsecurity/gracl_ip.c |
32456 |
---- linux-2.6.38.3/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 |
32457 |
-+++ linux-2.6.38.3/grsecurity/gracl_ip.c 2011-04-17 15:57:32.000000000 -0400 |
32458 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_ip.c linux-2.6.38.4/grsecurity/gracl_ip.c |
32459 |
+--- linux-2.6.38.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 |
32460 |
++++ linux-2.6.38.4/grsecurity/gracl_ip.c 2011-04-17 15:57:32.000000000 -0400 |
32461 |
@@ -0,0 +1,382 @@ |
32462 |
+#include <linux/kernel.h> |
32463 |
+#include <asm/uaccess.h> |
32464 |
@@ -41063,9 +39311,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_ip.c linux-2.6.38.3/grsecurity/gracl_ |
32465 |
+ |
32466 |
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); |
32467 |
+} |
32468 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_learn.c linux-2.6.38.3/grsecurity/gracl_learn.c |
32469 |
---- linux-2.6.38.3/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 |
32470 |
-+++ linux-2.6.38.3/grsecurity/gracl_learn.c 2011-04-17 15:57:32.000000000 -0400 |
32471 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_learn.c linux-2.6.38.4/grsecurity/gracl_learn.c |
32472 |
+--- linux-2.6.38.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 |
32473 |
++++ linux-2.6.38.4/grsecurity/gracl_learn.c 2011-04-17 15:57:32.000000000 -0400 |
32474 |
@@ -0,0 +1,211 @@ |
32475 |
+#include <linux/kernel.h> |
32476 |
+#include <linux/mm.h> |
32477 |
@@ -41278,9 +39526,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_learn.c linux-2.6.38.3/grsecurity/gra |
32478 |
+ .release = close_learn, |
32479 |
+ .poll = poll_learn, |
32480 |
+}; |
32481 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_res.c linux-2.6.38.3/grsecurity/gracl_res.c |
32482 |
---- linux-2.6.38.3/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 |
32483 |
-+++ linux-2.6.38.3/grsecurity/gracl_res.c 2011-04-17 15:57:32.000000000 -0400 |
32484 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_res.c linux-2.6.38.4/grsecurity/gracl_res.c |
32485 |
+--- linux-2.6.38.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 |
32486 |
++++ linux-2.6.38.4/grsecurity/gracl_res.c 2011-04-17 15:57:32.000000000 -0400 |
32487 |
@@ -0,0 +1,68 @@ |
32488 |
+#include <linux/kernel.h> |
32489 |
+#include <linux/sched.h> |
32490 |
@@ -41350,9 +39598,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_res.c linux-2.6.38.3/grsecurity/gracl |
32491 |
+ rcu_read_unlock(); |
32492 |
+ return; |
32493 |
+} |
32494 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_segv.c linux-2.6.38.3/grsecurity/gracl_segv.c |
32495 |
---- linux-2.6.38.3/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 |
32496 |
-+++ linux-2.6.38.3/grsecurity/gracl_segv.c 2011-04-17 15:57:32.000000000 -0400 |
32497 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_segv.c linux-2.6.38.4/grsecurity/gracl_segv.c |
32498 |
+--- linux-2.6.38.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 |
32499 |
++++ linux-2.6.38.4/grsecurity/gracl_segv.c 2011-04-17 15:57:32.000000000 -0400 |
32500 |
@@ -0,0 +1,300 @@ |
32501 |
+#include <linux/kernel.h> |
32502 |
+#include <linux/mm.h> |
32503 |
@@ -41654,9 +39902,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_segv.c linux-2.6.38.3/grsecurity/grac |
32504 |
+ |
32505 |
+ return; |
32506 |
+} |
32507 |
-diff -urNp linux-2.6.38.3/grsecurity/gracl_shm.c linux-2.6.38.3/grsecurity/gracl_shm.c |
32508 |
---- linux-2.6.38.3/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 |
32509 |
-+++ linux-2.6.38.3/grsecurity/gracl_shm.c 2011-04-17 15:57:32.000000000 -0400 |
32510 |
+diff -urNp linux-2.6.38.4/grsecurity/gracl_shm.c linux-2.6.38.4/grsecurity/gracl_shm.c |
32511 |
+--- linux-2.6.38.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 |
32512 |
++++ linux-2.6.38.4/grsecurity/gracl_shm.c 2011-04-17 15:57:32.000000000 -0400 |
32513 |
@@ -0,0 +1,40 @@ |
32514 |
+#include <linux/kernel.h> |
32515 |
+#include <linux/mm.h> |
32516 |
@@ -41698,9 +39946,9 @@ diff -urNp linux-2.6.38.3/grsecurity/gracl_shm.c linux-2.6.38.3/grsecurity/gracl |
32517 |
+ |
32518 |
+ return 1; |
32519 |
+} |
32520 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_chdir.c linux-2.6.38.3/grsecurity/grsec_chdir.c |
32521 |
---- linux-2.6.38.3/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 |
32522 |
-+++ linux-2.6.38.3/grsecurity/grsec_chdir.c 2011-04-17 15:57:32.000000000 -0400 |
32523 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_chdir.c linux-2.6.38.4/grsecurity/grsec_chdir.c |
32524 |
+--- linux-2.6.38.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 |
32525 |
++++ linux-2.6.38.4/grsecurity/grsec_chdir.c 2011-04-17 15:57:32.000000000 -0400 |
32526 |
@@ -0,0 +1,19 @@ |
32527 |
+#include <linux/kernel.h> |
32528 |
+#include <linux/sched.h> |
32529 |
@@ -41721,9 +39969,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_chdir.c linux-2.6.38.3/grsecurity/grs |
32530 |
+#endif |
32531 |
+ return; |
32532 |
+} |
32533 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_chroot.c linux-2.6.38.3/grsecurity/grsec_chroot.c |
32534 |
---- linux-2.6.38.3/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 |
32535 |
-+++ linux-2.6.38.3/grsecurity/grsec_chroot.c 2011-04-17 15:57:32.000000000 -0400 |
32536 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_chroot.c linux-2.6.38.4/grsecurity/grsec_chroot.c |
32537 |
+--- linux-2.6.38.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 |
32538 |
++++ linux-2.6.38.4/grsecurity/grsec_chroot.c 2011-04-17 15:57:32.000000000 -0400 |
32539 |
@@ -0,0 +1,355 @@ |
32540 |
+#include <linux/kernel.h> |
32541 |
+#include <linux/module.h> |
32542 |
@@ -42080,9 +40328,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_chroot.c linux-2.6.38.3/grsecurity/gr |
32543 |
+#ifdef CONFIG_SECURITY |
32544 |
+EXPORT_SYMBOL(gr_handle_chroot_caps); |
32545 |
+#endif |
32546 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_disabled.c linux-2.6.38.3/grsecurity/grsec_disabled.c |
32547 |
---- linux-2.6.38.3/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 |
32548 |
-+++ linux-2.6.38.3/grsecurity/grsec_disabled.c 2011-04-17 15:57:32.000000000 -0400 |
32549 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_disabled.c linux-2.6.38.4/grsecurity/grsec_disabled.c |
32550 |
+--- linux-2.6.38.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 |
32551 |
++++ linux-2.6.38.4/grsecurity/grsec_disabled.c 2011-04-17 15:57:32.000000000 -0400 |
32552 |
@@ -0,0 +1,447 @@ |
32553 |
+#include <linux/kernel.h> |
32554 |
+#include <linux/module.h> |
32555 |
@@ -42531,9 +40779,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_disabled.c linux-2.6.38.3/grsecurity/ |
32556 |
+EXPORT_SYMBOL(gr_check_user_change); |
32557 |
+EXPORT_SYMBOL(gr_check_group_change); |
32558 |
+#endif |
32559 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_exec.c linux-2.6.38.3/grsecurity/grsec_exec.c |
32560 |
---- linux-2.6.38.3/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 |
32561 |
-+++ linux-2.6.38.3/grsecurity/grsec_exec.c 2011-04-17 15:57:32.000000000 -0400 |
32562 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_exec.c linux-2.6.38.4/grsecurity/grsec_exec.c |
32563 |
+--- linux-2.6.38.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 |
32564 |
++++ linux-2.6.38.4/grsecurity/grsec_exec.c 2011-04-17 15:57:32.000000000 -0400 |
32565 |
@@ -0,0 +1,147 @@ |
32566 |
+#include <linux/kernel.h> |
32567 |
+#include <linux/sched.h> |
32568 |
@@ -42682,9 +40930,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_exec.c linux-2.6.38.3/grsecurity/grse |
32569 |
+ return; |
32570 |
+} |
32571 |
+#endif |
32572 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_fifo.c linux-2.6.38.3/grsecurity/grsec_fifo.c |
32573 |
---- linux-2.6.38.3/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 |
32574 |
-+++ linux-2.6.38.3/grsecurity/grsec_fifo.c 2011-04-17 15:57:32.000000000 -0400 |
32575 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_fifo.c linux-2.6.38.4/grsecurity/grsec_fifo.c |
32576 |
+--- linux-2.6.38.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 |
32577 |
++++ linux-2.6.38.4/grsecurity/grsec_fifo.c 2011-04-17 15:57:32.000000000 -0400 |
32578 |
@@ -0,0 +1,24 @@ |
32579 |
+#include <linux/kernel.h> |
32580 |
+#include <linux/sched.h> |
32581 |
@@ -42710,9 +40958,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_fifo.c linux-2.6.38.3/grsecurity/grse |
32582 |
+#endif |
32583 |
+ return 0; |
32584 |
+} |
32585 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_fork.c linux-2.6.38.3/grsecurity/grsec_fork.c |
32586 |
---- linux-2.6.38.3/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 |
32587 |
-+++ linux-2.6.38.3/grsecurity/grsec_fork.c 2011-04-17 15:57:32.000000000 -0400 |
32588 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_fork.c linux-2.6.38.4/grsecurity/grsec_fork.c |
32589 |
+--- linux-2.6.38.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 |
32590 |
++++ linux-2.6.38.4/grsecurity/grsec_fork.c 2011-04-17 15:57:32.000000000 -0400 |
32591 |
@@ -0,0 +1,23 @@ |
32592 |
+#include <linux/kernel.h> |
32593 |
+#include <linux/sched.h> |
32594 |
@@ -42737,9 +40985,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_fork.c linux-2.6.38.3/grsecurity/grse |
32595 |
+#endif |
32596 |
+ return; |
32597 |
+} |
32598 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_init.c linux-2.6.38.3/grsecurity/grsec_init.c |
32599 |
---- linux-2.6.38.3/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 |
32600 |
-+++ linux-2.6.38.3/grsecurity/grsec_init.c 2011-04-17 15:57:32.000000000 -0400 |
32601 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_init.c linux-2.6.38.4/grsecurity/grsec_init.c |
32602 |
+--- linux-2.6.38.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 |
32603 |
++++ linux-2.6.38.4/grsecurity/grsec_init.c 2011-04-17 15:57:32.000000000 -0400 |
32604 |
@@ -0,0 +1,270 @@ |
32605 |
+#include <linux/kernel.h> |
32606 |
+#include <linux/sched.h> |
32607 |
@@ -43011,9 +41259,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_init.c linux-2.6.38.3/grsecurity/grse |
32608 |
+ |
32609 |
+ return; |
32610 |
+} |
32611 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_link.c linux-2.6.38.3/grsecurity/grsec_link.c |
32612 |
---- linux-2.6.38.3/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 |
32613 |
-+++ linux-2.6.38.3/grsecurity/grsec_link.c 2011-04-17 15:57:32.000000000 -0400 |
32614 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_link.c linux-2.6.38.4/grsecurity/grsec_link.c |
32615 |
+--- linux-2.6.38.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 |
32616 |
++++ linux-2.6.38.4/grsecurity/grsec_link.c 2011-04-17 15:57:32.000000000 -0400 |
32617 |
@@ -0,0 +1,43 @@ |
32618 |
+#include <linux/kernel.h> |
32619 |
+#include <linux/sched.h> |
32620 |
@@ -43058,9 +41306,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_link.c linux-2.6.38.3/grsecurity/grse |
32621 |
+#endif |
32622 |
+ return 0; |
32623 |
+} |
32624 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_log.c linux-2.6.38.3/grsecurity/grsec_log.c |
32625 |
---- linux-2.6.38.3/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 |
32626 |
-+++ linux-2.6.38.3/grsecurity/grsec_log.c 2011-04-17 15:57:32.000000000 -0400 |
32627 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_log.c linux-2.6.38.4/grsecurity/grsec_log.c |
32628 |
+--- linux-2.6.38.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 |
32629 |
++++ linux-2.6.38.4/grsecurity/grsec_log.c 2011-04-17 15:57:32.000000000 -0400 |
32630 |
@@ -0,0 +1,310 @@ |
32631 |
+#include <linux/kernel.h> |
32632 |
+#include <linux/sched.h> |
32633 |
@@ -43372,9 +41620,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_log.c linux-2.6.38.3/grsecurity/grsec |
32634 |
+ gr_log_end(audit); |
32635 |
+ END_LOCKS(audit); |
32636 |
+} |
32637 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_mem.c linux-2.6.38.3/grsecurity/grsec_mem.c |
32638 |
---- linux-2.6.38.3/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 |
32639 |
-+++ linux-2.6.38.3/grsecurity/grsec_mem.c 2011-04-17 15:57:32.000000000 -0400 |
32640 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_mem.c linux-2.6.38.4/grsecurity/grsec_mem.c |
32641 |
+--- linux-2.6.38.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 |
32642 |
++++ linux-2.6.38.4/grsecurity/grsec_mem.c 2011-04-17 15:57:32.000000000 -0400 |
32643 |
@@ -0,0 +1,33 @@ |
32644 |
+#include <linux/kernel.h> |
32645 |
+#include <linux/sched.h> |
32646 |
@@ -43409,9 +41657,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_mem.c linux-2.6.38.3/grsecurity/grsec |
32647 |
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); |
32648 |
+ return; |
32649 |
+} |
32650 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_mount.c linux-2.6.38.3/grsecurity/grsec_mount.c |
32651 |
---- linux-2.6.38.3/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 |
32652 |
-+++ linux-2.6.38.3/grsecurity/grsec_mount.c 2011-04-17 15:57:32.000000000 -0400 |
32653 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_mount.c linux-2.6.38.4/grsecurity/grsec_mount.c |
32654 |
+--- linux-2.6.38.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 |
32655 |
++++ linux-2.6.38.4/grsecurity/grsec_mount.c 2011-04-17 15:57:32.000000000 -0400 |
32656 |
@@ -0,0 +1,62 @@ |
32657 |
+#include <linux/kernel.h> |
32658 |
+#include <linux/sched.h> |
32659 |
@@ -43475,9 +41723,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_mount.c linux-2.6.38.3/grsecurity/grs |
32660 |
+#endif |
32661 |
+ return 0; |
32662 |
+} |
32663 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_pax.c linux-2.6.38.3/grsecurity/grsec_pax.c |
32664 |
---- linux-2.6.38.3/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 |
32665 |
-+++ linux-2.6.38.3/grsecurity/grsec_pax.c 2011-04-17 15:57:32.000000000 -0400 |
32666 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_pax.c linux-2.6.38.4/grsecurity/grsec_pax.c |
32667 |
+--- linux-2.6.38.4/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 |
32668 |
++++ linux-2.6.38.4/grsecurity/grsec_pax.c 2011-04-17 15:57:32.000000000 -0400 |
32669 |
@@ -0,0 +1,36 @@ |
32670 |
+#include <linux/kernel.h> |
32671 |
+#include <linux/sched.h> |
32672 |
@@ -43515,9 +41763,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_pax.c linux-2.6.38.3/grsecurity/grsec |
32673 |
+#endif |
32674 |
+ return; |
32675 |
+} |
32676 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_ptrace.c linux-2.6.38.3/grsecurity/grsec_ptrace.c |
32677 |
---- linux-2.6.38.3/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 |
32678 |
-+++ linux-2.6.38.3/grsecurity/grsec_ptrace.c 2011-04-17 15:57:32.000000000 -0400 |
32679 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_ptrace.c linux-2.6.38.4/grsecurity/grsec_ptrace.c |
32680 |
+--- linux-2.6.38.4/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 |
32681 |
++++ linux-2.6.38.4/grsecurity/grsec_ptrace.c 2011-04-17 15:57:32.000000000 -0400 |
32682 |
@@ -0,0 +1,14 @@ |
32683 |
+#include <linux/kernel.h> |
32684 |
+#include <linux/sched.h> |
32685 |
@@ -43533,9 +41781,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_ptrace.c linux-2.6.38.3/grsecurity/gr |
32686 |
+#endif |
32687 |
+ return; |
32688 |
+} |
32689 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_sig.c linux-2.6.38.3/grsecurity/grsec_sig.c |
32690 |
---- linux-2.6.38.3/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 |
32691 |
-+++ linux-2.6.38.3/grsecurity/grsec_sig.c 2011-04-17 15:57:32.000000000 -0400 |
32692 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_sig.c linux-2.6.38.4/grsecurity/grsec_sig.c |
32693 |
+--- linux-2.6.38.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 |
32694 |
++++ linux-2.6.38.4/grsecurity/grsec_sig.c 2011-04-17 15:57:32.000000000 -0400 |
32695 |
@@ -0,0 +1,197 @@ |
32696 |
+#include <linux/kernel.h> |
32697 |
+#include <linux/sched.h> |
32698 |
@@ -43734,9 +41982,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_sig.c linux-2.6.38.3/grsecurity/grsec |
32699 |
+ return 0; |
32700 |
+ |
32701 |
+} |
32702 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_sock.c linux-2.6.38.3/grsecurity/grsec_sock.c |
32703 |
---- linux-2.6.38.3/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 |
32704 |
-+++ linux-2.6.38.3/grsecurity/grsec_sock.c 2011-04-17 15:57:32.000000000 -0400 |
32705 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_sock.c linux-2.6.38.4/grsecurity/grsec_sock.c |
32706 |
+--- linux-2.6.38.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 |
32707 |
++++ linux-2.6.38.4/grsecurity/grsec_sock.c 2011-04-17 15:57:32.000000000 -0400 |
32708 |
@@ -0,0 +1,275 @@ |
32709 |
+#include <linux/kernel.h> |
32710 |
+#include <linux/module.h> |
32711 |
@@ -44013,9 +42261,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_sock.c linux-2.6.38.3/grsecurity/grse |
32712 |
+ return current_cap(); |
32713 |
+#endif |
32714 |
+} |
32715 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_sysctl.c linux-2.6.38.3/grsecurity/grsec_sysctl.c |
32716 |
---- linux-2.6.38.3/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 |
32717 |
-+++ linux-2.6.38.3/grsecurity/grsec_sysctl.c 2011-04-17 15:57:32.000000000 -0400 |
32718 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_sysctl.c linux-2.6.38.4/grsecurity/grsec_sysctl.c |
32719 |
+--- linux-2.6.38.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 |
32720 |
++++ linux-2.6.38.4/grsecurity/grsec_sysctl.c 2011-04-17 15:57:32.000000000 -0400 |
32721 |
@@ -0,0 +1,433 @@ |
32722 |
+#include <linux/kernel.h> |
32723 |
+#include <linux/sched.h> |
32724 |
@@ -44450,9 +42698,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_sysctl.c linux-2.6.38.3/grsecurity/gr |
32725 |
+ { } |
32726 |
+}; |
32727 |
+#endif |
32728 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_time.c linux-2.6.38.3/grsecurity/grsec_time.c |
32729 |
---- linux-2.6.38.3/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 |
32730 |
-+++ linux-2.6.38.3/grsecurity/grsec_time.c 2011-04-17 15:57:32.000000000 -0400 |
32731 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_time.c linux-2.6.38.4/grsecurity/grsec_time.c |
32732 |
+--- linux-2.6.38.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 |
32733 |
++++ linux-2.6.38.4/grsecurity/grsec_time.c 2011-04-17 15:57:32.000000000 -0400 |
32734 |
@@ -0,0 +1,16 @@ |
32735 |
+#include <linux/kernel.h> |
32736 |
+#include <linux/sched.h> |
32737 |
@@ -44470,9 +42718,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_time.c linux-2.6.38.3/grsecurity/grse |
32738 |
+} |
32739 |
+ |
32740 |
+EXPORT_SYMBOL(gr_log_timechange); |
32741 |
-diff -urNp linux-2.6.38.3/grsecurity/grsec_tpe.c linux-2.6.38.3/grsecurity/grsec_tpe.c |
32742 |
---- linux-2.6.38.3/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 |
32743 |
-+++ linux-2.6.38.3/grsecurity/grsec_tpe.c 2011-04-17 15:57:32.000000000 -0400 |
32744 |
+diff -urNp linux-2.6.38.4/grsecurity/grsec_tpe.c linux-2.6.38.4/grsecurity/grsec_tpe.c |
32745 |
+--- linux-2.6.38.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 |
32746 |
++++ linux-2.6.38.4/grsecurity/grsec_tpe.c 2011-04-17 15:57:32.000000000 -0400 |
32747 |
@@ -0,0 +1,39 @@ |
32748 |
+#include <linux/kernel.h> |
32749 |
+#include <linux/sched.h> |
32750 |
@@ -44513,9 +42761,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsec_tpe.c linux-2.6.38.3/grsecurity/grsec |
32751 |
+#endif |
32752 |
+ return 1; |
32753 |
+} |
32754 |
-diff -urNp linux-2.6.38.3/grsecurity/grsum.c linux-2.6.38.3/grsecurity/grsum.c |
32755 |
---- linux-2.6.38.3/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 |
32756 |
-+++ linux-2.6.38.3/grsecurity/grsum.c 2011-04-17 15:57:32.000000000 -0400 |
32757 |
+diff -urNp linux-2.6.38.4/grsecurity/grsum.c linux-2.6.38.4/grsecurity/grsum.c |
32758 |
+--- linux-2.6.38.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 |
32759 |
++++ linux-2.6.38.4/grsecurity/grsum.c 2011-04-17 15:57:32.000000000 -0400 |
32760 |
@@ -0,0 +1,61 @@ |
32761 |
+#include <linux/err.h> |
32762 |
+#include <linux/kernel.h> |
32763 |
@@ -44578,9 +42826,9 @@ diff -urNp linux-2.6.38.3/grsecurity/grsum.c linux-2.6.38.3/grsecurity/grsum.c |
32764 |
+ |
32765 |
+ return retval; |
32766 |
+} |
32767 |
-diff -urNp linux-2.6.38.3/grsecurity/Kconfig linux-2.6.38.3/grsecurity/Kconfig |
32768 |
---- linux-2.6.38.3/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
32769 |
-+++ linux-2.6.38.3/grsecurity/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
32770 |
+diff -urNp linux-2.6.38.4/grsecurity/Kconfig linux-2.6.38.4/grsecurity/Kconfig |
32771 |
+--- linux-2.6.38.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
32772 |
++++ linux-2.6.38.4/grsecurity/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
32773 |
@@ -0,0 +1,1045 @@ |
32774 |
+# |
32775 |
+# grecurity configuration |
32776 |
@@ -45627,9 +43875,9 @@ diff -urNp linux-2.6.38.3/grsecurity/Kconfig linux-2.6.38.3/grsecurity/Kconfig |
32777 |
+endmenu |
32778 |
+ |
32779 |
+endmenu |
32780 |
-diff -urNp linux-2.6.38.3/grsecurity/Makefile linux-2.6.38.3/grsecurity/Makefile |
32781 |
---- linux-2.6.38.3/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 |
32782 |
-+++ linux-2.6.38.3/grsecurity/Makefile 2011-04-17 15:57:32.000000000 -0400 |
32783 |
+diff -urNp linux-2.6.38.4/grsecurity/Makefile linux-2.6.38.4/grsecurity/Makefile |
32784 |
+--- linux-2.6.38.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 |
32785 |
++++ linux-2.6.38.4/grsecurity/Makefile 2011-04-17 15:57:32.000000000 -0400 |
32786 |
@@ -0,0 +1,29 @@ |
32787 |
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton |
32788 |
+# during 2001-2009 it has been completely redesigned by Brad Spengler |
32789 |
@@ -45660,23 +43908,9 @@ diff -urNp linux-2.6.38.3/grsecurity/Makefile linux-2.6.38.3/grsecurity/Makefile |
32790 |
+ @-chmod -f 700 . |
32791 |
+ @echo ' grsec: protected kernel image paths' |
32792 |
+endif |
32793 |
-diff -urNp linux-2.6.38.3/include/acpi/acoutput.h linux-2.6.38.3/include/acpi/acoutput.h |
32794 |
---- linux-2.6.38.3/include/acpi/acoutput.h 2011-03-14 21:20:32.000000000 -0400 |
32795 |
-+++ linux-2.6.38.3/include/acpi/acoutput.h 2011-04-17 15:57:32.000000000 -0400 |
32796 |
-@@ -269,8 +269,8 @@ |
32797 |
- * leaving no executable debug code! |
32798 |
- */ |
32799 |
- #define ACPI_FUNCTION_NAME(a) |
32800 |
--#define ACPI_DEBUG_PRINT(pl) |
32801 |
--#define ACPI_DEBUG_PRINT_RAW(pl) |
32802 |
-+#define ACPI_DEBUG_PRINT(pl) do {} while (0) |
32803 |
-+#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0) |
32804 |
- |
32805 |
- #endif /* ACPI_DEBUG_OUTPUT */ |
32806 |
- |
32807 |
-diff -urNp linux-2.6.38.3/include/acpi/acpi_drivers.h linux-2.6.38.3/include/acpi/acpi_drivers.h |
32808 |
---- linux-2.6.38.3/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.000000000 -0400 |
32809 |
-+++ linux-2.6.38.3/include/acpi/acpi_drivers.h 2011-04-17 15:57:32.000000000 -0400 |
32810 |
+diff -urNp linux-2.6.38.4/include/acpi/acpi_drivers.h linux-2.6.38.4/include/acpi/acpi_drivers.h |
32811 |
+--- linux-2.6.38.4/include/acpi/acpi_drivers.h 2011-03-14 21:20:32.000000000 -0400 |
32812 |
++++ linux-2.6.38.4/include/acpi/acpi_drivers.h 2011-04-17 15:57:32.000000000 -0400 |
32813 |
@@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void); |
32814 |
Dock Station |
32815 |
-------------------------------------------------------------------------- */ |
32816 |
@@ -45706,9 +43940,9 @@ diff -urNp linux-2.6.38.3/include/acpi/acpi_drivers.h linux-2.6.38.3/include/acp |
32817 |
void *context) |
32818 |
{ |
32819 |
return -ENODEV; |
32820 |
-diff -urNp linux-2.6.38.3/include/asm-generic/atomic-long.h linux-2.6.38.3/include/asm-generic/atomic-long.h |
32821 |
---- linux-2.6.38.3/include/asm-generic/atomic-long.h 2011-03-14 21:20:32.000000000 -0400 |
32822 |
-+++ linux-2.6.38.3/include/asm-generic/atomic-long.h 2011-04-17 15:57:32.000000000 -0400 |
32823 |
+diff -urNp linux-2.6.38.4/include/asm-generic/atomic-long.h linux-2.6.38.4/include/asm-generic/atomic-long.h |
32824 |
+--- linux-2.6.38.4/include/asm-generic/atomic-long.h 2011-03-14 21:20:32.000000000 -0400 |
32825 |
++++ linux-2.6.38.4/include/asm-generic/atomic-long.h 2011-04-17 15:57:32.000000000 -0400 |
32826 |
@@ -22,6 +22,12 @@ |
32827 |
|
32828 |
typedef atomic64_t atomic_long_t; |
32829 |
@@ -46001,9 +44235,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/atomic-long.h linux-2.6.38.3/inclu |
32830 |
+#endif |
32831 |
+ |
32832 |
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */ |
32833 |
-diff -urNp linux-2.6.38.3/include/asm-generic/dma-mapping-common.h linux-2.6.38.3/include/asm-generic/dma-mapping-common.h |
32834 |
---- linux-2.6.38.3/include/asm-generic/dma-mapping-common.h 2011-03-14 21:20:32.000000000 -0400 |
32835 |
-+++ linux-2.6.38.3/include/asm-generic/dma-mapping-common.h 2011-04-17 15:57:32.000000000 -0400 |
32836 |
+diff -urNp linux-2.6.38.4/include/asm-generic/dma-mapping-common.h linux-2.6.38.4/include/asm-generic/dma-mapping-common.h |
32837 |
+--- linux-2.6.38.4/include/asm-generic/dma-mapping-common.h 2011-03-14 21:20:32.000000000 -0400 |
32838 |
++++ linux-2.6.38.4/include/asm-generic/dma-mapping-common.h 2011-04-17 15:57:32.000000000 -0400 |
32839 |
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ |
32840 |
enum dma_data_direction dir, |
32841 |
struct dma_attrs *attrs) |
32842 |
@@ -46094,9 +44328,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/dma-mapping-common.h linux-2.6.38. |
32843 |
|
32844 |
BUG_ON(!valid_dma_direction(dir)); |
32845 |
if (ops->sync_sg_for_device) |
32846 |
-diff -urNp linux-2.6.38.3/include/asm-generic/futex.h linux-2.6.38.3/include/asm-generic/futex.h |
32847 |
---- linux-2.6.38.3/include/asm-generic/futex.h 2011-03-14 21:20:32.000000000 -0400 |
32848 |
-+++ linux-2.6.38.3/include/asm-generic/futex.h 2011-04-17 15:57:32.000000000 -0400 |
32849 |
+diff -urNp linux-2.6.38.4/include/asm-generic/futex.h linux-2.6.38.4/include/asm-generic/futex.h |
32850 |
+--- linux-2.6.38.4/include/asm-generic/futex.h 2011-03-14 21:20:32.000000000 -0400 |
32851 |
++++ linux-2.6.38.4/include/asm-generic/futex.h 2011-04-17 15:57:32.000000000 -0400 |
32852 |
@@ -6,7 +6,7 @@ |
32853 |
#include <asm/errno.h> |
32854 |
|
32855 |
@@ -46115,9 +44349,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/futex.h linux-2.6.38.3/include/asm |
32856 |
{ |
32857 |
return -ENOSYS; |
32858 |
} |
32859 |
-diff -urNp linux-2.6.38.3/include/asm-generic/int-l64.h linux-2.6.38.3/include/asm-generic/int-l64.h |
32860 |
---- linux-2.6.38.3/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000000000 -0400 |
32861 |
-+++ linux-2.6.38.3/include/asm-generic/int-l64.h 2011-04-17 15:57:32.000000000 -0400 |
32862 |
+diff -urNp linux-2.6.38.4/include/asm-generic/int-l64.h linux-2.6.38.4/include/asm-generic/int-l64.h |
32863 |
+--- linux-2.6.38.4/include/asm-generic/int-l64.h 2011-03-14 21:20:32.000000000 -0400 |
32864 |
++++ linux-2.6.38.4/include/asm-generic/int-l64.h 2011-04-17 15:57:32.000000000 -0400 |
32865 |
@@ -46,6 +46,8 @@ typedef unsigned int u32; |
32866 |
typedef signed long s64; |
32867 |
typedef unsigned long u64; |
32868 |
@@ -46127,9 +44361,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/int-l64.h linux-2.6.38.3/include/a |
32869 |
#define S8_C(x) x |
32870 |
#define U8_C(x) x ## U |
32871 |
#define S16_C(x) x |
32872 |
-diff -urNp linux-2.6.38.3/include/asm-generic/int-ll64.h linux-2.6.38.3/include/asm-generic/int-ll64.h |
32873 |
---- linux-2.6.38.3/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.000000000 -0400 |
32874 |
-+++ linux-2.6.38.3/include/asm-generic/int-ll64.h 2011-04-17 15:57:32.000000000 -0400 |
32875 |
+diff -urNp linux-2.6.38.4/include/asm-generic/int-ll64.h linux-2.6.38.4/include/asm-generic/int-ll64.h |
32876 |
+--- linux-2.6.38.4/include/asm-generic/int-ll64.h 2011-03-14 21:20:32.000000000 -0400 |
32877 |
++++ linux-2.6.38.4/include/asm-generic/int-ll64.h 2011-04-17 15:57:32.000000000 -0400 |
32878 |
@@ -51,6 +51,8 @@ typedef unsigned int u32; |
32879 |
typedef signed long long s64; |
32880 |
typedef unsigned long long u64; |
32881 |
@@ -46139,9 +44373,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/int-ll64.h linux-2.6.38.3/include/ |
32882 |
#define S8_C(x) x |
32883 |
#define U8_C(x) x ## U |
32884 |
#define S16_C(x) x |
32885 |
-diff -urNp linux-2.6.38.3/include/asm-generic/kmap_types.h linux-2.6.38.3/include/asm-generic/kmap_types.h |
32886 |
---- linux-2.6.38.3/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
32887 |
-+++ linux-2.6.38.3/include/asm-generic/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
32888 |
+diff -urNp linux-2.6.38.4/include/asm-generic/kmap_types.h linux-2.6.38.4/include/asm-generic/kmap_types.h |
32889 |
+--- linux-2.6.38.4/include/asm-generic/kmap_types.h 2011-03-14 21:20:32.000000000 -0400 |
32890 |
++++ linux-2.6.38.4/include/asm-generic/kmap_types.h 2011-04-17 15:57:32.000000000 -0400 |
32891 |
@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE, |
32892 |
KMAP_D(17) KM_NMI, |
32893 |
KMAP_D(18) KM_NMI_PTE, |
32894 |
@@ -46155,9 +44389,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/kmap_types.h linux-2.6.38.3/includ |
32895 |
}; |
32896 |
|
32897 |
#undef KMAP_D |
32898 |
-diff -urNp linux-2.6.38.3/include/asm-generic/pgtable.h linux-2.6.38.3/include/asm-generic/pgtable.h |
32899 |
---- linux-2.6.38.3/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
32900 |
-+++ linux-2.6.38.3/include/asm-generic/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
32901 |
+diff -urNp linux-2.6.38.4/include/asm-generic/pgtable.h linux-2.6.38.4/include/asm-generic/pgtable.h |
32902 |
+--- linux-2.6.38.4/include/asm-generic/pgtable.h 2011-03-14 21:20:32.000000000 -0400 |
32903 |
++++ linux-2.6.38.4/include/asm-generic/pgtable.h 2011-04-17 15:57:32.000000000 -0400 |
32904 |
@@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd) |
32905 |
#endif /* __HAVE_ARCH_PMD_WRITE */ |
32906 |
#endif |
32907 |
@@ -46173,9 +44407,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/pgtable.h linux-2.6.38.3/include/a |
32908 |
#endif /* !__ASSEMBLY__ */ |
32909 |
|
32910 |
#endif /* _ASM_GENERIC_PGTABLE_H */ |
32911 |
-diff -urNp linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h |
32912 |
---- linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:32.000000000 -0400 |
32913 |
-+++ linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:57:32.000000000 -0400 |
32914 |
+diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h |
32915 |
+--- linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h 2011-03-14 21:20:32.000000000 -0400 |
32916 |
++++ linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:57:32.000000000 -0400 |
32917 |
@@ -1,14 +1,19 @@ |
32918 |
#ifndef _PGTABLE_NOPMD_H |
32919 |
#define _PGTABLE_NOPMD_H |
32920 |
@@ -46212,9 +44446,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/pgtable-nopmd.h linux-2.6.38.3/inc |
32921 |
/* |
32922 |
* The "pud_xxx()" functions here are trivial for a folded two-level |
32923 |
* setup: the pmd is never bad, and a pmd always exists (as it's folded |
32924 |
-diff -urNp linux-2.6.38.3/include/asm-generic/pgtable-nopud.h linux-2.6.38.3/include/asm-generic/pgtable-nopud.h |
32925 |
---- linux-2.6.38.3/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:32.000000000 -0400 |
32926 |
-+++ linux-2.6.38.3/include/asm-generic/pgtable-nopud.h 2011-04-17 15:57:32.000000000 -0400 |
32927 |
+diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopud.h linux-2.6.38.4/include/asm-generic/pgtable-nopud.h |
32928 |
+--- linux-2.6.38.4/include/asm-generic/pgtable-nopud.h 2011-03-14 21:20:32.000000000 -0400 |
32929 |
++++ linux-2.6.38.4/include/asm-generic/pgtable-nopud.h 2011-04-17 15:57:32.000000000 -0400 |
32930 |
@@ -1,10 +1,15 @@ |
32931 |
#ifndef _PGTABLE_NOPUD_H |
32932 |
#define _PGTABLE_NOPUD_H |
32933 |
@@ -46245,9 +44479,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/pgtable-nopud.h linux-2.6.38.3/inc |
32934 |
/* |
32935 |
* The "pgd_xxx()" functions here are trivial for a folded two-level |
32936 |
* setup: the pud is never bad, and a pud always exists (as it's folded |
32937 |
-diff -urNp linux-2.6.38.3/include/asm-generic/vmlinux.lds.h linux-2.6.38.3/include/asm-generic/vmlinux.lds.h |
32938 |
---- linux-2.6.38.3/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32.000000000 -0400 |
32939 |
-+++ linux-2.6.38.3/include/asm-generic/vmlinux.lds.h 2011-04-17 15:57:32.000000000 -0400 |
32940 |
+diff -urNp linux-2.6.38.4/include/asm-generic/vmlinux.lds.h linux-2.6.38.4/include/asm-generic/vmlinux.lds.h |
32941 |
+--- linux-2.6.38.4/include/asm-generic/vmlinux.lds.h 2011-03-14 21:20:32.000000000 -0400 |
32942 |
++++ linux-2.6.38.4/include/asm-generic/vmlinux.lds.h 2011-04-17 15:57:32.000000000 -0400 |
32943 |
@@ -213,6 +213,7 @@ |
32944 |
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ |
32945 |
VMLINUX_SYMBOL(__start_rodata) = .; \ |
32946 |
@@ -46284,115 +44518,9 @@ diff -urNp linux-2.6.38.3/include/asm-generic/vmlinux.lds.h linux-2.6.38.3/inclu |
32947 |
|
32948 |
/** |
32949 |
* PERCPU - define output section for percpu area, simple version |
32950 |
-diff -urNp linux-2.6.38.3/include/drm/drm_pciids.h linux-2.6.38.3/include/drm/drm_pciids.h |
32951 |
---- linux-2.6.38.3/include/drm/drm_pciids.h 2011-04-18 17:27:18.000000000 -0400 |
32952 |
-+++ linux-2.6.38.3/include/drm/drm_pciids.h 2011-04-17 16:58:34.000000000 -0400 |
32953 |
-@@ -460,7 +460,7 @@ |
32954 |
- {0x1002, 0x9805, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
32955 |
- {0x1002, 0x9806, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
32956 |
- {0x1002, 0x9807, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
32957 |
-- {0, 0, 0} |
32958 |
-+ {0, 0, 0, 0, 0, 0} |
32959 |
- |
32960 |
- #define r128_PCI_IDS \ |
32961 |
- {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32962 |
-@@ -500,14 +500,14 @@ |
32963 |
- {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32964 |
- {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32965 |
- {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32966 |
-- {0, 0, 0} |
32967 |
-+ {0, 0, 0, 0, 0, 0} |
32968 |
- |
32969 |
- #define mga_PCI_IDS \ |
32970 |
- {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ |
32971 |
- {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \ |
32972 |
- {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \ |
32973 |
- {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \ |
32974 |
-- {0, 0, 0} |
32975 |
-+ {0, 0, 0, 0, 0, 0} |
32976 |
- |
32977 |
- #define mach64_PCI_IDS \ |
32978 |
- {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32979 |
-@@ -530,7 +530,7 @@ |
32980 |
- {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32981 |
- {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32982 |
- {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32983 |
-- {0, 0, 0} |
32984 |
-+ {0, 0, 0, 0, 0, 0} |
32985 |
- |
32986 |
- #define sisdrv_PCI_IDS \ |
32987 |
- {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32988 |
-@@ -541,7 +541,7 @@ |
32989 |
- {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32990 |
- {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ |
32991 |
- {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ |
32992 |
-- {0, 0, 0} |
32993 |
-+ {0, 0, 0, 0, 0, 0} |
32994 |
- |
32995 |
- #define tdfx_PCI_IDS \ |
32996 |
- {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32997 |
-@@ -550,7 +550,7 @@ |
32998 |
- {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
32999 |
- {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33000 |
- {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33001 |
-- {0, 0, 0} |
33002 |
-+ {0, 0, 0, 0, 0, 0} |
33003 |
- |
33004 |
- #define viadrv_PCI_IDS \ |
33005 |
- {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33006 |
-@@ -562,14 +562,14 @@ |
33007 |
- {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33008 |
- {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \ |
33009 |
- {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ |
33010 |
-- {0, 0, 0} |
33011 |
-+ {0, 0, 0, 0, 0, 0} |
33012 |
- |
33013 |
- #define i810_PCI_IDS \ |
33014 |
- {0x8086, 0x7121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33015 |
- {0x8086, 0x7123, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33016 |
- {0x8086, 0x7125, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33017 |
- {0x8086, 0x1132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33018 |
-- {0, 0, 0} |
33019 |
-+ {0, 0, 0, 0, 0, 0} |
33020 |
- |
33021 |
- #define i830_PCI_IDS \ |
33022 |
- {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33023 |
-@@ -577,11 +577,11 @@ |
33024 |
- {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33025 |
- {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33026 |
- {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33027 |
-- {0, 0, 0} |
33028 |
-+ {0, 0, 0, 0, 0, 0} |
33029 |
- |
33030 |
- #define gamma_PCI_IDS \ |
33031 |
- {0x3d3d, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ |
33032 |
-- {0, 0, 0} |
33033 |
-+ {0, 0, 0, 0, 0, 0} |
33034 |
- |
33035 |
- #define savage_PCI_IDS \ |
33036 |
- {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \ |
33037 |
-@@ -607,10 +607,10 @@ |
33038 |
- {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \ |
33039 |
- {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ |
33040 |
- {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ |
33041 |
-- {0, 0, 0} |
33042 |
-+ {0, 0, 0, 0, 0, 0} |
33043 |
- |
33044 |
- #define ffb_PCI_IDS \ |
33045 |
-- {0, 0, 0} |
33046 |
-+ {0, 0, 0, 0, 0, 0} |
33047 |
- |
33048 |
- #define i915_PCI_IDS \ |
33049 |
- {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
33050 |
-@@ -644,4 +644,4 @@ |
33051 |
- {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
33052 |
- {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
33053 |
- {0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ |
33054 |
-- {0, 0, 0} |
33055 |
-+ {0, 0, 0, 0, 0, 0} |
33056 |
-diff -urNp linux-2.6.38.3/include/drm/drmP.h linux-2.6.38.3/include/drm/drmP.h |
33057 |
---- linux-2.6.38.3/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -0400 |
33058 |
-+++ linux-2.6.38.3/include/drm/drmP.h 2011-04-17 15:57:32.000000000 -0400 |
33059 |
+diff -urNp linux-2.6.38.4/include/drm/drmP.h linux-2.6.38.4/include/drm/drmP.h |
33060 |
+--- linux-2.6.38.4/include/drm/drmP.h 2011-03-14 21:20:32.000000000 -0400 |
33061 |
++++ linux-2.6.38.4/include/drm/drmP.h 2011-04-17 15:57:32.000000000 -0400 |
33062 |
@@ -73,6 +73,7 @@ |
33063 |
#include <linux/workqueue.h> |
33064 |
#include <linux/poll.h> |
33065 |
@@ -46446,9 +44574,9 @@ diff -urNp linux-2.6.38.3/include/drm/drmP.h linux-2.6.38.3/include/drm/drmP.h |
33066 |
void *dev_private; /**< device private data */ |
33067 |
void *mm_private; |
33068 |
struct address_space *dev_mapping; |
33069 |
-diff -urNp linux-2.6.38.3/include/linux/a.out.h linux-2.6.38.3/include/linux/a.out.h |
33070 |
---- linux-2.6.38.3/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -0400 |
33071 |
-+++ linux-2.6.38.3/include/linux/a.out.h 2011-04-17 15:57:32.000000000 -0400 |
33072 |
+diff -urNp linux-2.6.38.4/include/linux/a.out.h linux-2.6.38.4/include/linux/a.out.h |
33073 |
+--- linux-2.6.38.4/include/linux/a.out.h 2011-03-14 21:20:32.000000000 -0400 |
33074 |
++++ linux-2.6.38.4/include/linux/a.out.h 2011-04-17 15:57:32.000000000 -0400 |
33075 |
@@ -39,6 +39,14 @@ enum machine_type { |
33076 |
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ |
33077 |
}; |
33078 |
@@ -46464,9 +44592,9 @@ diff -urNp linux-2.6.38.3/include/linux/a.out.h linux-2.6.38.3/include/linux/a.o |
33079 |
#if !defined (N_MAGIC) |
33080 |
#define N_MAGIC(exec) ((exec).a_info & 0xffff) |
33081 |
#endif |
33082 |
-diff -urNp linux-2.6.38.3/include/linux/atmdev.h linux-2.6.38.3/include/linux/atmdev.h |
33083 |
---- linux-2.6.38.3/include/linux/atmdev.h 2011-04-18 17:27:18.000000000 -0400 |
33084 |
-+++ linux-2.6.38.3/include/linux/atmdev.h 2011-04-17 16:53:48.000000000 -0400 |
33085 |
+diff -urNp linux-2.6.38.4/include/linux/atmdev.h linux-2.6.38.4/include/linux/atmdev.h |
33086 |
+--- linux-2.6.38.4/include/linux/atmdev.h 2011-04-18 17:27:18.000000000 -0400 |
33087 |
++++ linux-2.6.38.4/include/linux/atmdev.h 2011-04-17 16:53:48.000000000 -0400 |
33088 |
@@ -237,7 +237,7 @@ struct compat_atm_iobuf { |
33089 |
#endif |
33090 |
|
33091 |
@@ -46476,9 +44604,9 @@ diff -urNp linux-2.6.38.3/include/linux/atmdev.h linux-2.6.38.3/include/linux/at |
33092 |
__AAL_STAT_ITEMS |
33093 |
#undef __HANDLE_ITEM |
33094 |
}; |
33095 |
-diff -urNp linux-2.6.38.3/include/linux/binfmts.h linux-2.6.38.3/include/linux/binfmts.h |
33096 |
---- linux-2.6.38.3/include/linux/binfmts.h 2011-03-14 21:20:32.000000000 -0400 |
33097 |
-+++ linux-2.6.38.3/include/linux/binfmts.h 2011-04-17 15:57:32.000000000 -0400 |
33098 |
+diff -urNp linux-2.6.38.4/include/linux/binfmts.h linux-2.6.38.4/include/linux/binfmts.h |
33099 |
+--- linux-2.6.38.4/include/linux/binfmts.h 2011-03-14 21:20:32.000000000 -0400 |
33100 |
++++ linux-2.6.38.4/include/linux/binfmts.h 2011-04-17 15:57:32.000000000 -0400 |
33101 |
@@ -92,6 +92,7 @@ struct linux_binfmt { |
33102 |
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); |
33103 |
int (*load_shlib)(struct file *); |
33104 |
@@ -46487,9 +44615,9 @@ diff -urNp linux-2.6.38.3/include/linux/binfmts.h linux-2.6.38.3/include/linux/b |
33105 |
unsigned long min_coredump; /* minimal dump size */ |
33106 |
}; |
33107 |
|
33108 |
-diff -urNp linux-2.6.38.3/include/linux/blkdev.h linux-2.6.38.3/include/linux/blkdev.h |
33109 |
---- linux-2.6.38.3/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 -0400 |
33110 |
-+++ linux-2.6.38.3/include/linux/blkdev.h 2011-04-17 15:57:32.000000000 -0400 |
33111 |
+diff -urNp linux-2.6.38.4/include/linux/blkdev.h linux-2.6.38.4/include/linux/blkdev.h |
33112 |
+--- linux-2.6.38.4/include/linux/blkdev.h 2011-03-14 21:20:32.000000000 -0400 |
33113 |
++++ linux-2.6.38.4/include/linux/blkdev.h 2011-04-17 15:57:32.000000000 -0400 |
33114 |
@@ -1247,22 +1247,22 @@ queue_max_integrity_segments(struct requ |
33115 |
#endif /* CONFIG_BLK_DEV_INTEGRITY */ |
33116 |
|
33117 |
@@ -46525,9 +44653,9 @@ diff -urNp linux-2.6.38.3/include/linux/blkdev.h linux-2.6.38.3/include/linux/bl |
33118 |
}; |
33119 |
|
33120 |
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, |
33121 |
-diff -urNp linux-2.6.38.3/include/linux/byteorder/little_endian.h linux-2.6.38.3/include/linux/byteorder/little_endian.h |
33122 |
---- linux-2.6.38.3/include/linux/byteorder/little_endian.h 2011-03-14 21:20:32.000000000 -0400 |
33123 |
-+++ linux-2.6.38.3/include/linux/byteorder/little_endian.h 2011-04-17 15:57:32.000000000 -0400 |
33124 |
+diff -urNp linux-2.6.38.4/include/linux/byteorder/little_endian.h linux-2.6.38.4/include/linux/byteorder/little_endian.h |
33125 |
+--- linux-2.6.38.4/include/linux/byteorder/little_endian.h 2011-03-14 21:20:32.000000000 -0400 |
33126 |
++++ linux-2.6.38.4/include/linux/byteorder/little_endian.h 2011-04-17 15:57:32.000000000 -0400 |
33127 |
@@ -42,51 +42,51 @@ |
33128 |
|
33129 |
static inline __le64 __cpu_to_le64p(const __u64 *p) |
33130 |
@@ -46592,9 +44720,9 @@ diff -urNp linux-2.6.38.3/include/linux/byteorder/little_endian.h linux-2.6.38.3 |
33131 |
} |
33132 |
#define __cpu_to_le64s(x) do { (void)(x); } while (0) |
33133 |
#define __le64_to_cpus(x) do { (void)(x); } while (0) |
33134 |
-diff -urNp linux-2.6.38.3/include/linux/cache.h linux-2.6.38.3/include/linux/cache.h |
33135 |
---- linux-2.6.38.3/include/linux/cache.h 2011-03-14 21:20:32.000000000 -0400 |
33136 |
-+++ linux-2.6.38.3/include/linux/cache.h 2011-04-17 15:57:32.000000000 -0400 |
33137 |
+diff -urNp linux-2.6.38.4/include/linux/cache.h linux-2.6.38.4/include/linux/cache.h |
33138 |
+--- linux-2.6.38.4/include/linux/cache.h 2011-03-14 21:20:32.000000000 -0400 |
33139 |
++++ linux-2.6.38.4/include/linux/cache.h 2011-04-17 15:57:32.000000000 -0400 |
33140 |
@@ -16,6 +16,10 @@ |
33141 |
#define __read_mostly |
33142 |
#endif |
33143 |
@@ -46606,9 +44734,9 @@ diff -urNp linux-2.6.38.3/include/linux/cache.h linux-2.6.38.3/include/linux/cac |
33144 |
#ifndef ____cacheline_aligned |
33145 |
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) |
33146 |
#endif |
33147 |
-diff -urNp linux-2.6.38.3/include/linux/capability.h linux-2.6.38.3/include/linux/capability.h |
33148 |
---- linux-2.6.38.3/include/linux/capability.h 2011-03-14 21:20:32.000000000 -0400 |
33149 |
-+++ linux-2.6.38.3/include/linux/capability.h 2011-04-17 15:57:32.000000000 -0400 |
33150 |
+diff -urNp linux-2.6.38.4/include/linux/capability.h linux-2.6.38.4/include/linux/capability.h |
33151 |
+--- linux-2.6.38.4/include/linux/capability.h 2011-03-14 21:20:32.000000000 -0400 |
33152 |
++++ linux-2.6.38.4/include/linux/capability.h 2011-04-17 15:57:32.000000000 -0400 |
33153 |
@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff |
33154 |
(security_real_capable_noaudit((t), (cap)) == 0) |
33155 |
|
33156 |
@@ -46617,9 +44745,9 @@ diff -urNp linux-2.6.38.3/include/linux/capability.h linux-2.6.38.3/include/linu |
33157 |
|
33158 |
/* audit system wants to get cap info from files as well */ |
33159 |
struct dentry; |
33160 |
-diff -urNp linux-2.6.38.3/include/linux/compiler-gcc4.h linux-2.6.38.3/include/linux/compiler-gcc4.h |
33161 |
---- linux-2.6.38.3/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000000000 -0400 |
33162 |
-+++ linux-2.6.38.3/include/linux/compiler-gcc4.h 2011-04-17 15:57:32.000000000 -0400 |
33163 |
+diff -urNp linux-2.6.38.4/include/linux/compiler-gcc4.h linux-2.6.38.4/include/linux/compiler-gcc4.h |
33164 |
+--- linux-2.6.38.4/include/linux/compiler-gcc4.h 2011-03-14 21:20:32.000000000 -0400 |
33165 |
++++ linux-2.6.38.4/include/linux/compiler-gcc4.h 2011-04-17 15:57:32.000000000 -0400 |
33166 |
@@ -54,6 +54,10 @@ |
33167 |
|
33168 |
#endif |
33169 |
@@ -46631,9 +44759,9 @@ diff -urNp linux-2.6.38.3/include/linux/compiler-gcc4.h linux-2.6.38.3/include/l |
33170 |
#endif |
33171 |
|
33172 |
#if __GNUC_MINOR__ > 0 |
33173 |
-diff -urNp linux-2.6.38.3/include/linux/compiler.h linux-2.6.38.3/include/linux/compiler.h |
33174 |
---- linux-2.6.38.3/include/linux/compiler.h 2011-03-14 21:20:32.000000000 -0400 |
33175 |
-+++ linux-2.6.38.3/include/linux/compiler.h 2011-04-17 15:57:32.000000000 -0400 |
33176 |
+diff -urNp linux-2.6.38.4/include/linux/compiler.h linux-2.6.38.4/include/linux/compiler.h |
33177 |
+--- linux-2.6.38.4/include/linux/compiler.h 2011-03-14 21:20:32.000000000 -0400 |
33178 |
++++ linux-2.6.38.4/include/linux/compiler.h 2011-04-17 15:57:32.000000000 -0400 |
33179 |
@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_ |
33180 |
#define __cold |
33181 |
#endif |
33182 |
@@ -46666,9 +44794,9 @@ diff -urNp linux-2.6.38.3/include/linux/compiler.h linux-2.6.38.3/include/linux/ |
33183 |
+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) |
33184 |
|
33185 |
#endif /* __LINUX_COMPILER_H */ |
33186 |
-diff -urNp linux-2.6.38.3/include/linux/cpuset.h linux-2.6.38.3/include/linux/cpuset.h |
33187 |
---- linux-2.6.38.3/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 -0400 |
33188 |
-+++ linux-2.6.38.3/include/linux/cpuset.h 2011-04-17 15:57:32.000000000 -0400 |
33189 |
+diff -urNp linux-2.6.38.4/include/linux/cpuset.h linux-2.6.38.4/include/linux/cpuset.h |
33190 |
+--- linux-2.6.38.4/include/linux/cpuset.h 2011-03-14 21:20:32.000000000 -0400 |
33191 |
++++ linux-2.6.38.4/include/linux/cpuset.h 2011-04-17 15:57:32.000000000 -0400 |
33192 |
@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void |
33193 |
* nodemask. |
33194 |
*/ |
33195 |
@@ -46678,9 +44806,9 @@ diff -urNp linux-2.6.38.3/include/linux/cpuset.h linux-2.6.38.3/include/linux/cp |
33196 |
} |
33197 |
|
33198 |
static inline void set_mems_allowed(nodemask_t nodemask) |
33199 |
-diff -urNp linux-2.6.38.3/include/linux/decompress/mm.h linux-2.6.38.3/include/linux/decompress/mm.h |
33200 |
---- linux-2.6.38.3/include/linux/decompress/mm.h 2011-03-14 21:20:32.000000000 -0400 |
33201 |
-+++ linux-2.6.38.3/include/linux/decompress/mm.h 2011-04-17 15:57:32.000000000 -0400 |
33202 |
+diff -urNp linux-2.6.38.4/include/linux/decompress/mm.h linux-2.6.38.4/include/linux/decompress/mm.h |
33203 |
+--- linux-2.6.38.4/include/linux/decompress/mm.h 2011-03-14 21:20:32.000000000 -0400 |
33204 |
++++ linux-2.6.38.4/include/linux/decompress/mm.h 2011-04-17 15:57:32.000000000 -0400 |
33205 |
@@ -77,7 +77,7 @@ static void free(void *where) |
33206 |
* warnings when not needed (indeed large_malloc / large_free are not |
33207 |
* needed by inflate */ |
33208 |
@@ -46690,9 +44818,9 @@ diff -urNp linux-2.6.38.3/include/linux/decompress/mm.h linux-2.6.38.3/include/l |
33209 |
#define free(a) kfree(a) |
33210 |
|
33211 |
#define large_malloc(a) vmalloc(a) |
33212 |
-diff -urNp linux-2.6.38.3/include/linux/dma-mapping.h linux-2.6.38.3/include/linux/dma-mapping.h |
33213 |
---- linux-2.6.38.3/include/linux/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
33214 |
-+++ linux-2.6.38.3/include/linux/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
33215 |
+diff -urNp linux-2.6.38.4/include/linux/dma-mapping.h linux-2.6.38.4/include/linux/dma-mapping.h |
33216 |
+--- linux-2.6.38.4/include/linux/dma-mapping.h 2011-03-14 21:20:32.000000000 -0400 |
33217 |
++++ linux-2.6.38.4/include/linux/dma-mapping.h 2011-04-17 15:57:32.000000000 -0400 |
33218 |
@@ -16,40 +16,40 @@ enum dma_data_direction { |
33219 |
}; |
33220 |
|
33221 |
@@ -46748,9 +44876,9 @@ diff -urNp linux-2.6.38.3/include/linux/dma-mapping.h linux-2.6.38.3/include/lin |
33222 |
}; |
33223 |
|
33224 |
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) |
33225 |
-diff -urNp linux-2.6.38.3/include/linux/elf.h linux-2.6.38.3/include/linux/elf.h |
33226 |
---- linux-2.6.38.3/include/linux/elf.h 2011-03-14 21:20:32.000000000 -0400 |
33227 |
-+++ linux-2.6.38.3/include/linux/elf.h 2011-04-17 15:57:32.000000000 -0400 |
33228 |
+diff -urNp linux-2.6.38.4/include/linux/elf.h linux-2.6.38.4/include/linux/elf.h |
33229 |
+--- linux-2.6.38.4/include/linux/elf.h 2011-03-14 21:20:32.000000000 -0400 |
33230 |
++++ linux-2.6.38.4/include/linux/elf.h 2011-04-17 15:57:32.000000000 -0400 |
33231 |
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; |
33232 |
#define PT_GNU_EH_FRAME 0x6474e550 |
33233 |
|
33234 |
@@ -46823,9 +44951,9 @@ diff -urNp linux-2.6.38.3/include/linux/elf.h linux-2.6.38.3/include/linux/elf.h |
33235 |
|
33236 |
#endif |
33237 |
|
33238 |
-diff -urNp linux-2.6.38.3/include/linux/fs.h linux-2.6.38.3/include/linux/fs.h |
33239 |
---- linux-2.6.38.3/include/linux/fs.h 2011-03-14 21:20:32.000000000 -0400 |
33240 |
-+++ linux-2.6.38.3/include/linux/fs.h 2011-04-17 15:57:32.000000000 -0400 |
33241 |
+diff -urNp linux-2.6.38.4/include/linux/fs.h linux-2.6.38.4/include/linux/fs.h |
33242 |
+--- linux-2.6.38.4/include/linux/fs.h 2011-03-14 21:20:32.000000000 -0400 |
33243 |
++++ linux-2.6.38.4/include/linux/fs.h 2011-04-17 15:57:32.000000000 -0400 |
33244 |
@@ -105,6 +105,11 @@ struct inodes_stat_t { |
33245 |
/* File was opened by fanotify and shouldn't generate fanotify events */ |
33246 |
#define FMODE_NONOTIFY ((__force fmode_t)0x1000000) |
33247 |
@@ -46974,9 +45102,9 @@ diff -urNp linux-2.6.38.3/include/linux/fs.h linux-2.6.38.3/include/linux/fs.h |
33248 |
}; |
33249 |
|
33250 |
/* |
33251 |
-diff -urNp linux-2.6.38.3/include/linux/fs_struct.h linux-2.6.38.3/include/linux/fs_struct.h |
33252 |
---- linux-2.6.38.3/include/linux/fs_struct.h 2011-03-14 21:20:32.000000000 -0400 |
33253 |
-+++ linux-2.6.38.3/include/linux/fs_struct.h 2011-04-17 15:57:32.000000000 -0400 |
33254 |
+diff -urNp linux-2.6.38.4/include/linux/fs_struct.h linux-2.6.38.4/include/linux/fs_struct.h |
33255 |
+--- linux-2.6.38.4/include/linux/fs_struct.h 2011-03-14 21:20:32.000000000 -0400 |
33256 |
++++ linux-2.6.38.4/include/linux/fs_struct.h 2011-04-17 15:57:32.000000000 -0400 |
33257 |
@@ -6,7 +6,7 @@ |
33258 |
#include <linux/seqlock.h> |
33259 |
|
33260 |
@@ -46986,9 +45114,9 @@ diff -urNp linux-2.6.38.3/include/linux/fs_struct.h linux-2.6.38.3/include/linux |
33261 |
spinlock_t lock; |
33262 |
seqcount_t seq; |
33263 |
int umask; |
33264 |
-diff -urNp linux-2.6.38.3/include/linux/genhd.h linux-2.6.38.3/include/linux/genhd.h |
33265 |
---- linux-2.6.38.3/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -0400 |
33266 |
-+++ linux-2.6.38.3/include/linux/genhd.h 2011-04-17 15:57:32.000000000 -0400 |
33267 |
+diff -urNp linux-2.6.38.4/include/linux/genhd.h linux-2.6.38.4/include/linux/genhd.h |
33268 |
+--- linux-2.6.38.4/include/linux/genhd.h 2011-03-14 21:20:32.000000000 -0400 |
33269 |
++++ linux-2.6.38.4/include/linux/genhd.h 2011-04-17 15:57:32.000000000 -0400 |
33270 |
@@ -183,7 +183,7 @@ struct gendisk { |
33271 |
struct kobject *slave_dir; |
33272 |
|
33273 |
@@ -46998,9 +45126,9 @@ diff -urNp linux-2.6.38.3/include/linux/genhd.h linux-2.6.38.3/include/linux/gen |
33274 |
struct disk_events *ev; |
33275 |
#ifdef CONFIG_BLK_DEV_INTEGRITY |
33276 |
struct blk_integrity *integrity; |
33277 |
-diff -urNp linux-2.6.38.3/include/linux/gracl.h linux-2.6.38.3/include/linux/gracl.h |
33278 |
---- linux-2.6.38.3/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 |
33279 |
-+++ linux-2.6.38.3/include/linux/gracl.h 2011-04-17 15:57:32.000000000 -0400 |
33280 |
+diff -urNp linux-2.6.38.4/include/linux/gracl.h linux-2.6.38.4/include/linux/gracl.h |
33281 |
+--- linux-2.6.38.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 |
33282 |
++++ linux-2.6.38.4/include/linux/gracl.h 2011-04-17 15:57:32.000000000 -0400 |
33283 |
@@ -0,0 +1,317 @@ |
33284 |
+#ifndef GR_ACL_H |
33285 |
+#define GR_ACL_H |
33286 |
@@ -47319,9 +45447,9 @@ diff -urNp linux-2.6.38.3/include/linux/gracl.h linux-2.6.38.3/include/linux/gra |
33287 |
+ |
33288 |
+#endif |
33289 |
+ |
33290 |
-diff -urNp linux-2.6.38.3/include/linux/gralloc.h linux-2.6.38.3/include/linux/gralloc.h |
33291 |
---- linux-2.6.38.3/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 |
33292 |
-+++ linux-2.6.38.3/include/linux/gralloc.h 2011-04-17 15:57:32.000000000 -0400 |
33293 |
+diff -urNp linux-2.6.38.4/include/linux/gralloc.h linux-2.6.38.4/include/linux/gralloc.h |
33294 |
+--- linux-2.6.38.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 |
33295 |
++++ linux-2.6.38.4/include/linux/gralloc.h 2011-04-17 15:57:32.000000000 -0400 |
33296 |
@@ -0,0 +1,9 @@ |
33297 |
+#ifndef __GRALLOC_H |
33298 |
+#define __GRALLOC_H |
33299 |
@@ -47332,9 +45460,9 @@ diff -urNp linux-2.6.38.3/include/linux/gralloc.h linux-2.6.38.3/include/linux/g |
33300 |
+void *acl_alloc_num(unsigned long num, unsigned long len); |
33301 |
+ |
33302 |
+#endif |
33303 |
-diff -urNp linux-2.6.38.3/include/linux/grdefs.h linux-2.6.38.3/include/linux/grdefs.h |
33304 |
---- linux-2.6.38.3/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 |
33305 |
-+++ linux-2.6.38.3/include/linux/grdefs.h 2011-04-17 15:57:32.000000000 -0400 |
33306 |
+diff -urNp linux-2.6.38.4/include/linux/grdefs.h linux-2.6.38.4/include/linux/grdefs.h |
33307 |
+--- linux-2.6.38.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 |
33308 |
++++ linux-2.6.38.4/include/linux/grdefs.h 2011-04-17 15:57:32.000000000 -0400 |
33309 |
@@ -0,0 +1,139 @@ |
33310 |
+#ifndef GRDEFS_H |
33311 |
+#define GRDEFS_H |
33312 |
@@ -47475,9 +45603,9 @@ diff -urNp linux-2.6.38.3/include/linux/grdefs.h linux-2.6.38.3/include/linux/gr |
33313 |
+}; |
33314 |
+ |
33315 |
+#endif |
33316 |
-diff -urNp linux-2.6.38.3/include/linux/grinternal.h linux-2.6.38.3/include/linux/grinternal.h |
33317 |
---- linux-2.6.38.3/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 |
33318 |
-+++ linux-2.6.38.3/include/linux/grinternal.h 2011-04-17 15:57:32.000000000 -0400 |
33319 |
+diff -urNp linux-2.6.38.4/include/linux/grinternal.h linux-2.6.38.4/include/linux/grinternal.h |
33320 |
+--- linux-2.6.38.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 |
33321 |
++++ linux-2.6.38.4/include/linux/grinternal.h 2011-04-17 15:57:32.000000000 -0400 |
33322 |
@@ -0,0 +1,219 @@ |
33323 |
+#ifndef __GRINTERNAL_H |
33324 |
+#define __GRINTERNAL_H |
33325 |
@@ -47698,9 +45826,9 @@ diff -urNp linux-2.6.38.3/include/linux/grinternal.h linux-2.6.38.3/include/linu |
33326 |
+#endif |
33327 |
+ |
33328 |
+#endif |
33329 |
-diff -urNp linux-2.6.38.3/include/linux/grmsg.h linux-2.6.38.3/include/linux/grmsg.h |
33330 |
---- linux-2.6.38.3/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 |
33331 |
-+++ linux-2.6.38.3/include/linux/grmsg.h 2011-04-17 15:57:32.000000000 -0400 |
33332 |
+diff -urNp linux-2.6.38.4/include/linux/grmsg.h linux-2.6.38.4/include/linux/grmsg.h |
33333 |
+--- linux-2.6.38.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 |
33334 |
++++ linux-2.6.38.4/include/linux/grmsg.h 2011-04-17 15:57:32.000000000 -0400 |
33335 |
@@ -0,0 +1,108 @@ |
33336 |
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" |
33337 |
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" |
33338 |
@@ -47810,9 +45938,9 @@ diff -urNp linux-2.6.38.3/include/linux/grmsg.h linux-2.6.38.3/include/linux/grm |
33339 |
+#define GR_VM86_MSG "denied use of vm86 by " |
33340 |
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " |
33341 |
+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by " |
33342 |
-diff -urNp linux-2.6.38.3/include/linux/grsecurity.h linux-2.6.38.3/include/linux/grsecurity.h |
33343 |
---- linux-2.6.38.3/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 |
33344 |
-+++ linux-2.6.38.3/include/linux/grsecurity.h 2011-04-17 15:57:32.000000000 -0400 |
33345 |
+diff -urNp linux-2.6.38.4/include/linux/grsecurity.h linux-2.6.38.4/include/linux/grsecurity.h |
33346 |
+--- linux-2.6.38.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 |
33347 |
++++ linux-2.6.38.4/include/linux/grsecurity.h 2011-04-17 15:57:32.000000000 -0400 |
33348 |
@@ -0,0 +1,212 @@ |
33349 |
+#ifndef GR_SECURITY_H |
33350 |
+#define GR_SECURITY_H |
33351 |
@@ -48026,9 +46154,9 @@ diff -urNp linux-2.6.38.3/include/linux/grsecurity.h linux-2.6.38.3/include/linu |
33352 |
+#endif |
33353 |
+ |
33354 |
+#endif |
33355 |
-diff -urNp linux-2.6.38.3/include/linux/grsock.h linux-2.6.38.3/include/linux/grsock.h |
33356 |
---- linux-2.6.38.3/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500 |
33357 |
-+++ linux-2.6.38.3/include/linux/grsock.h 2011-04-17 15:57:32.000000000 -0400 |
33358 |
+diff -urNp linux-2.6.38.4/include/linux/grsock.h linux-2.6.38.4/include/linux/grsock.h |
33359 |
+--- linux-2.6.38.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500 |
33360 |
++++ linux-2.6.38.4/include/linux/grsock.h 2011-04-17 15:57:32.000000000 -0400 |
33361 |
@@ -0,0 +1,19 @@ |
33362 |
+#ifndef __GRSOCK_H |
33363 |
+#define __GRSOCK_H |
33364 |
@@ -48049,9 +46177,9 @@ diff -urNp linux-2.6.38.3/include/linux/grsock.h linux-2.6.38.3/include/linux/gr |
33365 |
+ const int protocol); |
33366 |
+ |
33367 |
+#endif |
33368 |
-diff -urNp linux-2.6.38.3/include/linux/highmem.h linux-2.6.38.3/include/linux/highmem.h |
33369 |
---- linux-2.6.38.3/include/linux/highmem.h 2011-03-14 21:20:32.000000000 -0400 |
33370 |
-+++ linux-2.6.38.3/include/linux/highmem.h 2011-04-17 15:57:32.000000000 -0400 |
33371 |
+diff -urNp linux-2.6.38.4/include/linux/highmem.h linux-2.6.38.4/include/linux/highmem.h |
33372 |
+--- linux-2.6.38.4/include/linux/highmem.h 2011-03-14 21:20:32.000000000 -0400 |
33373 |
++++ linux-2.6.38.4/include/linux/highmem.h 2011-04-17 15:57:32.000000000 -0400 |
33374 |
@@ -185,6 +185,18 @@ static inline void clear_highpage(struct |
33375 |
kunmap_atomic(kaddr, KM_USER0); |
33376 |
} |
33377 |
@@ -48071,9 +46199,9 @@ diff -urNp linux-2.6.38.3/include/linux/highmem.h linux-2.6.38.3/include/linux/h |
33378 |
static inline void zero_user_segments(struct page *page, |
33379 |
unsigned start1, unsigned end1, |
33380 |
unsigned start2, unsigned end2) |
33381 |
-diff -urNp linux-2.6.38.3/include/linux/init.h linux-2.6.38.3/include/linux/init.h |
33382 |
---- linux-2.6.38.3/include/linux/init.h 2011-03-14 21:20:32.000000000 -0400 |
33383 |
-+++ linux-2.6.38.3/include/linux/init.h 2011-04-17 15:57:32.000000000 -0400 |
33384 |
+diff -urNp linux-2.6.38.4/include/linux/init.h linux-2.6.38.4/include/linux/init.h |
33385 |
+--- linux-2.6.38.4/include/linux/init.h 2011-03-14 21:20:32.000000000 -0400 |
33386 |
++++ linux-2.6.38.4/include/linux/init.h 2011-04-17 15:57:32.000000000 -0400 |
33387 |
@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm |
33388 |
|
33389 |
/* Each module must use one module_init(). */ |
33390 |
@@ -48090,9 +46218,9 @@ diff -urNp linux-2.6.38.3/include/linux/init.h linux-2.6.38.3/include/linux/init |
33391 |
{ return exitfn; } \ |
33392 |
void cleanup_module(void) __attribute__((alias(#exitfn))); |
33393 |
|
33394 |
-diff -urNp linux-2.6.38.3/include/linux/init_task.h linux-2.6.38.3/include/linux/init_task.h |
33395 |
---- linux-2.6.38.3/include/linux/init_task.h 2011-03-14 21:20:32.000000000 -0400 |
33396 |
-+++ linux-2.6.38.3/include/linux/init_task.h 2011-04-18 18:02:13.000000000 -0400 |
33397 |
+diff -urNp linux-2.6.38.4/include/linux/init_task.h linux-2.6.38.4/include/linux/init_task.h |
33398 |
+--- linux-2.6.38.4/include/linux/init_task.h 2011-03-14 21:20:32.000000000 -0400 |
33399 |
++++ linux-2.6.38.4/include/linux/init_task.h 2011-04-18 18:02:13.000000000 -0400 |
33400 |
@@ -83,6 +83,12 @@ extern struct group_info init_groups; |
33401 |
#define INIT_IDS |
33402 |
#endif |
33403 |
@@ -48114,9 +46242,9 @@ diff -urNp linux-2.6.38.3/include/linux/init_task.h linux-2.6.38.3/include/linux |
33404 |
.fs = &init_fs, \ |
33405 |
.files = &init_files, \ |
33406 |
.signal = &init_signals, \ |
33407 |
-diff -urNp linux-2.6.38.3/include/linux/interrupt.h linux-2.6.38.3/include/linux/interrupt.h |
33408 |
---- linux-2.6.38.3/include/linux/interrupt.h 2011-03-14 21:20:32.000000000 -0400 |
33409 |
-+++ linux-2.6.38.3/include/linux/interrupt.h 2011-04-17 15:57:32.000000000 -0400 |
33410 |
+diff -urNp linux-2.6.38.4/include/linux/interrupt.h linux-2.6.38.4/include/linux/interrupt.h |
33411 |
+--- linux-2.6.38.4/include/linux/interrupt.h 2011-03-14 21:20:32.000000000 -0400 |
33412 |
++++ linux-2.6.38.4/include/linux/interrupt.h 2011-04-17 15:57:32.000000000 -0400 |
33413 |
@@ -393,7 +393,7 @@ enum |
33414 |
/* map softirq index to softirq name. update 'softirq_to_name' in |
33415 |
* kernel/softirq.c when adding a new softirq. |
33416 |
@@ -48141,33 +46269,9 @@ diff -urNp linux-2.6.38.3/include/linux/interrupt.h linux-2.6.38.3/include/linux |
33417 |
extern void softirq_init(void); |
33418 |
static inline void __raise_softirq_irqoff(unsigned int nr) |
33419 |
{ |
33420 |
-diff -urNp linux-2.6.38.3/include/linux/jbd2.h linux-2.6.38.3/include/linux/jbd2.h |
33421 |
---- linux-2.6.38.3/include/linux/jbd2.h 2011-03-14 21:20:32.000000000 -0400 |
33422 |
-+++ linux-2.6.38.3/include/linux/jbd2.h 2011-04-17 15:57:32.000000000 -0400 |
33423 |
-@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug; |
33424 |
- } \ |
33425 |
- } while (0) |
33426 |
- #else |
33427 |
--#define jbd_debug(f, a...) /**/ |
33428 |
-+#define jbd_debug(f, a...) do {} while (0) |
33429 |
- #endif |
33430 |
- |
33431 |
- extern void *jbd2_alloc(size_t size, gfp_t flags); |
33432 |
-diff -urNp linux-2.6.38.3/include/linux/jbd.h linux-2.6.38.3/include/linux/jbd.h |
33433 |
---- linux-2.6.38.3/include/linux/jbd.h 2011-03-14 21:20:32.000000000 -0400 |
33434 |
-+++ linux-2.6.38.3/include/linux/jbd.h 2011-04-17 15:57:32.000000000 -0400 |
33435 |
-@@ -67,7 +67,7 @@ extern u8 journal_enable_debug; |
33436 |
- } \ |
33437 |
- } while (0) |
33438 |
- #else |
33439 |
--#define jbd_debug(f, a...) /**/ |
33440 |
-+#define jbd_debug(f, a...) do {} while (0) |
33441 |
- #endif |
33442 |
- |
33443 |
- static inline void *jbd_alloc(size_t size, gfp_t flags) |
33444 |
-diff -urNp linux-2.6.38.3/include/linux/kallsyms.h linux-2.6.38.3/include/linux/kallsyms.h |
33445 |
---- linux-2.6.38.3/include/linux/kallsyms.h 2011-03-14 21:20:32.000000000 -0400 |
33446 |
-+++ linux-2.6.38.3/include/linux/kallsyms.h 2011-04-17 15:57:32.000000000 -0400 |
33447 |
+diff -urNp linux-2.6.38.4/include/linux/kallsyms.h linux-2.6.38.4/include/linux/kallsyms.h |
33448 |
+--- linux-2.6.38.4/include/linux/kallsyms.h 2011-03-14 21:20:32.000000000 -0400 |
33449 |
++++ linux-2.6.38.4/include/linux/kallsyms.h 2011-04-17 15:57:32.000000000 -0400 |
33450 |
@@ -15,7 +15,8 @@ |
33451 |
|
33452 |
struct module; |
33453 |
@@ -48194,9 +46298,9 @@ diff -urNp linux-2.6.38.3/include/linux/kallsyms.h linux-2.6.38.3/include/linux/ |
33454 |
|
33455 |
/* This macro allows us to keep printk typechecking */ |
33456 |
static void __check_printsym_format(const char *fmt, ...) |
33457 |
-diff -urNp linux-2.6.38.3/include/linux/kgdb.h linux-2.6.38.3/include/linux/kgdb.h |
33458 |
---- linux-2.6.38.3/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0400 |
33459 |
-+++ linux-2.6.38.3/include/linux/kgdb.h 2011-04-17 15:57:32.000000000 -0400 |
33460 |
+diff -urNp linux-2.6.38.4/include/linux/kgdb.h linux-2.6.38.4/include/linux/kgdb.h |
33461 |
+--- linux-2.6.38.4/include/linux/kgdb.h 2011-03-14 21:20:32.000000000 -0400 |
33462 |
++++ linux-2.6.38.4/include/linux/kgdb.h 2011-04-17 15:57:32.000000000 -0400 |
33463 |
@@ -269,22 +269,22 @@ struct kgdb_arch { |
33464 |
*/ |
33465 |
struct kgdb_io { |
33466 |
@@ -48230,9 +46334,9 @@ diff -urNp linux-2.6.38.3/include/linux/kgdb.h linux-2.6.38.3/include/linux/kgdb |
33467 |
|
33468 |
extern int kgdb_hex2long(char **ptr, unsigned long *long_val); |
33469 |
extern char *kgdb_mem2hex(char *mem, char *buf, int count); |
33470 |
-diff -urNp linux-2.6.38.3/include/linux/kmod.h linux-2.6.38.3/include/linux/kmod.h |
33471 |
---- linux-2.6.38.3/include/linux/kmod.h 2011-03-14 21:20:32.000000000 -0400 |
33472 |
-+++ linux-2.6.38.3/include/linux/kmod.h 2011-04-17 15:57:32.000000000 -0400 |
33473 |
+diff -urNp linux-2.6.38.4/include/linux/kmod.h linux-2.6.38.4/include/linux/kmod.h |
33474 |
+--- linux-2.6.38.4/include/linux/kmod.h 2011-03-14 21:20:32.000000000 -0400 |
33475 |
++++ linux-2.6.38.4/include/linux/kmod.h 2011-04-17 15:57:32.000000000 -0400 |
33476 |
@@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysc |
33477 |
* usually useless though. */ |
33478 |
extern int __request_module(bool wait, const char *name, ...) \ |
33479 |
@@ -48242,9 +46346,9 @@ diff -urNp linux-2.6.38.3/include/linux/kmod.h linux-2.6.38.3/include/linux/kmod |
33480 |
#define request_module(mod...) __request_module(true, mod) |
33481 |
#define request_module_nowait(mod...) __request_module(false, mod) |
33482 |
#define try_then_request_module(x, mod...) \ |
33483 |
-diff -urNp linux-2.6.38.3/include/linux/kvm_host.h linux-2.6.38.3/include/linux/kvm_host.h |
33484 |
---- linux-2.6.38.3/include/linux/kvm_host.h 2011-03-14 21:20:32.000000000 -0400 |
33485 |
-+++ linux-2.6.38.3/include/linux/kvm_host.h 2011-04-17 15:57:32.000000000 -0400 |
33486 |
+diff -urNp linux-2.6.38.4/include/linux/kvm_host.h linux-2.6.38.4/include/linux/kvm_host.h |
33487 |
+--- linux-2.6.38.4/include/linux/kvm_host.h 2011-03-14 21:20:32.000000000 -0400 |
33488 |
++++ linux-2.6.38.4/include/linux/kvm_host.h 2011-04-17 15:57:32.000000000 -0400 |
33489 |
@@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc |
33490 |
void vcpu_load(struct kvm_vcpu *vcpu); |
33491 |
void vcpu_put(struct kvm_vcpu *vcpu); |
33492 |
@@ -48263,24 +46367,9 @@ diff -urNp linux-2.6.38.3/include/linux/kvm_host.h linux-2.6.38.3/include/linux/ |
33493 |
void kvm_arch_exit(void); |
33494 |
|
33495 |
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); |
33496 |
-diff -urNp linux-2.6.38.3/include/linux/libata.h linux-2.6.38.3/include/linux/libata.h |
33497 |
---- linux-2.6.38.3/include/linux/libata.h 2011-03-14 21:20:32.000000000 -0400 |
33498 |
-+++ linux-2.6.38.3/include/linux/libata.h 2011-04-17 15:57:32.000000000 -0400 |
33499 |
-@@ -65,11 +65,11 @@ |
33500 |
- #ifdef ATA_VERBOSE_DEBUG |
33501 |
- #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) |
33502 |
- #else |
33503 |
--#define VPRINTK(fmt, args...) |
33504 |
-+#define VPRINTK(fmt, args...) do {} while (0) |
33505 |
- #endif /* ATA_VERBOSE_DEBUG */ |
33506 |
- #else |
33507 |
--#define DPRINTK(fmt, args...) |
33508 |
--#define VPRINTK(fmt, args...) |
33509 |
-+#define DPRINTK(fmt, args...) do {} while (0) |
33510 |
-+#define VPRINTK(fmt, args...) do {} while (0) |
33511 |
- #endif /* ATA_DEBUG */ |
33512 |
- |
33513 |
- #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) |
33514 |
+diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/libata.h |
33515 |
+--- linux-2.6.38.4/include/linux/libata.h 2011-03-14 21:20:32.000000000 -0400 |
33516 |
++++ linux-2.6.38.4/include/linux/libata.h 2011-04-23 12:47:28.000000000 -0400 |
33517 |
@@ -530,11 +530,11 @@ struct ata_ioports { |
33518 |
|
33519 |
struct ata_host { |
33520 |
@@ -48331,9 +46420,9 @@ diff -urNp linux-2.6.38.3/include/linux/libata.h linux-2.6.38.3/include/linux/li |
33521 |
extern int ata_scsi_detect(struct scsi_host_template *sht); |
33522 |
extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
33523 |
extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd); |
33524 |
-diff -urNp linux-2.6.38.3/include/linux/lockd/bind.h linux-2.6.38.3/include/linux/lockd/bind.h |
33525 |
---- linux-2.6.38.3/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000000 -0400 |
33526 |
-+++ linux-2.6.38.3/include/linux/lockd/bind.h 2011-04-17 15:57:32.000000000 -0400 |
33527 |
+diff -urNp linux-2.6.38.4/include/linux/lockd/bind.h linux-2.6.38.4/include/linux/lockd/bind.h |
33528 |
+--- linux-2.6.38.4/include/linux/lockd/bind.h 2011-03-14 21:20:32.000000000 -0400 |
33529 |
++++ linux-2.6.38.4/include/linux/lockd/bind.h 2011-04-17 15:57:32.000000000 -0400 |
33530 |
@@ -23,13 +23,13 @@ struct svc_rqst; |
33531 |
* This is the set of functions for lockd->nfsd communication |
33532 |
*/ |
33533 |
@@ -48351,9 +46440,9 @@ diff -urNp linux-2.6.38.3/include/linux/lockd/bind.h linux-2.6.38.3/include/linu |
33534 |
|
33535 |
/* |
33536 |
* Similar to nfs_client_initdata, but without the NFS-specific |
33537 |
-diff -urNp linux-2.6.38.3/include/linux/mm.h linux-2.6.38.3/include/linux/mm.h |
33538 |
---- linux-2.6.38.3/include/linux/mm.h 2011-04-18 17:27:16.000000000 -0400 |
33539 |
-+++ linux-2.6.38.3/include/linux/mm.h 2011-04-17 15:57:32.000000000 -0400 |
33540 |
+diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h |
33541 |
+--- linux-2.6.38.4/include/linux/mm.h 2011-04-18 17:27:16.000000000 -0400 |
33542 |
++++ linux-2.6.38.4/include/linux/mm.h 2011-04-17 15:57:32.000000000 -0400 |
33543 |
@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void |
33544 |
|
33545 |
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ |
33546 |
@@ -48454,9 +46543,9 @@ diff -urNp linux-2.6.38.3/include/linux/mm.h linux-2.6.38.3/include/linux/mm.h |
33547 |
+ |
33548 |
#endif /* __KERNEL__ */ |
33549 |
#endif /* _LINUX_MM_H */ |
33550 |
-diff -urNp linux-2.6.38.3/include/linux/mm_types.h linux-2.6.38.3/include/linux/mm_types.h |
33551 |
---- linux-2.6.38.3/include/linux/mm_types.h 2011-03-14 21:20:32.000000000 -0400 |
33552 |
-+++ linux-2.6.38.3/include/linux/mm_types.h 2011-04-17 15:57:32.000000000 -0400 |
33553 |
+diff -urNp linux-2.6.38.4/include/linux/mm_types.h linux-2.6.38.4/include/linux/mm_types.h |
33554 |
+--- linux-2.6.38.4/include/linux/mm_types.h 2011-03-14 21:20:32.000000000 -0400 |
33555 |
++++ linux-2.6.38.4/include/linux/mm_types.h 2011-04-17 15:57:32.000000000 -0400 |
33556 |
@@ -183,6 +183,8 @@ struct vm_area_struct { |
33557 |
#ifdef CONFIG_NUMA |
33558 |
struct mempolicy *vm_policy; /* NUMA policy for the VMA */ |
33559 |
@@ -48491,9 +46580,9 @@ diff -urNp linux-2.6.38.3/include/linux/mm_types.h linux-2.6.38.3/include/linux/ |
33560 |
}; |
33561 |
|
33562 |
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ |
33563 |
-diff -urNp linux-2.6.38.3/include/linux/mmu_notifier.h linux-2.6.38.3/include/linux/mmu_notifier.h |
33564 |
---- linux-2.6.38.3/include/linux/mmu_notifier.h 2011-03-14 21:20:32.000000000 -0400 |
33565 |
-+++ linux-2.6.38.3/include/linux/mmu_notifier.h 2011-04-17 15:57:32.000000000 -0400 |
33566 |
+diff -urNp linux-2.6.38.4/include/linux/mmu_notifier.h linux-2.6.38.4/include/linux/mmu_notifier.h |
33567 |
+--- linux-2.6.38.4/include/linux/mmu_notifier.h 2011-03-14 21:20:32.000000000 -0400 |
33568 |
++++ linux-2.6.38.4/include/linux/mmu_notifier.h 2011-04-17 15:57:32.000000000 -0400 |
33569 |
@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr |
33570 |
*/ |
33571 |
#define ptep_clear_flush_notify(__vma, __address, __ptep) \ |
33572 |
@@ -48510,9 +46599,9 @@ diff -urNp linux-2.6.38.3/include/linux/mmu_notifier.h linux-2.6.38.3/include/li |
33573 |
}) |
33574 |
|
33575 |
#define pmdp_clear_flush_notify(__vma, __address, __pmdp) \ |
33576 |
-diff -urNp linux-2.6.38.3/include/linux/mmzone.h linux-2.6.38.3/include/linux/mmzone.h |
33577 |
---- linux-2.6.38.3/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 -0400 |
33578 |
-+++ linux-2.6.38.3/include/linux/mmzone.h 2011-04-17 15:57:32.000000000 -0400 |
33579 |
+diff -urNp linux-2.6.38.4/include/linux/mmzone.h linux-2.6.38.4/include/linux/mmzone.h |
33580 |
+--- linux-2.6.38.4/include/linux/mmzone.h 2011-03-14 21:20:32.000000000 -0400 |
33581 |
++++ linux-2.6.38.4/include/linux/mmzone.h 2011-04-17 15:57:32.000000000 -0400 |
33582 |
@@ -355,7 +355,7 @@ struct zone { |
33583 |
unsigned long flags; /* zone flags, see below */ |
33584 |
|
33585 |
@@ -48522,9 +46611,9 @@ diff -urNp linux-2.6.38.3/include/linux/mmzone.h linux-2.6.38.3/include/linux/mm |
33586 |
|
33587 |
/* |
33588 |
* The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on |
33589 |
-diff -urNp linux-2.6.38.3/include/linux/mod_devicetable.h linux-2.6.38.3/include/linux/mod_devicetable.h |
33590 |
---- linux-2.6.38.3/include/linux/mod_devicetable.h 2011-03-14 21:20:32.000000000 -0400 |
33591 |
-+++ linux-2.6.38.3/include/linux/mod_devicetable.h 2011-04-17 15:57:32.000000000 -0400 |
33592 |
+diff -urNp linux-2.6.38.4/include/linux/mod_devicetable.h linux-2.6.38.4/include/linux/mod_devicetable.h |
33593 |
+--- linux-2.6.38.4/include/linux/mod_devicetable.h 2011-03-14 21:20:32.000000000 -0400 |
33594 |
++++ linux-2.6.38.4/include/linux/mod_devicetable.h 2011-04-17 15:57:32.000000000 -0400 |
33595 |
@@ -12,7 +12,7 @@ |
33596 |
typedef unsigned long kernel_ulong_t; |
33597 |
#endif |
33598 |
@@ -48543,9 +46632,9 @@ diff -urNp linux-2.6.38.3/include/linux/mod_devicetable.h linux-2.6.38.3/include |
33599 |
|
33600 |
struct hid_device_id { |
33601 |
__u16 bus; |
33602 |
-diff -urNp linux-2.6.38.3/include/linux/module.h linux-2.6.38.3/include/linux/module.h |
33603 |
---- linux-2.6.38.3/include/linux/module.h 2011-03-14 21:20:32.000000000 -0400 |
33604 |
-+++ linux-2.6.38.3/include/linux/module.h 2011-04-17 15:57:32.000000000 -0400 |
33605 |
+diff -urNp linux-2.6.38.4/include/linux/module.h linux-2.6.38.4/include/linux/module.h |
33606 |
+--- linux-2.6.38.4/include/linux/module.h 2011-03-14 21:20:32.000000000 -0400 |
33607 |
++++ linux-2.6.38.4/include/linux/module.h 2011-04-17 15:57:32.000000000 -0400 |
33608 |
@@ -324,19 +324,16 @@ struct module |
33609 |
int (*init)(void); |
33610 |
|
33611 |
@@ -48621,9 +46710,9 @@ diff -urNp linux-2.6.38.3/include/linux/module.h linux-2.6.38.3/include/linux/mo |
33612 |
} |
33613 |
|
33614 |
/* Search for module by name: must hold module_mutex. */ |
33615 |
-diff -urNp linux-2.6.38.3/include/linux/moduleloader.h linux-2.6.38.3/include/linux/moduleloader.h |
33616 |
---- linux-2.6.38.3/include/linux/moduleloader.h 2011-03-14 21:20:32.000000000 -0400 |
33617 |
-+++ linux-2.6.38.3/include/linux/moduleloader.h 2011-04-17 15:57:32.000000000 -0400 |
33618 |
+diff -urNp linux-2.6.38.4/include/linux/moduleloader.h linux-2.6.38.4/include/linux/moduleloader.h |
33619 |
+--- linux-2.6.38.4/include/linux/moduleloader.h 2011-03-14 21:20:32.000000000 -0400 |
33620 |
++++ linux-2.6.38.4/include/linux/moduleloader.h 2011-04-17 15:57:32.000000000 -0400 |
33621 |
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st |
33622 |
sections. Returns NULL on failure. */ |
33623 |
void *module_alloc(unsigned long size); |
33624 |
@@ -48646,9 +46735,9 @@ diff -urNp linux-2.6.38.3/include/linux/moduleloader.h linux-2.6.38.3/include/li |
33625 |
/* Apply the given relocation to the (simplified) ELF. Return -error |
33626 |
or 0. */ |
33627 |
int apply_relocate(Elf_Shdr *sechdrs, |
33628 |
-diff -urNp linux-2.6.38.3/include/linux/moduleparam.h linux-2.6.38.3/include/linux/moduleparam.h |
33629 |
---- linux-2.6.38.3/include/linux/moduleparam.h 2011-03-14 21:20:32.000000000 -0400 |
33630 |
-+++ linux-2.6.38.3/include/linux/moduleparam.h 2011-04-17 15:57:32.000000000 -0400 |
33631 |
+diff -urNp linux-2.6.38.4/include/linux/moduleparam.h linux-2.6.38.4/include/linux/moduleparam.h |
33632 |
+--- linux-2.6.38.4/include/linux/moduleparam.h 2011-03-14 21:20:32.000000000 -0400 |
33633 |
++++ linux-2.6.38.4/include/linux/moduleparam.h 2011-04-17 15:57:32.000000000 -0400 |
33634 |
@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock |
33635 |
* @len is usually just sizeof(string). |
33636 |
*/ |
33637 |
@@ -48667,9 +46756,9 @@ diff -urNp linux-2.6.38.3/include/linux/moduleparam.h linux-2.6.38.3/include/lin |
33638 |
= { ARRAY_SIZE(array), nump, ¶m_ops_##type, \ |
33639 |
sizeof(array[0]), array }; \ |
33640 |
__module_param_call(MODULE_PARAM_PREFIX, name, \ |
33641 |
-diff -urNp linux-2.6.38.3/include/linux/mutex.h linux-2.6.38.3/include/linux/mutex.h |
33642 |
---- linux-2.6.38.3/include/linux/mutex.h 2011-03-14 21:20:32.000000000 -0400 |
33643 |
-+++ linux-2.6.38.3/include/linux/mutex.h 2011-04-17 17:44:37.000000000 -0400 |
33644 |
+diff -urNp linux-2.6.38.4/include/linux/mutex.h linux-2.6.38.4/include/linux/mutex.h |
33645 |
+--- linux-2.6.38.4/include/linux/mutex.h 2011-03-14 21:20:32.000000000 -0400 |
33646 |
++++ linux-2.6.38.4/include/linux/mutex.h 2011-04-17 17:44:37.000000000 -0400 |
33647 |
@@ -51,7 +51,7 @@ struct mutex { |
33648 |
spinlock_t wait_lock; |
33649 |
struct list_head wait_list; |
33650 |
@@ -48679,9 +46768,9 @@ diff -urNp linux-2.6.38.3/include/linux/mutex.h linux-2.6.38.3/include/linux/mut |
33651 |
#endif |
33652 |
#ifdef CONFIG_DEBUG_MUTEXES |
33653 |
const char *name; |
33654 |
-diff -urNp linux-2.6.38.3/include/linux/namei.h linux-2.6.38.3/include/linux/namei.h |
33655 |
---- linux-2.6.38.3/include/linux/namei.h 2011-03-14 21:20:32.000000000 -0400 |
33656 |
-+++ linux-2.6.38.3/include/linux/namei.h 2011-04-17 15:57:32.000000000 -0400 |
33657 |
+diff -urNp linux-2.6.38.4/include/linux/namei.h linux-2.6.38.4/include/linux/namei.h |
33658 |
+--- linux-2.6.38.4/include/linux/namei.h 2011-03-14 21:20:32.000000000 -0400 |
33659 |
++++ linux-2.6.38.4/include/linux/namei.h 2011-04-17 15:57:32.000000000 -0400 |
33660 |
@@ -25,7 +25,7 @@ struct nameidata { |
33661 |
unsigned seq; |
33662 |
int last_type; |
33663 |
@@ -48706,9 +46795,9 @@ diff -urNp linux-2.6.38.3/include/linux/namei.h linux-2.6.38.3/include/linux/nam |
33664 |
{ |
33665 |
return nd->saved_names[nd->depth]; |
33666 |
} |
33667 |
-diff -urNp linux-2.6.38.3/include/linux/netfilter/xt_gradm.h linux-2.6.38.3/include/linux/netfilter/xt_gradm.h |
33668 |
---- linux-2.6.38.3/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 |
33669 |
-+++ linux-2.6.38.3/include/linux/netfilter/xt_gradm.h 2011-04-17 15:57:32.000000000 -0400 |
33670 |
+diff -urNp linux-2.6.38.4/include/linux/netfilter/xt_gradm.h linux-2.6.38.4/include/linux/netfilter/xt_gradm.h |
33671 |
+--- linux-2.6.38.4/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 |
33672 |
++++ linux-2.6.38.4/include/linux/netfilter/xt_gradm.h 2011-04-17 15:57:32.000000000 -0400 |
33673 |
@@ -0,0 +1,9 @@ |
33674 |
+#ifndef _LINUX_NETFILTER_XT_GRADM_H |
33675 |
+#define _LINUX_NETFILTER_XT_GRADM_H 1 |
33676 |
@@ -48719,9 +46808,9 @@ diff -urNp linux-2.6.38.3/include/linux/netfilter/xt_gradm.h linux-2.6.38.3/incl |
33677 |
+}; |
33678 |
+ |
33679 |
+#endif |
33680 |
-diff -urNp linux-2.6.38.3/include/linux/oprofile.h linux-2.6.38.3/include/linux/oprofile.h |
33681 |
---- linux-2.6.38.3/include/linux/oprofile.h 2011-03-14 21:20:32.000000000 -0400 |
33682 |
-+++ linux-2.6.38.3/include/linux/oprofile.h 2011-04-17 15:57:32.000000000 -0400 |
33683 |
+diff -urNp linux-2.6.38.4/include/linux/oprofile.h linux-2.6.38.4/include/linux/oprofile.h |
33684 |
+--- linux-2.6.38.4/include/linux/oprofile.h 2011-03-14 21:20:32.000000000 -0400 |
33685 |
++++ linux-2.6.38.4/include/linux/oprofile.h 2011-04-17 15:57:32.000000000 -0400 |
33686 |
@@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super |
33687 |
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, |
33688 |
char const * name, ulong * val); |
33689 |
@@ -48734,21 +46823,9 @@ diff -urNp linux-2.6.38.3/include/linux/oprofile.h linux-2.6.38.3/include/linux/ |
33690 |
|
33691 |
/** create a directory */ |
33692 |
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, |
33693 |
-diff -urNp linux-2.6.38.3/include/linux/pid.h linux-2.6.38.3/include/linux/pid.h |
33694 |
---- linux-2.6.38.3/include/linux/pid.h 2011-03-14 21:20:32.000000000 -0400 |
33695 |
-+++ linux-2.6.38.3/include/linux/pid.h 2011-04-18 19:21:21.000000000 -0400 |
33696 |
-@@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr); |
33697 |
- */ |
33698 |
- extern struct pid *find_get_pid(int nr); |
33699 |
- extern struct pid *find_ge_pid(int nr, struct pid_namespace *); |
33700 |
--int next_pidmap(struct pid_namespace *pid_ns, int last); |
33701 |
-+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last); |
33702 |
- |
33703 |
- extern struct pid *alloc_pid(struct pid_namespace *ns); |
33704 |
- extern void free_pid(struct pid *pid); |
33705 |
-diff -urNp linux-2.6.38.3/include/linux/pipe_fs_i.h linux-2.6.38.3/include/linux/pipe_fs_i.h |
33706 |
---- linux-2.6.38.3/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.000000000 -0400 |
33707 |
-+++ linux-2.6.38.3/include/linux/pipe_fs_i.h 2011-04-17 15:57:32.000000000 -0400 |
33708 |
+diff -urNp linux-2.6.38.4/include/linux/pipe_fs_i.h linux-2.6.38.4/include/linux/pipe_fs_i.h |
33709 |
+--- linux-2.6.38.4/include/linux/pipe_fs_i.h 2011-03-14 21:20:32.000000000 -0400 |
33710 |
++++ linux-2.6.38.4/include/linux/pipe_fs_i.h 2011-04-17 15:57:32.000000000 -0400 |
33711 |
@@ -46,9 +46,9 @@ struct pipe_buffer { |
33712 |
struct pipe_inode_info { |
33713 |
wait_queue_head_t wait; |
33714 |
@@ -48762,9 +46839,9 @@ diff -urNp linux-2.6.38.3/include/linux/pipe_fs_i.h linux-2.6.38.3/include/linux |
33715 |
unsigned int r_counter; |
33716 |
unsigned int w_counter; |
33717 |
struct page *tmp_page; |
33718 |
-diff -urNp linux-2.6.38.3/include/linux/pm_runtime.h linux-2.6.38.3/include/linux/pm_runtime.h |
33719 |
---- linux-2.6.38.3/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000000 -0400 |
33720 |
-+++ linux-2.6.38.3/include/linux/pm_runtime.h 2011-04-17 15:57:32.000000000 -0400 |
33721 |
+diff -urNp linux-2.6.38.4/include/linux/pm_runtime.h linux-2.6.38.4/include/linux/pm_runtime.h |
33722 |
+--- linux-2.6.38.4/include/linux/pm_runtime.h 2011-03-14 21:20:32.000000000 -0400 |
33723 |
++++ linux-2.6.38.4/include/linux/pm_runtime.h 2011-04-17 15:57:32.000000000 -0400 |
33724 |
@@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(st |
33725 |
|
33726 |
static inline void pm_runtime_mark_last_busy(struct device *dev) |
33727 |
@@ -48774,9 +46851,9 @@ diff -urNp linux-2.6.38.3/include/linux/pm_runtime.h linux-2.6.38.3/include/linu |
33728 |
} |
33729 |
|
33730 |
#else /* !CONFIG_PM_RUNTIME */ |
33731 |
-diff -urNp linux-2.6.38.3/include/linux/poison.h linux-2.6.38.3/include/linux/poison.h |
33732 |
---- linux-2.6.38.3/include/linux/poison.h 2011-03-14 21:20:32.000000000 -0400 |
33733 |
-+++ linux-2.6.38.3/include/linux/poison.h 2011-04-17 15:57:32.000000000 -0400 |
33734 |
+diff -urNp linux-2.6.38.4/include/linux/poison.h linux-2.6.38.4/include/linux/poison.h |
33735 |
+--- linux-2.6.38.4/include/linux/poison.h 2011-03-14 21:20:32.000000000 -0400 |
33736 |
++++ linux-2.6.38.4/include/linux/poison.h 2011-04-17 15:57:32.000000000 -0400 |
33737 |
@@ -19,8 +19,8 @@ |
33738 |
* under normal circumstances, used to verify that nobody uses |
33739 |
* non-initialized list entries. |
33740 |
@@ -48788,9 +46865,9 @@ diff -urNp linux-2.6.38.3/include/linux/poison.h linux-2.6.38.3/include/linux/po |
33741 |
|
33742 |
/********** include/linux/timer.h **********/ |
33743 |
/* |
33744 |
-diff -urNp linux-2.6.38.3/include/linux/proc_fs.h linux-2.6.38.3/include/linux/proc_fs.h |
33745 |
---- linux-2.6.38.3/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000 -0400 |
33746 |
-+++ linux-2.6.38.3/include/linux/proc_fs.h 2011-04-17 15:57:32.000000000 -0400 |
33747 |
+diff -urNp linux-2.6.38.4/include/linux/proc_fs.h linux-2.6.38.4/include/linux/proc_fs.h |
33748 |
+--- linux-2.6.38.4/include/linux/proc_fs.h 2011-03-14 21:20:32.000000000 -0400 |
33749 |
++++ linux-2.6.38.4/include/linux/proc_fs.h 2011-04-17 15:57:32.000000000 -0400 |
33750 |
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro |
33751 |
return proc_create_data(name, mode, parent, proc_fops, NULL); |
33752 |
} |
33753 |
@@ -48811,9 +46888,9 @@ diff -urNp linux-2.6.38.3/include/linux/proc_fs.h linux-2.6.38.3/include/linux/p |
33754 |
static inline struct proc_dir_entry *create_proc_read_entry(const char *name, |
33755 |
mode_t mode, struct proc_dir_entry *base, |
33756 |
read_proc_t *read_proc, void * data) |
33757 |
-diff -urNp linux-2.6.38.3/include/linux/ptrace.h linux-2.6.38.3/include/linux/ptrace.h |
33758 |
---- linux-2.6.38.3/include/linux/ptrace.h 2011-03-14 21:20:32.000000000 -0400 |
33759 |
-+++ linux-2.6.38.3/include/linux/ptrace.h 2011-04-17 15:57:32.000000000 -0400 |
33760 |
+diff -urNp linux-2.6.38.4/include/linux/ptrace.h linux-2.6.38.4/include/linux/ptrace.h |
33761 |
+--- linux-2.6.38.4/include/linux/ptrace.h 2011-03-14 21:20:32.000000000 -0400 |
33762 |
++++ linux-2.6.38.4/include/linux/ptrace.h 2011-04-17 15:57:32.000000000 -0400 |
33763 |
@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_ |
33764 |
extern void exit_ptrace(struct task_struct *tracer); |
33765 |
#define PTRACE_MODE_READ 1 |
33766 |
@@ -48827,9 +46904,9 @@ diff -urNp linux-2.6.38.3/include/linux/ptrace.h linux-2.6.38.3/include/linux/pt |
33767 |
|
33768 |
static inline int ptrace_reparented(struct task_struct *child) |
33769 |
{ |
33770 |
-diff -urNp linux-2.6.38.3/include/linux/random.h linux-2.6.38.3/include/linux/random.h |
33771 |
---- linux-2.6.38.3/include/linux/random.h 2011-03-14 21:20:32.000000000 -0400 |
33772 |
-+++ linux-2.6.38.3/include/linux/random.h 2011-04-17 15:57:32.000000000 -0400 |
33773 |
+diff -urNp linux-2.6.38.4/include/linux/random.h linux-2.6.38.4/include/linux/random.h |
33774 |
+--- linux-2.6.38.4/include/linux/random.h 2011-03-14 21:20:32.000000000 -0400 |
33775 |
++++ linux-2.6.38.4/include/linux/random.h 2011-04-17 15:57:32.000000000 -0400 |
33776 |
@@ -80,12 +80,17 @@ void srandom32(u32 seed); |
33777 |
|
33778 |
u32 prandom32(struct rnd_state *); |
33779 |
@@ -48849,9 +46926,9 @@ diff -urNp linux-2.6.38.3/include/linux/random.h linux-2.6.38.3/include/linux/ra |
33780 |
} |
33781 |
|
33782 |
/** |
33783 |
-diff -urNp linux-2.6.38.3/include/linux/reiserfs_fs.h linux-2.6.38.3/include/linux/reiserfs_fs.h |
33784 |
---- linux-2.6.38.3/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.000000000 -0400 |
33785 |
-+++ linux-2.6.38.3/include/linux/reiserfs_fs.h 2011-04-17 15:57:32.000000000 -0400 |
33786 |
+diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs.h linux-2.6.38.4/include/linux/reiserfs_fs.h |
33787 |
+--- linux-2.6.38.4/include/linux/reiserfs_fs.h 2011-03-14 21:20:32.000000000 -0400 |
33788 |
++++ linux-2.6.38.4/include/linux/reiserfs_fs.h 2011-04-17 15:57:32.000000000 -0400 |
33789 |
@@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset |
33790 |
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ |
33791 |
|
33792 |
@@ -48898,9 +46975,9 @@ diff -urNp linux-2.6.38.3/include/linux/reiserfs_fs.h linux-2.6.38.3/include/lin |
33793 |
|
33794 |
#define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) |
33795 |
#define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) |
33796 |
-diff -urNp linux-2.6.38.3/include/linux/reiserfs_fs_sb.h linux-2.6.38.3/include/linux/reiserfs_fs_sb.h |
33797 |
---- linux-2.6.38.3/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.000000000 -0400 |
33798 |
-+++ linux-2.6.38.3/include/linux/reiserfs_fs_sb.h 2011-04-17 15:57:32.000000000 -0400 |
33799 |
+diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs_sb.h linux-2.6.38.4/include/linux/reiserfs_fs_sb.h |
33800 |
+--- linux-2.6.38.4/include/linux/reiserfs_fs_sb.h 2011-03-14 21:20:32.000000000 -0400 |
33801 |
++++ linux-2.6.38.4/include/linux/reiserfs_fs_sb.h 2011-04-17 15:57:32.000000000 -0400 |
33802 |
@@ -386,7 +386,7 @@ struct reiserfs_sb_info { |
33803 |
/* Comment? -Hans */ |
33804 |
wait_queue_head_t s_wait; |
33805 |
@@ -48910,9 +46987,9 @@ diff -urNp linux-2.6.38.3/include/linux/reiserfs_fs_sb.h linux-2.6.38.3/include/ |
33806 |
// tree gets re-balanced |
33807 |
unsigned long s_properties; /* File system properties. Currently holds |
33808 |
on-disk FS format */ |
33809 |
-diff -urNp linux-2.6.38.3/include/linux/rmap.h linux-2.6.38.3/include/linux/rmap.h |
33810 |
---- linux-2.6.38.3/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0400 |
33811 |
-+++ linux-2.6.38.3/include/linux/rmap.h 2011-04-17 15:57:32.000000000 -0400 |
33812 |
+diff -urNp linux-2.6.38.4/include/linux/rmap.h linux-2.6.38.4/include/linux/rmap.h |
33813 |
+--- linux-2.6.38.4/include/linux/rmap.h 2011-03-14 21:20:32.000000000 -0400 |
33814 |
++++ linux-2.6.38.4/include/linux/rmap.h 2011-04-17 15:57:32.000000000 -0400 |
33815 |
@@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc |
33816 |
void anon_vma_init(void); /* create anon_vma_cachep */ |
33817 |
int anon_vma_prepare(struct vm_area_struct *); |
33818 |
@@ -48924,9 +47001,9 @@ diff -urNp linux-2.6.38.3/include/linux/rmap.h linux-2.6.38.3/include/linux/rmap |
33819 |
void __anon_vma_link(struct vm_area_struct *); |
33820 |
void anon_vma_free(struct anon_vma *); |
33821 |
|
33822 |
-diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sched.h |
33823 |
---- linux-2.6.38.3/include/linux/sched.h 2011-03-14 21:20:32.000000000 -0400 |
33824 |
-+++ linux-2.6.38.3/include/linux/sched.h 2011-04-18 22:03:12.000000000 -0400 |
33825 |
+diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sched.h |
33826 |
+--- linux-2.6.38.4/include/linux/sched.h 2011-04-22 19:20:59.000000000 -0400 |
33827 |
++++ linux-2.6.38.4/include/linux/sched.h 2011-04-22 19:21:35.000000000 -0400 |
33828 |
@@ -99,6 +99,7 @@ struct robust_list_head; |
33829 |
struct bio_list; |
33830 |
struct fs_struct; |
33831 |
@@ -48988,7 +47065,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33832 |
/* Hash table maintenance information */ |
33833 |
struct hlist_node uidhash_node; |
33834 |
uid_t uid; |
33835 |
-@@ -1307,8 +1327,8 @@ struct task_struct { |
33836 |
+@@ -1310,8 +1330,8 @@ struct task_struct { |
33837 |
struct list_head thread_group; |
33838 |
|
33839 |
struct completion *vfork_done; /* for vfork() */ |
33840 |
@@ -48999,7 +47076,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33841 |
|
33842 |
cputime_t utime, stime, utimescaled, stimescaled; |
33843 |
cputime_t gtime; |
33844 |
-@@ -1324,13 +1344,6 @@ struct task_struct { |
33845 |
+@@ -1327,13 +1347,6 @@ struct task_struct { |
33846 |
struct task_cputime cputime_expires; |
33847 |
struct list_head cpu_timers[3]; |
33848 |
|
33849 |
@@ -49013,7 +47090,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33850 |
char comm[TASK_COMM_LEN]; /* executable name excluding path |
33851 |
- access with [gs]et_task_comm (which lock |
33852 |
it with task_lock()) |
33853 |
-@@ -1347,8 +1360,16 @@ struct task_struct { |
33854 |
+@@ -1350,8 +1363,16 @@ struct task_struct { |
33855 |
#endif |
33856 |
/* CPU-specific state of this task */ |
33857 |
struct thread_struct thread; |
33858 |
@@ -49030,7 +47107,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33859 |
/* open file information */ |
33860 |
struct files_struct *files; |
33861 |
/* namespaces */ |
33862 |
-@@ -1395,6 +1416,11 @@ struct task_struct { |
33863 |
+@@ -1398,6 +1419,11 @@ struct task_struct { |
33864 |
struct rt_mutex_waiter *pi_blocked_on; |
33865 |
#endif |
33866 |
|
33867 |
@@ -49042,7 +47119,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33868 |
#ifdef CONFIG_DEBUG_MUTEXES |
33869 |
/* mutex deadlock detection */ |
33870 |
struct mutex_waiter *blocked_on; |
33871 |
-@@ -1499,6 +1525,21 @@ struct task_struct { |
33872 |
+@@ -1502,6 +1528,21 @@ struct task_struct { |
33873 |
unsigned long default_timer_slack_ns; |
33874 |
|
33875 |
struct list_head *scm_work_list; |
33876 |
@@ -49064,7 +47141,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33877 |
#ifdef CONFIG_FUNCTION_GRAPH_TRACER |
33878 |
/* Index of current stored address in ret_stack */ |
33879 |
int curr_ret_stack; |
33880 |
-@@ -1530,6 +1571,51 @@ struct task_struct { |
33881 |
+@@ -1533,6 +1574,51 @@ struct task_struct { |
33882 |
#endif |
33883 |
}; |
33884 |
|
33885 |
@@ -49116,7 +47193,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33886 |
/* Future-safe accessor for struct task_struct's cpus_allowed. */ |
33887 |
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) |
33888 |
|
33889 |
-@@ -1999,7 +2085,9 @@ void yield(void); |
33890 |
+@@ -2002,7 +2088,9 @@ void yield(void); |
33891 |
extern struct exec_domain default_exec_domain; |
33892 |
|
33893 |
union thread_union { |
33894 |
@@ -49126,7 +47203,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33895 |
unsigned long stack[THREAD_SIZE/sizeof(long)]; |
33896 |
}; |
33897 |
|
33898 |
-@@ -2169,7 +2257,7 @@ extern void __cleanup_sighand(struct sig |
33899 |
+@@ -2172,7 +2260,7 @@ extern void __cleanup_sighand(struct sig |
33900 |
extern void exit_itimers(struct signal_struct *); |
33901 |
extern void flush_itimer_signals(void); |
33902 |
|
33903 |
@@ -49135,7 +47212,7 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33904 |
|
33905 |
extern void daemonize(const char *, ...); |
33906 |
extern int allow_signal(int); |
33907 |
-@@ -2310,13 +2398,17 @@ static inline unsigned long *end_of_stac |
33908 |
+@@ -2313,13 +2401,17 @@ static inline unsigned long *end_of_stac |
33909 |
|
33910 |
#endif |
33911 |
|
33912 |
@@ -49155,9 +47232,9 @@ diff -urNp linux-2.6.38.3/include/linux/sched.h linux-2.6.38.3/include/linux/sch |
33913 |
extern void thread_info_cache_init(void); |
33914 |
|
33915 |
#ifdef CONFIG_DEBUG_STACK_USAGE |
33916 |
-diff -urNp linux-2.6.38.3/include/linux/screen_info.h linux-2.6.38.3/include/linux/screen_info.h |
33917 |
---- linux-2.6.38.3/include/linux/screen_info.h 2011-03-14 21:20:32.000000000 -0400 |
33918 |
-+++ linux-2.6.38.3/include/linux/screen_info.h 2011-04-17 15:57:32.000000000 -0400 |
33919 |
+diff -urNp linux-2.6.38.4/include/linux/screen_info.h linux-2.6.38.4/include/linux/screen_info.h |
33920 |
+--- linux-2.6.38.4/include/linux/screen_info.h 2011-03-14 21:20:32.000000000 -0400 |
33921 |
++++ linux-2.6.38.4/include/linux/screen_info.h 2011-04-17 15:57:32.000000000 -0400 |
33922 |
@@ -43,7 +43,8 @@ struct screen_info { |
33923 |
__u16 pages; /* 0x32 */ |
33924 |
__u16 vesa_attributes; /* 0x34 */ |
33925 |
@@ -49168,9 +47245,9 @@ diff -urNp linux-2.6.38.3/include/linux/screen_info.h linux-2.6.38.3/include/lin |
33926 |
} __attribute__((packed)); |
33927 |
|
33928 |
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ |
33929 |
-diff -urNp linux-2.6.38.3/include/linux/security.h linux-2.6.38.3/include/linux/security.h |
33930 |
---- linux-2.6.38.3/include/linux/security.h 2011-03-14 21:20:32.000000000 -0400 |
33931 |
-+++ linux-2.6.38.3/include/linux/security.h 2011-04-17 15:57:32.000000000 -0400 |
33932 |
+diff -urNp linux-2.6.38.4/include/linux/security.h linux-2.6.38.4/include/linux/security.h |
33933 |
+--- linux-2.6.38.4/include/linux/security.h 2011-03-14 21:20:32.000000000 -0400 |
33934 |
++++ linux-2.6.38.4/include/linux/security.h 2011-04-17 15:57:32.000000000 -0400 |
33935 |
@@ -35,6 +35,7 @@ |
33936 |
#include <linux/key.h> |
33937 |
#include <linux/xfrm.h> |
33938 |
@@ -49179,9 +47256,9 @@ diff -urNp linux-2.6.38.3/include/linux/security.h linux-2.6.38.3/include/linux/ |
33939 |
#include <net/flow.h> |
33940 |
|
33941 |
/* Maximum number of letters for an LSM name string */ |
33942 |
-diff -urNp linux-2.6.38.3/include/linux/shm.h linux-2.6.38.3/include/linux/shm.h |
33943 |
---- linux-2.6.38.3/include/linux/shm.h 2011-03-14 21:20:32.000000000 -0400 |
33944 |
-+++ linux-2.6.38.3/include/linux/shm.h 2011-04-17 15:57:32.000000000 -0400 |
33945 |
+diff -urNp linux-2.6.38.4/include/linux/shm.h linux-2.6.38.4/include/linux/shm.h |
33946 |
+--- linux-2.6.38.4/include/linux/shm.h 2011-03-14 21:20:32.000000000 -0400 |
33947 |
++++ linux-2.6.38.4/include/linux/shm.h 2011-04-17 15:57:32.000000000 -0400 |
33948 |
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke |
33949 |
pid_t shm_cprid; |
33950 |
pid_t shm_lprid; |
33951 |
@@ -49193,9 +47270,9 @@ diff -urNp linux-2.6.38.3/include/linux/shm.h linux-2.6.38.3/include/linux/shm.h |
33952 |
}; |
33953 |
|
33954 |
/* shm_mode upper byte flags */ |
33955 |
-diff -urNp linux-2.6.38.3/include/linux/skbuff.h linux-2.6.38.3/include/linux/skbuff.h |
33956 |
---- linux-2.6.38.3/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 -0400 |
33957 |
-+++ linux-2.6.38.3/include/linux/skbuff.h 2011-04-17 15:57:32.000000000 -0400 |
33958 |
+diff -urNp linux-2.6.38.4/include/linux/skbuff.h linux-2.6.38.4/include/linux/skbuff.h |
33959 |
+--- linux-2.6.38.4/include/linux/skbuff.h 2011-03-14 21:20:32.000000000 -0400 |
33960 |
++++ linux-2.6.38.4/include/linux/skbuff.h 2011-04-17 15:57:32.000000000 -0400 |
33961 |
@@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamp |
33962 |
*/ |
33963 |
static inline int skb_queue_empty(const struct sk_buff_head *list) |
33964 |
@@ -49223,9 +47300,9 @@ diff -urNp linux-2.6.38.3/include/linux/skbuff.h linux-2.6.38.3/include/linux/sk |
33965 |
} |
33966 |
|
33967 |
/** |
33968 |
-diff -urNp linux-2.6.38.3/include/linux/slab.h linux-2.6.38.3/include/linux/slab.h |
33969 |
---- linux-2.6.38.3/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0400 |
33970 |
-+++ linux-2.6.38.3/include/linux/slab.h 2011-04-17 15:57:32.000000000 -0400 |
33971 |
+diff -urNp linux-2.6.38.4/include/linux/slab.h linux-2.6.38.4/include/linux/slab.h |
33972 |
+--- linux-2.6.38.4/include/linux/slab.h 2011-03-14 21:20:32.000000000 -0400 |
33973 |
++++ linux-2.6.38.4/include/linux/slab.h 2011-04-17 15:57:32.000000000 -0400 |
33974 |
@@ -11,12 +11,20 @@ |
33975 |
|
33976 |
#include <linux/gfp.h> |
33977 |
@@ -49310,9 +47387,9 @@ diff -urNp linux-2.6.38.3/include/linux/slab.h linux-2.6.38.3/include/linux/slab |
33978 |
+}) |
33979 |
+ |
33980 |
#endif /* _LINUX_SLAB_H */ |
33981 |
-diff -urNp linux-2.6.38.3/include/linux/slub_def.h linux-2.6.38.3/include/linux/slub_def.h |
33982 |
---- linux-2.6.38.3/include/linux/slub_def.h 2011-03-14 21:20:32.000000000 -0400 |
33983 |
-+++ linux-2.6.38.3/include/linux/slub_def.h 2011-04-17 15:57:32.000000000 -0400 |
33984 |
+diff -urNp linux-2.6.38.4/include/linux/slub_def.h linux-2.6.38.4/include/linux/slub_def.h |
33985 |
+--- linux-2.6.38.4/include/linux/slub_def.h 2011-03-14 21:20:32.000000000 -0400 |
33986 |
++++ linux-2.6.38.4/include/linux/slub_def.h 2011-04-17 15:57:32.000000000 -0400 |
33987 |
@@ -79,7 +79,7 @@ struct kmem_cache { |
33988 |
struct kmem_cache_order_objects max; |
33989 |
struct kmem_cache_order_objects min; |
33990 |
@@ -49322,9 +47399,9 @@ diff -urNp linux-2.6.38.3/include/linux/slub_def.h linux-2.6.38.3/include/linux/ |
33991 |
void (*ctor)(void *); |
33992 |
int inuse; /* Offset to metadata */ |
33993 |
int align; /* Alignment */ |
33994 |
-diff -urNp linux-2.6.38.3/include/linux/sonet.h linux-2.6.38.3/include/linux/sonet.h |
33995 |
---- linux-2.6.38.3/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -0400 |
33996 |
-+++ linux-2.6.38.3/include/linux/sonet.h 2011-04-17 15:57:32.000000000 -0400 |
33997 |
+diff -urNp linux-2.6.38.4/include/linux/sonet.h linux-2.6.38.4/include/linux/sonet.h |
33998 |
+--- linux-2.6.38.4/include/linux/sonet.h 2011-03-14 21:20:32.000000000 -0400 |
33999 |
++++ linux-2.6.38.4/include/linux/sonet.h 2011-04-17 15:57:32.000000000 -0400 |
34000 |
@@ -61,7 +61,7 @@ struct sonet_stats { |
34001 |
#include <asm/atomic.h> |
34002 |
|
34003 |
@@ -49334,9 +47411,9 @@ diff -urNp linux-2.6.38.3/include/linux/sonet.h linux-2.6.38.3/include/linux/son |
34004 |
__SONET_ITEMS |
34005 |
#undef __HANDLE_ITEM |
34006 |
}; |
34007 |
-diff -urNp linux-2.6.38.3/include/linux/sunrpc/clnt.h linux-2.6.38.3/include/linux/sunrpc/clnt.h |
34008 |
---- linux-2.6.38.3/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.000000000 -0400 |
34009 |
-+++ linux-2.6.38.3/include/linux/sunrpc/clnt.h 2011-04-17 15:57:32.000000000 -0400 |
34010 |
+diff -urNp linux-2.6.38.4/include/linux/sunrpc/clnt.h linux-2.6.38.4/include/linux/sunrpc/clnt.h |
34011 |
+--- linux-2.6.38.4/include/linux/sunrpc/clnt.h 2011-03-14 21:20:32.000000000 -0400 |
34012 |
++++ linux-2.6.38.4/include/linux/sunrpc/clnt.h 2011-04-17 15:57:32.000000000 -0400 |
34013 |
@@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por |
34014 |
{ |
34015 |
switch (sap->sa_family) { |
34016 |
@@ -49367,9 +47444,9 @@ diff -urNp linux-2.6.38.3/include/linux/sunrpc/clnt.h linux-2.6.38.3/include/lin |
34017 |
} |
34018 |
|
34019 |
#endif /* __KERNEL__ */ |
34020 |
-diff -urNp linux-2.6.38.3/include/linux/suspend.h linux-2.6.38.3/include/linux/suspend.h |
34021 |
---- linux-2.6.38.3/include/linux/suspend.h 2011-03-14 21:20:32.000000000 -0400 |
34022 |
-+++ linux-2.6.38.3/include/linux/suspend.h 2011-04-17 15:57:32.000000000 -0400 |
34023 |
+diff -urNp linux-2.6.38.4/include/linux/suspend.h linux-2.6.38.4/include/linux/suspend.h |
34024 |
+--- linux-2.6.38.4/include/linux/suspend.h 2011-03-14 21:20:32.000000000 -0400 |
34025 |
++++ linux-2.6.38.4/include/linux/suspend.h 2011-04-17 15:57:32.000000000 -0400 |
34026 |
@@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t; |
34027 |
* which require special recovery actions in that situation. |
34028 |
*/ |
34029 |
@@ -49422,9 +47499,9 @@ diff -urNp linux-2.6.38.3/include/linux/suspend.h linux-2.6.38.3/include/linux/s |
34030 |
}; |
34031 |
|
34032 |
#ifdef CONFIG_HIBERNATION |
34033 |
-diff -urNp linux-2.6.38.3/include/linux/sysctl.h linux-2.6.38.3/include/linux/sysctl.h |
34034 |
---- linux-2.6.38.3/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 -0400 |
34035 |
-+++ linux-2.6.38.3/include/linux/sysctl.h 2011-04-17 15:57:32.000000000 -0400 |
34036 |
+diff -urNp linux-2.6.38.4/include/linux/sysctl.h linux-2.6.38.4/include/linux/sysctl.h |
34037 |
+--- linux-2.6.38.4/include/linux/sysctl.h 2011-03-14 21:20:32.000000000 -0400 |
34038 |
++++ linux-2.6.38.4/include/linux/sysctl.h 2011-04-17 15:57:32.000000000 -0400 |
34039 |
@@ -155,7 +155,11 @@ enum |
34040 |
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ |
34041 |
}; |
34042 |
@@ -49447,9 +47524,9 @@ diff -urNp linux-2.6.38.3/include/linux/sysctl.h linux-2.6.38.3/include/linux/sy |
34043 |
extern int proc_dointvec(struct ctl_table *, int, |
34044 |
void __user *, size_t *, loff_t *); |
34045 |
extern int proc_dointvec_minmax(struct ctl_table *, int, |
34046 |
-diff -urNp linux-2.6.38.3/include/linux/sysfs.h linux-2.6.38.3/include/linux/sysfs.h |
34047 |
---- linux-2.6.38.3/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -0400 |
34048 |
-+++ linux-2.6.38.3/include/linux/sysfs.h 2011-04-17 15:57:32.000000000 -0400 |
34049 |
+diff -urNp linux-2.6.38.4/include/linux/sysfs.h linux-2.6.38.4/include/linux/sysfs.h |
34050 |
+--- linux-2.6.38.4/include/linux/sysfs.h 2011-03-14 21:20:32.000000000 -0400 |
34051 |
++++ linux-2.6.38.4/include/linux/sysfs.h 2011-04-17 15:57:32.000000000 -0400 |
34052 |
@@ -110,8 +110,8 @@ struct bin_attribute { |
34053 |
#define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr) |
34054 |
|
34055 |
@@ -49461,9 +47538,9 @@ diff -urNp linux-2.6.38.3/include/linux/sysfs.h linux-2.6.38.3/include/linux/sys |
34056 |
}; |
34057 |
|
34058 |
struct sysfs_dirent; |
34059 |
-diff -urNp linux-2.6.38.3/include/linux/tty.h linux-2.6.38.3/include/linux/tty.h |
34060 |
---- linux-2.6.38.3/include/linux/tty.h 2011-03-14 21:20:32.000000000 -0400 |
34061 |
-+++ linux-2.6.38.3/include/linux/tty.h 2011-04-17 15:57:32.000000000 -0400 |
34062 |
+diff -urNp linux-2.6.38.4/include/linux/tty.h linux-2.6.38.4/include/linux/tty.h |
34063 |
+--- linux-2.6.38.4/include/linux/tty.h 2011-03-14 21:20:32.000000000 -0400 |
34064 |
++++ linux-2.6.38.4/include/linux/tty.h 2011-04-17 15:57:32.000000000 -0400 |
34065 |
@@ -13,6 +13,8 @@ |
34066 |
#include <linux/tty_driver.h> |
34067 |
#include <linux/tty_ldisc.h> |
34068 |
@@ -49500,9 +47577,9 @@ diff -urNp linux-2.6.38.3/include/linux/tty.h linux-2.6.38.3/include/linux/tty.h |
34069 |
|
34070 |
/* n_tty.c */ |
34071 |
extern struct tty_ldisc_ops tty_ldisc_N_TTY; |
34072 |
-diff -urNp linux-2.6.38.3/include/linux/tty_ldisc.h linux-2.6.38.3/include/linux/tty_ldisc.h |
34073 |
---- linux-2.6.38.3/include/linux/tty_ldisc.h 2011-03-14 21:20:32.000000000 -0400 |
34074 |
-+++ linux-2.6.38.3/include/linux/tty_ldisc.h 2011-04-17 15:57:32.000000000 -0400 |
34075 |
+diff -urNp linux-2.6.38.4/include/linux/tty_ldisc.h linux-2.6.38.4/include/linux/tty_ldisc.h |
34076 |
+--- linux-2.6.38.4/include/linux/tty_ldisc.h 2011-03-14 21:20:32.000000000 -0400 |
34077 |
++++ linux-2.6.38.4/include/linux/tty_ldisc.h 2011-04-17 15:57:32.000000000 -0400 |
34078 |
@@ -148,7 +148,7 @@ struct tty_ldisc_ops { |
34079 |
|
34080 |
struct module *owner; |
34081 |
@@ -49512,9 +47589,9 @@ diff -urNp linux-2.6.38.3/include/linux/tty_ldisc.h linux-2.6.38.3/include/linux |
34082 |
}; |
34083 |
|
34084 |
struct tty_ldisc { |
34085 |
-diff -urNp linux-2.6.38.3/include/linux/types.h linux-2.6.38.3/include/linux/types.h |
34086 |
---- linux-2.6.38.3/include/linux/types.h 2011-03-14 21:20:32.000000000 -0400 |
34087 |
-+++ linux-2.6.38.3/include/linux/types.h 2011-04-17 15:57:32.000000000 -0400 |
34088 |
+diff -urNp linux-2.6.38.4/include/linux/types.h linux-2.6.38.4/include/linux/types.h |
34089 |
+--- linux-2.6.38.4/include/linux/types.h 2011-03-14 21:20:32.000000000 -0400 |
34090 |
++++ linux-2.6.38.4/include/linux/types.h 2011-04-17 15:57:32.000000000 -0400 |
34091 |
@@ -207,10 +207,26 @@ typedef struct { |
34092 |
int counter; |
34093 |
} atomic_t; |
34094 |
@@ -49542,9 +47619,9 @@ diff -urNp linux-2.6.38.3/include/linux/types.h linux-2.6.38.3/include/linux/typ |
34095 |
#endif |
34096 |
|
34097 |
struct list_head { |
34098 |
-diff -urNp linux-2.6.38.3/include/linux/uaccess.h linux-2.6.38.3/include/linux/uaccess.h |
34099 |
---- linux-2.6.38.3/include/linux/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
34100 |
-+++ linux-2.6.38.3/include/linux/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
34101 |
+diff -urNp linux-2.6.38.4/include/linux/uaccess.h linux-2.6.38.4/include/linux/uaccess.h |
34102 |
+--- linux-2.6.38.4/include/linux/uaccess.h 2011-03-14 21:20:32.000000000 -0400 |
34103 |
++++ linux-2.6.38.4/include/linux/uaccess.h 2011-04-17 15:57:32.000000000 -0400 |
34104 |
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ |
34105 |
long ret; \ |
34106 |
mm_segment_t old_fs = get_fs(); \ |
34107 |
@@ -49580,9 +47657,9 @@ diff -urNp linux-2.6.38.3/include/linux/uaccess.h linux-2.6.38.3/include/linux/u |
34108 |
+extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size); |
34109 |
|
34110 |
#endif /* __LINUX_UACCESS_H__ */ |
34111 |
-diff -urNp linux-2.6.38.3/include/linux/unaligned/access_ok.h linux-2.6.38.3/include/linux/unaligned/access_ok.h |
34112 |
---- linux-2.6.38.3/include/linux/unaligned/access_ok.h 2011-03-14 21:20:32.000000000 -0400 |
34113 |
-+++ linux-2.6.38.3/include/linux/unaligned/access_ok.h 2011-04-17 15:57:32.000000000 -0400 |
34114 |
+diff -urNp linux-2.6.38.4/include/linux/unaligned/access_ok.h linux-2.6.38.4/include/linux/unaligned/access_ok.h |
34115 |
+--- linux-2.6.38.4/include/linux/unaligned/access_ok.h 2011-03-14 21:20:32.000000000 -0400 |
34116 |
++++ linux-2.6.38.4/include/linux/unaligned/access_ok.h 2011-04-17 15:57:32.000000000 -0400 |
34117 |
@@ -6,32 +6,32 @@ |
34118 |
|
34119 |
static inline u16 get_unaligned_le16(const void *p) |
34120 |
@@ -49622,9 +47699,9 @@ diff -urNp linux-2.6.38.3/include/linux/unaligned/access_ok.h linux-2.6.38.3/inc |
34121 |
} |
34122 |
|
34123 |
static inline void put_unaligned_le16(u16 val, void *p) |
34124 |
-diff -urNp linux-2.6.38.3/include/linux/usb/hcd.h linux-2.6.38.3/include/linux/usb/hcd.h |
34125 |
---- linux-2.6.38.3/include/linux/usb/hcd.h 2011-04-18 17:27:14.000000000 -0400 |
34126 |
-+++ linux-2.6.38.3/include/linux/usb/hcd.h 2011-04-17 15:57:32.000000000 -0400 |
34127 |
+diff -urNp linux-2.6.38.4/include/linux/usb/hcd.h linux-2.6.38.4/include/linux/usb/hcd.h |
34128 |
+--- linux-2.6.38.4/include/linux/usb/hcd.h 2011-04-18 17:27:14.000000000 -0400 |
34129 |
++++ linux-2.6.38.4/include/linux/usb/hcd.h 2011-04-17 15:57:32.000000000 -0400 |
34130 |
@@ -589,7 +589,7 @@ struct usb_mon_operations { |
34131 |
/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */ |
34132 |
}; |
34133 |
@@ -49643,9 +47720,9 @@ diff -urNp linux-2.6.38.3/include/linux/usb/hcd.h linux-2.6.38.3/include/linux/u |
34134 |
void usb_mon_deregister(void); |
34135 |
|
34136 |
#else |
34137 |
-diff -urNp linux-2.6.38.3/include/linux/vmalloc.h linux-2.6.38.3/include/linux/vmalloc.h |
34138 |
---- linux-2.6.38.3/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000 -0400 |
34139 |
-+++ linux-2.6.38.3/include/linux/vmalloc.h 2011-04-17 15:57:32.000000000 -0400 |
34140 |
+diff -urNp linux-2.6.38.4/include/linux/vmalloc.h linux-2.6.38.4/include/linux/vmalloc.h |
34141 |
+--- linux-2.6.38.4/include/linux/vmalloc.h 2011-03-14 21:20:32.000000000 -0400 |
34142 |
++++ linux-2.6.38.4/include/linux/vmalloc.h 2011-04-17 15:57:32.000000000 -0400 |
34143 |
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining |
34144 |
#define VM_MAP 0x00000004 /* vmap()ed pages */ |
34145 |
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ |
34146 |
@@ -49762,9 +47839,9 @@ diff -urNp linux-2.6.38.3/include/linux/vmalloc.h linux-2.6.38.3/include/linux/v |
34147 |
+}) |
34148 |
+ |
34149 |
#endif /* _LINUX_VMALLOC_H */ |
34150 |
-diff -urNp linux-2.6.38.3/include/linux/vmstat.h linux-2.6.38.3/include/linux/vmstat.h |
34151 |
---- linux-2.6.38.3/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 -0400 |
34152 |
-+++ linux-2.6.38.3/include/linux/vmstat.h 2011-04-17 15:57:32.000000000 -0400 |
34153 |
+diff -urNp linux-2.6.38.4/include/linux/vmstat.h linux-2.6.38.4/include/linux/vmstat.h |
34154 |
+--- linux-2.6.38.4/include/linux/vmstat.h 2011-03-14 21:20:32.000000000 -0400 |
34155 |
++++ linux-2.6.38.4/include/linux/vmstat.h 2011-04-17 15:57:32.000000000 -0400 |
34156 |
@@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in |
34157 |
/* |
34158 |
* Zone based page accounting with per cpu differentials. |
34159 |
@@ -49828,9 +47905,9 @@ diff -urNp linux-2.6.38.3/include/linux/vmstat.h linux-2.6.38.3/include/linux/vm |
34160 |
} |
34161 |
|
34162 |
static inline void __dec_zone_page_state(struct page *page, |
34163 |
-diff -urNp linux-2.6.38.3/include/net/inetpeer.h linux-2.6.38.3/include/net/inetpeer.h |
34164 |
---- linux-2.6.38.3/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 -0400 |
34165 |
-+++ linux-2.6.38.3/include/net/inetpeer.h 2011-04-17 15:57:32.000000000 -0400 |
34166 |
+diff -urNp linux-2.6.38.4/include/net/inetpeer.h linux-2.6.38.4/include/net/inetpeer.h |
34167 |
+--- linux-2.6.38.4/include/net/inetpeer.h 2011-03-14 21:20:32.000000000 -0400 |
34168 |
++++ linux-2.6.38.4/include/net/inetpeer.h 2011-04-17 15:57:32.000000000 -0400 |
34169 |
@@ -38,8 +38,8 @@ struct inet_peer { |
34170 |
*/ |
34171 |
union { |
34172 |
@@ -49851,9 +47928,9 @@ diff -urNp linux-2.6.38.3/include/net/inetpeer.h linux-2.6.38.3/include/net/inet |
34173 |
} |
34174 |
|
34175 |
#endif /* _NET_INETPEER_H */ |
34176 |
-diff -urNp linux-2.6.38.3/include/net/irda/ircomm_tty.h linux-2.6.38.3/include/net/irda/ircomm_tty.h |
34177 |
---- linux-2.6.38.3/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000000000 -0400 |
34178 |
-+++ linux-2.6.38.3/include/net/irda/ircomm_tty.h 2011-04-17 15:57:32.000000000 -0400 |
34179 |
+diff -urNp linux-2.6.38.4/include/net/irda/ircomm_tty.h linux-2.6.38.4/include/net/irda/ircomm_tty.h |
34180 |
+--- linux-2.6.38.4/include/net/irda/ircomm_tty.h 2011-03-14 21:20:32.000000000 -0400 |
34181 |
++++ linux-2.6.38.4/include/net/irda/ircomm_tty.h 2011-04-17 15:57:32.000000000 -0400 |
34182 |
@@ -35,6 +35,7 @@ |
34183 |
#include <linux/termios.h> |
34184 |
#include <linux/timer.h> |
34185 |
@@ -49873,9 +47950,9 @@ diff -urNp linux-2.6.38.3/include/net/irda/ircomm_tty.h linux-2.6.38.3/include/n |
34186 |
|
34187 |
/* Protect concurent access to : |
34188 |
* o self->open_count |
34189 |
-diff -urNp linux-2.6.38.3/include/net/neighbour.h linux-2.6.38.3/include/net/neighbour.h |
34190 |
---- linux-2.6.38.3/include/net/neighbour.h 2011-03-14 21:20:32.000000000 -0400 |
34191 |
-+++ linux-2.6.38.3/include/net/neighbour.h 2011-04-17 15:57:32.000000000 -0400 |
34192 |
+diff -urNp linux-2.6.38.4/include/net/neighbour.h linux-2.6.38.4/include/net/neighbour.h |
34193 |
+--- linux-2.6.38.4/include/net/neighbour.h 2011-03-14 21:20:32.000000000 -0400 |
34194 |
++++ linux-2.6.38.4/include/net/neighbour.h 2011-04-17 15:57:32.000000000 -0400 |
34195 |
@@ -118,12 +118,12 @@ struct neighbour { |
34196 |
|
34197 |
struct neigh_ops { |
34198 |
@@ -49895,9 +47972,9 @@ diff -urNp linux-2.6.38.3/include/net/neighbour.h linux-2.6.38.3/include/net/nei |
34199 |
}; |
34200 |
|
34201 |
struct pneigh_entry { |
34202 |
-diff -urNp linux-2.6.38.3/include/net/netlink.h linux-2.6.38.3/include/net/netlink.h |
34203 |
---- linux-2.6.38.3/include/net/netlink.h 2011-03-14 21:20:32.000000000 -0400 |
34204 |
-+++ linux-2.6.38.3/include/net/netlink.h 2011-04-17 15:57:32.000000000 -0400 |
34205 |
+diff -urNp linux-2.6.38.4/include/net/netlink.h linux-2.6.38.4/include/net/netlink.h |
34206 |
+--- linux-2.6.38.4/include/net/netlink.h 2011-03-14 21:20:32.000000000 -0400 |
34207 |
++++ linux-2.6.38.4/include/net/netlink.h 2011-04-17 15:57:32.000000000 -0400 |
34208 |
@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct |
34209 |
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) |
34210 |
{ |
34211 |
@@ -49907,9 +47984,9 @@ diff -urNp linux-2.6.38.3/include/net/netlink.h linux-2.6.38.3/include/net/netli |
34212 |
} |
34213 |
|
34214 |
/** |
34215 |
-diff -urNp linux-2.6.38.3/include/net/sctp/sctp.h linux-2.6.38.3/include/net/sctp/sctp.h |
34216 |
---- linux-2.6.38.3/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000 -0400 |
34217 |
-+++ linux-2.6.38.3/include/net/sctp/sctp.h 2011-04-17 15:57:32.000000000 -0400 |
34218 |
+diff -urNp linux-2.6.38.4/include/net/sctp/sctp.h linux-2.6.38.4/include/net/sctp/sctp.h |
34219 |
+--- linux-2.6.38.4/include/net/sctp/sctp.h 2011-03-14 21:20:32.000000000 -0400 |
34220 |
++++ linux-2.6.38.4/include/net/sctp/sctp.h 2011-04-17 15:57:32.000000000 -0400 |
34221 |
@@ -316,9 +316,9 @@ do { \ |
34222 |
|
34223 |
#else /* SCTP_DEBUG */ |
34224 |
@@ -49923,9 +48000,9 @@ diff -urNp linux-2.6.38.3/include/net/sctp/sctp.h linux-2.6.38.3/include/net/sct |
34225 |
#define SCTP_ENABLE_DEBUG |
34226 |
#define SCTP_DISABLE_DEBUG |
34227 |
#define SCTP_ASSERT(expr, str, func) |
34228 |
-diff -urNp linux-2.6.38.3/include/net/tcp.h linux-2.6.38.3/include/net/tcp.h |
34229 |
---- linux-2.6.38.3/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400 |
34230 |
-+++ linux-2.6.38.3/include/net/tcp.h 2011-04-17 15:57:32.000000000 -0400 |
34231 |
+diff -urNp linux-2.6.38.4/include/net/tcp.h linux-2.6.38.4/include/net/tcp.h |
34232 |
+--- linux-2.6.38.4/include/net/tcp.h 2011-03-14 21:20:32.000000000 -0400 |
34233 |
++++ linux-2.6.38.4/include/net/tcp.h 2011-04-17 15:57:32.000000000 -0400 |
34234 |
@@ -1382,7 +1382,7 @@ enum tcp_seq_states { |
34235 |
struct tcp_seq_afinfo { |
34236 |
char *name; |
34237 |
@@ -49935,9 +48012,9 @@ diff -urNp linux-2.6.38.3/include/net/tcp.h linux-2.6.38.3/include/net/tcp.h |
34238 |
struct seq_operations seq_ops; |
34239 |
}; |
34240 |
|
34241 |
-diff -urNp linux-2.6.38.3/include/net/udp.h linux-2.6.38.3/include/net/udp.h |
34242 |
---- linux-2.6.38.3/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400 |
34243 |
-+++ linux-2.6.38.3/include/net/udp.h 2011-04-17 15:57:32.000000000 -0400 |
34244 |
+diff -urNp linux-2.6.38.4/include/net/udp.h linux-2.6.38.4/include/net/udp.h |
34245 |
+--- linux-2.6.38.4/include/net/udp.h 2011-03-14 21:20:32.000000000 -0400 |
34246 |
++++ linux-2.6.38.4/include/net/udp.h 2011-04-17 15:57:32.000000000 -0400 |
34247 |
@@ -223,7 +223,7 @@ struct udp_seq_afinfo { |
34248 |
char *name; |
34249 |
sa_family_t family; |
34250 |
@@ -49947,9 +48024,9 @@ diff -urNp linux-2.6.38.3/include/net/udp.h linux-2.6.38.3/include/net/udp.h |
34251 |
struct seq_operations seq_ops; |
34252 |
}; |
34253 |
|
34254 |
-diff -urNp linux-2.6.38.3/include/sound/ac97_codec.h linux-2.6.38.3/include/sound/ac97_codec.h |
34255 |
---- linux-2.6.38.3/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000000 -0400 |
34256 |
-+++ linux-2.6.38.3/include/sound/ac97_codec.h 2011-04-17 15:57:32.000000000 -0400 |
34257 |
+diff -urNp linux-2.6.38.4/include/sound/ac97_codec.h linux-2.6.38.4/include/sound/ac97_codec.h |
34258 |
+--- linux-2.6.38.4/include/sound/ac97_codec.h 2011-03-14 21:20:32.000000000 -0400 |
34259 |
++++ linux-2.6.38.4/include/sound/ac97_codec.h 2011-04-17 15:57:32.000000000 -0400 |
34260 |
@@ -419,15 +419,15 @@ |
34261 |
struct snd_ac97; |
34262 |
|
34263 |
@@ -49973,9 +48050,9 @@ diff -urNp linux-2.6.38.3/include/sound/ac97_codec.h linux-2.6.38.3/include/soun |
34264 |
}; |
34265 |
|
34266 |
struct snd_ac97_bus_ops { |
34267 |
-diff -urNp linux-2.6.38.3/include/trace/events/irq.h linux-2.6.38.3/include/trace/events/irq.h |
34268 |
---- linux-2.6.38.3/include/trace/events/irq.h 2011-03-14 21:20:32.000000000 -0400 |
34269 |
-+++ linux-2.6.38.3/include/trace/events/irq.h 2011-04-17 15:57:32.000000000 -0400 |
34270 |
+diff -urNp linux-2.6.38.4/include/trace/events/irq.h linux-2.6.38.4/include/trace/events/irq.h |
34271 |
+--- linux-2.6.38.4/include/trace/events/irq.h 2011-03-14 21:20:32.000000000 -0400 |
34272 |
++++ linux-2.6.38.4/include/trace/events/irq.h 2011-04-17 15:57:32.000000000 -0400 |
34273 |
@@ -36,7 +36,7 @@ struct softirq_action; |
34274 |
*/ |
34275 |
TRACE_EVENT(irq_handler_entry, |
34276 |
@@ -49994,9 +48071,9 @@ diff -urNp linux-2.6.38.3/include/trace/events/irq.h linux-2.6.38.3/include/trac |
34277 |
|
34278 |
TP_ARGS(irq, action, ret), |
34279 |
|
34280 |
-diff -urNp linux-2.6.38.3/include/video/uvesafb.h linux-2.6.38.3/include/video/uvesafb.h |
34281 |
---- linux-2.6.38.3/include/video/uvesafb.h 2011-03-14 21:20:32.000000000 -0400 |
34282 |
-+++ linux-2.6.38.3/include/video/uvesafb.h 2011-04-17 15:57:32.000000000 -0400 |
34283 |
+diff -urNp linux-2.6.38.4/include/video/uvesafb.h linux-2.6.38.4/include/video/uvesafb.h |
34284 |
+--- linux-2.6.38.4/include/video/uvesafb.h 2011-03-14 21:20:32.000000000 -0400 |
34285 |
++++ linux-2.6.38.4/include/video/uvesafb.h 2011-04-17 15:57:32.000000000 -0400 |
34286 |
@@ -177,6 +177,7 @@ struct uvesafb_par { |
34287 |
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ |
34288 |
u8 pmi_setpal; /* PMI for palette changes */ |
34289 |
@@ -50005,9 +48082,9 @@ diff -urNp linux-2.6.38.3/include/video/uvesafb.h linux-2.6.38.3/include/video/u |
34290 |
void *pmi_start; |
34291 |
void *pmi_pal; |
34292 |
u8 *vbe_state_orig; /* |
34293 |
-diff -urNp linux-2.6.38.3/init/do_mounts.c linux-2.6.38.3/init/do_mounts.c |
34294 |
---- linux-2.6.38.3/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400 |
34295 |
-+++ linux-2.6.38.3/init/do_mounts.c 2011-04-17 15:57:32.000000000 -0400 |
34296 |
+diff -urNp linux-2.6.38.4/init/do_mounts.c linux-2.6.38.4/init/do_mounts.c |
34297 |
+--- linux-2.6.38.4/init/do_mounts.c 2011-03-14 21:20:32.000000000 -0400 |
34298 |
++++ linux-2.6.38.4/init/do_mounts.c 2011-04-17 15:57:32.000000000 -0400 |
34299 |
@@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa |
34300 |
|
34301 |
static int __init do_mount_root(char *name, char *fs, int flags, void *data) |
34302 |
@@ -50047,9 +48124,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts.c linux-2.6.38.3/init/do_mounts.c |
34303 |
+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); |
34304 |
sys_chroot((const char __user __force *)"."); |
34305 |
} |
34306 |
-diff -urNp linux-2.6.38.3/init/do_mounts.h linux-2.6.38.3/init/do_mounts.h |
34307 |
---- linux-2.6.38.3/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400 |
34308 |
-+++ linux-2.6.38.3/init/do_mounts.h 2011-04-17 15:57:32.000000000 -0400 |
34309 |
+diff -urNp linux-2.6.38.4/init/do_mounts.h linux-2.6.38.4/init/do_mounts.h |
34310 |
+--- linux-2.6.38.4/init/do_mounts.h 2011-03-14 21:20:32.000000000 -0400 |
34311 |
++++ linux-2.6.38.4/init/do_mounts.h 2011-04-17 15:57:32.000000000 -0400 |
34312 |
@@ -15,15 +15,15 @@ extern int root_mountflags; |
34313 |
|
34314 |
static inline int create_dev(char *name, dev_t dev) |
34315 |
@@ -50069,9 +48146,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts.h linux-2.6.38.3/init/do_mounts.h |
34316 |
return 0; |
34317 |
if (!S_ISBLK(stat.st_mode)) |
34318 |
return 0; |
34319 |
-diff -urNp linux-2.6.38.3/init/do_mounts_initrd.c linux-2.6.38.3/init/do_mounts_initrd.c |
34320 |
---- linux-2.6.38.3/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000 -0400 |
34321 |
-+++ linux-2.6.38.3/init/do_mounts_initrd.c 2011-04-17 15:57:32.000000000 -0400 |
34322 |
+diff -urNp linux-2.6.38.4/init/do_mounts_initrd.c linux-2.6.38.4/init/do_mounts_initrd.c |
34323 |
+--- linux-2.6.38.4/init/do_mounts_initrd.c 2011-03-14 21:20:32.000000000 -0400 |
34324 |
++++ linux-2.6.38.4/init/do_mounts_initrd.c 2011-04-17 15:57:32.000000000 -0400 |
34325 |
@@ -44,13 +44,13 @@ static void __init handle_initrd(void) |
34326 |
create_dev("/dev/root.old", Root_RAM0); |
34327 |
/* mount initrd on rootfs' /root */ |
34328 |
@@ -50146,9 +48223,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts_initrd.c linux-2.6.38.3/init/do_mounts_ |
34329 |
+ sys_unlink((__force const char __user *)"/initrd.image"); |
34330 |
return 0; |
34331 |
} |
34332 |
-diff -urNp linux-2.6.38.3/init/do_mounts_md.c linux-2.6.38.3/init/do_mounts_md.c |
34333 |
---- linux-2.6.38.3/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -0400 |
34334 |
-+++ linux-2.6.38.3/init/do_mounts_md.c 2011-04-17 15:57:32.000000000 -0400 |
34335 |
+diff -urNp linux-2.6.38.4/init/do_mounts_md.c linux-2.6.38.4/init/do_mounts_md.c |
34336 |
+--- linux-2.6.38.4/init/do_mounts_md.c 2011-03-14 21:20:32.000000000 -0400 |
34337 |
++++ linux-2.6.38.4/init/do_mounts_md.c 2011-04-17 15:57:32.000000000 -0400 |
34338 |
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) |
34339 |
partitioned ? "_d" : "", minor, |
34340 |
md_setup_args[ent].device_names); |
34341 |
@@ -50167,9 +48244,9 @@ diff -urNp linux-2.6.38.3/init/do_mounts_md.c linux-2.6.38.3/init/do_mounts_md.c |
34342 |
sys_ioctl(fd, BLKRRPART, 0); |
34343 |
} |
34344 |
sys_close(fd); |
34345 |
-diff -urNp linux-2.6.38.3/init/initramfs.c linux-2.6.38.3/init/initramfs.c |
34346 |
---- linux-2.6.38.3/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400 |
34347 |
-+++ linux-2.6.38.3/init/initramfs.c 2011-04-17 15:57:32.000000000 -0400 |
34348 |
+diff -urNp linux-2.6.38.4/init/initramfs.c linux-2.6.38.4/init/initramfs.c |
34349 |
+--- linux-2.6.38.4/init/initramfs.c 2011-03-14 21:20:32.000000000 -0400 |
34350 |
++++ linux-2.6.38.4/init/initramfs.c 2011-04-17 15:57:32.000000000 -0400 |
34351 |
@@ -74,7 +74,7 @@ static void __init free_hash(void) |
34352 |
} |
34353 |
} |
34354 |
@@ -50278,9 +48355,9 @@ diff -urNp linux-2.6.38.3/init/initramfs.c linux-2.6.38.3/init/initramfs.c |
34355 |
state = SkipIt; |
34356 |
next_state = Reset; |
34357 |
return 0; |
34358 |
-diff -urNp linux-2.6.38.3/init/Kconfig linux-2.6.38.3/init/Kconfig |
34359 |
---- linux-2.6.38.3/init/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
34360 |
-+++ linux-2.6.38.3/init/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
34361 |
+diff -urNp linux-2.6.38.4/init/Kconfig linux-2.6.38.4/init/Kconfig |
34362 |
+--- linux-2.6.38.4/init/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
34363 |
++++ linux-2.6.38.4/init/Kconfig 2011-04-17 15:57:32.000000000 -0400 |
34364 |
@@ -1185,7 +1185,7 @@ config SLUB_DEBUG |
34365 |
|
34366 |
config COMPAT_BRK |
34367 |
@@ -50290,9 +48367,9 @@ diff -urNp linux-2.6.38.3/init/Kconfig linux-2.6.38.3/init/Kconfig |
34368 |
help |
34369 |
Randomizing heap placement makes heap exploits harder, but it |
34370 |
also breaks ancient binaries (including anything libc5 based). |
34371 |
-diff -urNp linux-2.6.38.3/init/main.c linux-2.6.38.3/init/main.c |
34372 |
---- linux-2.6.38.3/init/main.c 2011-03-14 21:20:32.000000000 -0400 |
34373 |
-+++ linux-2.6.38.3/init/main.c 2011-04-17 15:57:32.000000000 -0400 |
34374 |
+diff -urNp linux-2.6.38.4/init/main.c linux-2.6.38.4/init/main.c |
34375 |
+--- linux-2.6.38.4/init/main.c 2011-03-14 21:20:32.000000000 -0400 |
34376 |
++++ linux-2.6.38.4/init/main.c 2011-04-17 15:57:32.000000000 -0400 |
34377 |
@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) |
34378 |
extern void tc_init(void); |
34379 |
#endif |
34380 |
@@ -50402,9 +48479,9 @@ diff -urNp linux-2.6.38.3/init/main.c linux-2.6.38.3/init/main.c |
34381 |
/* |
34382 |
* Ok, we have completed the initial bootup, and |
34383 |
* we're essentially up and running. Get rid of the |
34384 |
-diff -urNp linux-2.6.38.3/ipc/mqueue.c linux-2.6.38.3/ipc/mqueue.c |
34385 |
---- linux-2.6.38.3/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400 |
34386 |
-+++ linux-2.6.38.3/ipc/mqueue.c 2011-04-17 15:57:32.000000000 -0400 |
34387 |
+diff -urNp linux-2.6.38.4/ipc/mqueue.c linux-2.6.38.4/ipc/mqueue.c |
34388 |
+--- linux-2.6.38.4/ipc/mqueue.c 2011-03-14 21:20:32.000000000 -0400 |
34389 |
++++ linux-2.6.38.4/ipc/mqueue.c 2011-04-17 15:57:32.000000000 -0400 |
34390 |
@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st |
34391 |
mq_bytes = (mq_msg_tblsz + |
34392 |
(info->attr.mq_maxmsg * info->attr.mq_msgsize)); |
34393 |
@@ -50413,9 +48490,9 @@ diff -urNp linux-2.6.38.3/ipc/mqueue.c linux-2.6.38.3/ipc/mqueue.c |
34394 |
spin_lock(&mq_lock); |
34395 |
if (u->mq_bytes + mq_bytes < u->mq_bytes || |
34396 |
u->mq_bytes + mq_bytes > |
34397 |
-diff -urNp linux-2.6.38.3/ipc/shm.c linux-2.6.38.3/ipc/shm.c |
34398 |
---- linux-2.6.38.3/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400 |
34399 |
-+++ linux-2.6.38.3/ipc/shm.c 2011-04-17 15:57:32.000000000 -0400 |
34400 |
+diff -urNp linux-2.6.38.4/ipc/shm.c linux-2.6.38.4/ipc/shm.c |
34401 |
+--- linux-2.6.38.4/ipc/shm.c 2011-03-14 21:20:32.000000000 -0400 |
34402 |
++++ linux-2.6.38.4/ipc/shm.c 2011-04-17 15:57:32.000000000 -0400 |
34403 |
@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name |
34404 |
static int sysvipc_shm_proc_show(struct seq_file *s, void *it); |
34405 |
#endif |
34406 |
@@ -50477,9 +48554,9 @@ diff -urNp linux-2.6.38.3/ipc/shm.c linux-2.6.38.3/ipc/shm.c |
34407 |
size = i_size_read(path.dentry->d_inode); |
34408 |
shm_unlock(shp); |
34409 |
|
34410 |
-diff -urNp linux-2.6.38.3/kernel/acct.c linux-2.6.38.3/kernel/acct.c |
34411 |
---- linux-2.6.38.3/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400 |
34412 |
-+++ linux-2.6.38.3/kernel/acct.c 2011-04-17 15:57:32.000000000 -0400 |
34413 |
+diff -urNp linux-2.6.38.4/kernel/acct.c linux-2.6.38.4/kernel/acct.c |
34414 |
+--- linux-2.6.38.4/kernel/acct.c 2011-03-14 21:20:32.000000000 -0400 |
34415 |
++++ linux-2.6.38.4/kernel/acct.c 2011-04-17 15:57:32.000000000 -0400 |
34416 |
@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a |
34417 |
*/ |
34418 |
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; |
34419 |
@@ -50489,9 +48566,9 @@ diff -urNp linux-2.6.38.3/kernel/acct.c linux-2.6.38.3/kernel/acct.c |
34420 |
sizeof(acct_t), &file->f_pos); |
34421 |
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; |
34422 |
set_fs(fs); |
34423 |
-diff -urNp linux-2.6.38.3/kernel/capability.c linux-2.6.38.3/kernel/capability.c |
34424 |
---- linux-2.6.38.3/kernel/capability.c 2011-03-14 21:20:32.000000000 -0400 |
34425 |
-+++ linux-2.6.38.3/kernel/capability.c 2011-04-17 15:57:32.000000000 -0400 |
34426 |
+diff -urNp linux-2.6.38.4/kernel/capability.c linux-2.6.38.4/kernel/capability.c |
34427 |
+--- linux-2.6.38.4/kernel/capability.c 2011-03-14 21:20:32.000000000 -0400 |
34428 |
++++ linux-2.6.38.4/kernel/capability.c 2011-04-17 15:57:32.000000000 -0400 |
34429 |
@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_ |
34430 |
* before modification is attempted and the application |
34431 |
* fails. |
34432 |
@@ -50530,9 +48607,9 @@ diff -urNp linux-2.6.38.3/kernel/capability.c linux-2.6.38.3/kernel/capability.c |
34433 |
+ |
34434 |
EXPORT_SYMBOL(capable); |
34435 |
+EXPORT_SYMBOL(capable_nolog); |
34436 |
-diff -urNp linux-2.6.38.3/kernel/compat.c linux-2.6.38.3/kernel/compat.c |
34437 |
---- linux-2.6.38.3/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400 |
34438 |
-+++ linux-2.6.38.3/kernel/compat.c 2011-04-17 15:57:32.000000000 -0400 |
34439 |
+diff -urNp linux-2.6.38.4/kernel/compat.c linux-2.6.38.4/kernel/compat.c |
34440 |
+--- linux-2.6.38.4/kernel/compat.c 2011-03-14 21:20:32.000000000 -0400 |
34441 |
++++ linux-2.6.38.4/kernel/compat.c 2011-04-17 15:57:32.000000000 -0400 |
34442 |
@@ -13,6 +13,7 @@ |
34443 |
|
34444 |
#include <linux/linkage.h> |
34445 |
@@ -50541,9 +48618,9 @@ diff -urNp linux-2.6.38.3/kernel/compat.c linux-2.6.38.3/kernel/compat.c |
34446 |
#include <linux/errno.h> |
34447 |
#include <linux/time.h> |
34448 |
#include <linux/signal.h> |
34449 |
-diff -urNp linux-2.6.38.3/kernel/configs.c linux-2.6.38.3/kernel/configs.c |
34450 |
---- linux-2.6.38.3/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400 |
34451 |
-+++ linux-2.6.38.3/kernel/configs.c 2011-04-17 15:57:32.000000000 -0400 |
34452 |
+diff -urNp linux-2.6.38.4/kernel/configs.c linux-2.6.38.4/kernel/configs.c |
34453 |
+--- linux-2.6.38.4/kernel/configs.c 2011-03-14 21:20:32.000000000 -0400 |
34454 |
++++ linux-2.6.38.4/kernel/configs.c 2011-04-17 15:57:32.000000000 -0400 |
34455 |
@@ -74,8 +74,19 @@ static int __init ikconfig_init(void) |
34456 |
struct proc_dir_entry *entry; |
34457 |
|
34458 |
@@ -50564,9 +48641,9 @@ diff -urNp linux-2.6.38.3/kernel/configs.c linux-2.6.38.3/kernel/configs.c |
34459 |
if (!entry) |
34460 |
return -ENOMEM; |
34461 |
|
34462 |
-diff -urNp linux-2.6.38.3/kernel/cred.c linux-2.6.38.3/kernel/cred.c |
34463 |
---- linux-2.6.38.3/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400 |
34464 |
-+++ linux-2.6.38.3/kernel/cred.c 2011-04-17 15:57:32.000000000 -0400 |
34465 |
+diff -urNp linux-2.6.38.4/kernel/cred.c linux-2.6.38.4/kernel/cred.c |
34466 |
+--- linux-2.6.38.4/kernel/cred.c 2011-03-14 21:20:32.000000000 -0400 |
34467 |
++++ linux-2.6.38.4/kernel/cred.c 2011-04-17 15:57:32.000000000 -0400 |
34468 |
@@ -483,6 +483,8 @@ int commit_creds(struct cred *new) |
34469 |
|
34470 |
get_cred(new); /* we will require a ref for the subj creds too */ |
34471 |
@@ -50576,9 +48653,9 @@ diff -urNp linux-2.6.38.3/kernel/cred.c linux-2.6.38.3/kernel/cred.c |
34472 |
/* dumpability changes */ |
34473 |
if (old->euid != new->euid || |
34474 |
old->egid != new->egid || |
34475 |
-diff -urNp linux-2.6.38.3/kernel/debug/debug_core.c linux-2.6.38.3/kernel/debug/debug_core.c |
34476 |
---- linux-2.6.38.3/kernel/debug/debug_core.c 2011-03-14 21:20:32.000000000 -0400 |
34477 |
-+++ linux-2.6.38.3/kernel/debug/debug_core.c 2011-04-17 15:57:32.000000000 -0400 |
34478 |
+diff -urNp linux-2.6.38.4/kernel/debug/debug_core.c linux-2.6.38.4/kernel/debug/debug_core.c |
34479 |
+--- linux-2.6.38.4/kernel/debug/debug_core.c 2011-03-14 21:20:32.000000000 -0400 |
34480 |
++++ linux-2.6.38.4/kernel/debug/debug_core.c 2011-04-17 15:57:32.000000000 -0400 |
34481 |
@@ -72,7 +72,7 @@ int kgdb_io_module_registered; |
34482 |
/* Guard for recursive entry */ |
34483 |
static int exception_level; |
34484 |
@@ -50606,9 +48683,9 @@ diff -urNp linux-2.6.38.3/kernel/debug/debug_core.c linux-2.6.38.3/kernel/debug/ |
34485 |
{ |
34486 |
BUG_ON(kgdb_connected); |
34487 |
|
34488 |
-diff -urNp linux-2.6.38.3/kernel/debug/kdb/kdb_main.c linux-2.6.38.3/kernel/debug/kdb/kdb_main.c |
34489 |
---- linux-2.6.38.3/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.000000000 -0400 |
34490 |
-+++ linux-2.6.38.3/kernel/debug/kdb/kdb_main.c 2011-04-17 15:57:32.000000000 -0400 |
34491 |
+diff -urNp linux-2.6.38.4/kernel/debug/kdb/kdb_main.c linux-2.6.38.4/kernel/debug/kdb/kdb_main.c |
34492 |
+--- linux-2.6.38.4/kernel/debug/kdb/kdb_main.c 2011-03-14 21:20:32.000000000 -0400 |
34493 |
++++ linux-2.6.38.4/kernel/debug/kdb/kdb_main.c 2011-04-17 15:57:32.000000000 -0400 |
34494 |
@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha |
34495 |
list_for_each_entry(mod, kdb_modules, list) { |
34496 |
|
34497 |
@@ -50627,9 +48704,9 @@ diff -urNp linux-2.6.38.3/kernel/debug/kdb/kdb_main.c linux-2.6.38.3/kernel/debu |
34498 |
|
34499 |
#ifdef CONFIG_MODULE_UNLOAD |
34500 |
{ |
34501 |
-diff -urNp linux-2.6.38.3/kernel/exit.c linux-2.6.38.3/kernel/exit.c |
34502 |
---- linux-2.6.38.3/kernel/exit.c 2011-03-14 21:20:32.000000000 -0400 |
34503 |
-+++ linux-2.6.38.3/kernel/exit.c 2011-04-17 15:57:32.000000000 -0400 |
34504 |
+diff -urNp linux-2.6.38.4/kernel/exit.c linux-2.6.38.4/kernel/exit.c |
34505 |
+--- linux-2.6.38.4/kernel/exit.c 2011-03-14 21:20:32.000000000 -0400 |
34506 |
++++ linux-2.6.38.4/kernel/exit.c 2011-04-17 15:57:32.000000000 -0400 |
34507 |
@@ -57,6 +57,10 @@ |
34508 |
#include <asm/pgtable.h> |
34509 |
#include <asm/mmu_context.h> |
34510 |
@@ -50749,9 +48826,9 @@ diff -urNp linux-2.6.38.3/kernel/exit.c linux-2.6.38.3/kernel/exit.c |
34511 |
exit_mm(tsk); |
34512 |
|
34513 |
if (group_dead) |
34514 |
-diff -urNp linux-2.6.38.3/kernel/fork.c linux-2.6.38.3/kernel/fork.c |
34515 |
---- linux-2.6.38.3/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400 |
34516 |
-+++ linux-2.6.38.3/kernel/fork.c 2011-04-17 15:57:32.000000000 -0400 |
34517 |
+diff -urNp linux-2.6.38.4/kernel/fork.c linux-2.6.38.4/kernel/fork.c |
34518 |
+--- linux-2.6.38.4/kernel/fork.c 2011-03-14 21:20:32.000000000 -0400 |
34519 |
++++ linux-2.6.38.4/kernel/fork.c 2011-04-17 15:57:32.000000000 -0400 |
34520 |
@@ -280,7 +280,7 @@ static struct task_struct *dup_task_stru |
34521 |
*stackend = STACK_END_MAGIC; /* for overflow detection */ |
34522 |
|
34523 |
@@ -51048,9 +49125,9 @@ diff -urNp linux-2.6.38.3/kernel/fork.c linux-2.6.38.3/kernel/fork.c |
34524 |
new_fs = NULL; |
34525 |
else |
34526 |
new_fs = fs; |
34527 |
-diff -urNp linux-2.6.38.3/kernel/futex.c linux-2.6.38.3/kernel/futex.c |
34528 |
---- linux-2.6.38.3/kernel/futex.c 2011-03-14 21:20:32.000000000 -0400 |
34529 |
-+++ linux-2.6.38.3/kernel/futex.c 2011-04-17 15:57:32.000000000 -0400 |
34530 |
+diff -urNp linux-2.6.38.4/kernel/futex.c linux-2.6.38.4/kernel/futex.c |
34531 |
+--- linux-2.6.38.4/kernel/futex.c 2011-04-22 19:20:59.000000000 -0400 |
34532 |
++++ linux-2.6.38.4/kernel/futex.c 2011-04-22 19:21:35.000000000 -0400 |
34533 |
@@ -54,6 +54,7 @@ |
34534 |
#include <linux/mount.h> |
34535 |
#include <linux/pagemap.h> |
34536 |
@@ -51117,9 +49194,9 @@ diff -urNp linux-2.6.38.3/kernel/futex.c linux-2.6.38.3/kernel/futex.c |
34537 |
if (curval == -EFAULT) |
34538 |
futex_cmpxchg_enabled = 1; |
34539 |
|
34540 |
-diff -urNp linux-2.6.38.3/kernel/futex_compat.c linux-2.6.38.3/kernel/futex_compat.c |
34541 |
---- linux-2.6.38.3/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -0400 |
34542 |
-+++ linux-2.6.38.3/kernel/futex_compat.c 2011-04-17 15:57:32.000000000 -0400 |
34543 |
+diff -urNp linux-2.6.38.4/kernel/futex_compat.c linux-2.6.38.4/kernel/futex_compat.c |
34544 |
+--- linux-2.6.38.4/kernel/futex_compat.c 2011-03-14 21:20:32.000000000 -0400 |
34545 |
++++ linux-2.6.38.4/kernel/futex_compat.c 2011-04-17 15:57:32.000000000 -0400 |
34546 |
@@ -10,6 +10,7 @@ |
34547 |
#include <linux/compat.h> |
34548 |
#include <linux/nsproxy.h> |
34549 |
@@ -51157,9 +49234,9 @@ diff -urNp linux-2.6.38.3/kernel/futex_compat.c linux-2.6.38.3/kernel/futex_comp |
34550 |
head = p->compat_robust_list; |
34551 |
rcu_read_unlock(); |
34552 |
} |
34553 |
-diff -urNp linux-2.6.38.3/kernel/gcov/base.c linux-2.6.38.3/kernel/gcov/base.c |
34554 |
---- linux-2.6.38.3/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -0400 |
34555 |
-+++ linux-2.6.38.3/kernel/gcov/base.c 2011-04-17 15:57:32.000000000 -0400 |
34556 |
+diff -urNp linux-2.6.38.4/kernel/gcov/base.c linux-2.6.38.4/kernel/gcov/base.c |
34557 |
+--- linux-2.6.38.4/kernel/gcov/base.c 2011-03-14 21:20:32.000000000 -0400 |
34558 |
++++ linux-2.6.38.4/kernel/gcov/base.c 2011-04-17 15:57:32.000000000 -0400 |
34559 |
@@ -102,11 +102,6 @@ void gcov_enable_events(void) |
34560 |
} |
34561 |
|
34562 |
@@ -51181,9 +49258,9 @@ diff -urNp linux-2.6.38.3/kernel/gcov/base.c linux-2.6.38.3/kernel/gcov/base.c |
34563 |
if (prev) |
34564 |
prev->next = info->next; |
34565 |
else |
34566 |
-diff -urNp linux-2.6.38.3/kernel/hrtimer.c linux-2.6.38.3/kernel/hrtimer.c |
34567 |
---- linux-2.6.38.3/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400 |
34568 |
-+++ linux-2.6.38.3/kernel/hrtimer.c 2011-04-17 15:57:32.000000000 -0400 |
34569 |
+diff -urNp linux-2.6.38.4/kernel/hrtimer.c linux-2.6.38.4/kernel/hrtimer.c |
34570 |
+--- linux-2.6.38.4/kernel/hrtimer.c 2011-03-14 21:20:32.000000000 -0400 |
34571 |
++++ linux-2.6.38.4/kernel/hrtimer.c 2011-04-17 15:57:32.000000000 -0400 |
34572 |
@@ -1371,7 +1371,7 @@ void hrtimer_peek_ahead_timers(void) |
34573 |
local_irq_restore(flags); |
34574 |
} |
34575 |
@@ -51193,9 +49270,9 @@ diff -urNp linux-2.6.38.3/kernel/hrtimer.c linux-2.6.38.3/kernel/hrtimer.c |
34576 |
{ |
34577 |
hrtimer_peek_ahead_timers(); |
34578 |
} |
34579 |
-diff -urNp linux-2.6.38.3/kernel/jump_label.c linux-2.6.38.3/kernel/jump_label.c |
34580 |
---- linux-2.6.38.3/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -0400 |
34581 |
-+++ linux-2.6.38.3/kernel/jump_label.c 2011-04-17 15:57:32.000000000 -0400 |
34582 |
+diff -urNp linux-2.6.38.4/kernel/jump_label.c linux-2.6.38.4/kernel/jump_label.c |
34583 |
+--- linux-2.6.38.4/kernel/jump_label.c 2011-03-14 21:20:32.000000000 -0400 |
34584 |
++++ linux-2.6.38.4/kernel/jump_label.c 2011-04-17 15:57:32.000000000 -0400 |
34585 |
@@ -49,6 +49,17 @@ void jump_label_unlock(void) |
34586 |
mutex_unlock(&jump_label_mutex); |
34587 |
} |
34588 |
@@ -51236,9 +49313,9 @@ diff -urNp linux-2.6.38.3/kernel/jump_label.c linux-2.6.38.3/kernel/jump_label.c |
34589 |
iter++; |
34590 |
} |
34591 |
} |
34592 |
-diff -urNp linux-2.6.38.3/kernel/kallsyms.c linux-2.6.38.3/kernel/kallsyms.c |
34593 |
---- linux-2.6.38.3/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400 |
34594 |
-+++ linux-2.6.38.3/kernel/kallsyms.c 2011-04-17 15:57:32.000000000 -0400 |
34595 |
+diff -urNp linux-2.6.38.4/kernel/kallsyms.c linux-2.6.38.4/kernel/kallsyms.c |
34596 |
+--- linux-2.6.38.4/kernel/kallsyms.c 2011-03-14 21:20:32.000000000 -0400 |
34597 |
++++ linux-2.6.38.4/kernel/kallsyms.c 2011-04-17 15:57:32.000000000 -0400 |
34598 |
@@ -11,6 +11,9 @@ |
34599 |
* Changed the compression method from stem compression to "table lookup" |
34600 |
* compression (see scripts/kallsyms.c for a more complete description) |
34601 |
@@ -51341,9 +49418,9 @@ diff -urNp linux-2.6.38.3/kernel/kallsyms.c linux-2.6.38.3/kernel/kallsyms.c |
34602 |
if (!iter) |
34603 |
return -ENOMEM; |
34604 |
reset_iter(iter, 0); |
34605 |
-diff -urNp linux-2.6.38.3/kernel/kmod.c linux-2.6.38.3/kernel/kmod.c |
34606 |
---- linux-2.6.38.3/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400 |
34607 |
-+++ linux-2.6.38.3/kernel/kmod.c 2011-04-17 15:57:32.000000000 -0400 |
34608 |
+diff -urNp linux-2.6.38.4/kernel/kmod.c linux-2.6.38.4/kernel/kmod.c |
34609 |
+--- linux-2.6.38.4/kernel/kmod.c 2011-03-14 21:20:32.000000000 -0400 |
34610 |
++++ linux-2.6.38.4/kernel/kmod.c 2011-04-17 15:57:32.000000000 -0400 |
34611 |
@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb |
34612 |
* If module auto-loading support is disabled then this function |
34613 |
* becomes a no-operation. |
34614 |
@@ -51440,9 +49517,9 @@ diff -urNp linux-2.6.38.3/kernel/kmod.c linux-2.6.38.3/kernel/kmod.c |
34615 |
EXPORT_SYMBOL(__request_module); |
34616 |
#endif /* CONFIG_MODULES */ |
34617 |
|
34618 |
-diff -urNp linux-2.6.38.3/kernel/kprobes.c linux-2.6.38.3/kernel/kprobes.c |
34619 |
---- linux-2.6.38.3/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 |
34620 |
-+++ linux-2.6.38.3/kernel/kprobes.c 2011-04-17 15:57:32.000000000 -0400 |
34621 |
+diff -urNp linux-2.6.38.4/kernel/kprobes.c linux-2.6.38.4/kernel/kprobes.c |
34622 |
+--- linux-2.6.38.4/kernel/kprobes.c 2011-03-14 21:20:32.000000000 -0400 |
34623 |
++++ linux-2.6.38.4/kernel/kprobes.c 2011-04-17 15:57:32.000000000 -0400 |
34624 |
@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_ |
34625 |
* kernel image and loaded module images reside. This is required |
34626 |
* so x86_64 can correctly handle the %rip-relative fixups. |
34627 |
@@ -51479,9 +49556,9 @@ diff -urNp linux-2.6.38.3/kernel/kprobes.c linux-2.6.38.3/kernel/kprobes.c |
34628 |
|
34629 |
head = &kprobe_table[i]; |
34630 |
preempt_disable(); |
34631 |
-diff -urNp linux-2.6.38.3/kernel/lockdep.c linux-2.6.38.3/kernel/lockdep.c |
34632 |
---- linux-2.6.38.3/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400 |
34633 |
-+++ linux-2.6.38.3/kernel/lockdep.c 2011-04-17 15:57:32.000000000 -0400 |
34634 |
+diff -urNp linux-2.6.38.4/kernel/lockdep.c linux-2.6.38.4/kernel/lockdep.c |
34635 |
+--- linux-2.6.38.4/kernel/lockdep.c 2011-03-14 21:20:32.000000000 -0400 |
34636 |
++++ linux-2.6.38.4/kernel/lockdep.c 2011-04-17 15:57:32.000000000 -0400 |
34637 |
@@ -571,6 +571,10 @@ static int static_obj(void *obj) |
34638 |
end = (unsigned long) &_end, |
34639 |
addr = (unsigned long) obj; |
34640 |
@@ -51510,9 +49587,9 @@ diff -urNp linux-2.6.38.3/kernel/lockdep.c linux-2.6.38.3/kernel/lockdep.c |
34641 |
if (very_verbose(class)) { |
34642 |
printk("\nacquire class [%p] %s", class->key, class->name); |
34643 |
if (class->name_version > 1) |
34644 |
-diff -urNp linux-2.6.38.3/kernel/lockdep_proc.c linux-2.6.38.3/kernel/lockdep_proc.c |
34645 |
---- linux-2.6.38.3/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -0400 |
34646 |
-+++ linux-2.6.38.3/kernel/lockdep_proc.c 2011-04-17 15:57:32.000000000 -0400 |
34647 |
+diff -urNp linux-2.6.38.4/kernel/lockdep_proc.c linux-2.6.38.4/kernel/lockdep_proc.c |
34648 |
+--- linux-2.6.38.4/kernel/lockdep_proc.c 2011-03-14 21:20:32.000000000 -0400 |
34649 |
++++ linux-2.6.38.4/kernel/lockdep_proc.c 2011-04-17 15:57:32.000000000 -0400 |
34650 |
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v |
34651 |
|
34652 |
static void print_name(struct seq_file *m, struct lock_class *class) |
34653 |
@@ -51522,9 +49599,9 @@ diff -urNp linux-2.6.38.3/kernel/lockdep_proc.c linux-2.6.38.3/kernel/lockdep_pr |
34654 |
const char *name = class->name; |
34655 |
|
34656 |
if (!name) { |
34657 |
-diff -urNp linux-2.6.38.3/kernel/module.c linux-2.6.38.3/kernel/module.c |
34658 |
---- linux-2.6.38.3/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
34659 |
-+++ linux-2.6.38.3/kernel/module.c 2011-04-17 16:05:04.000000000 -0400 |
34660 |
+diff -urNp linux-2.6.38.4/kernel/module.c linux-2.6.38.4/kernel/module.c |
34661 |
+--- linux-2.6.38.4/kernel/module.c 2011-03-14 21:20:32.000000000 -0400 |
34662 |
++++ linux-2.6.38.4/kernel/module.c 2011-04-17 16:05:04.000000000 -0400 |
34663 |
@@ -57,6 +57,7 @@ |
34664 |
#include <linux/kmemleak.h> |
34665 |
#include <linux/jump_label.h> |
34666 |
@@ -52247,9 +50324,9 @@ diff -urNp linux-2.6.38.3/kernel/module.c linux-2.6.38.3/kernel/module.c |
34667 |
mod = NULL; |
34668 |
} |
34669 |
return mod; |
34670 |
-diff -urNp linux-2.6.38.3/kernel/mutex.c linux-2.6.38.3/kernel/mutex.c |
34671 |
---- linux-2.6.38.3/kernel/mutex.c 2011-03-14 21:20:32.000000000 -0400 |
34672 |
-+++ linux-2.6.38.3/kernel/mutex.c 2011-04-17 16:24:38.000000000 -0400 |
34673 |
+diff -urNp linux-2.6.38.4/kernel/mutex.c linux-2.6.38.4/kernel/mutex.c |
34674 |
+--- linux-2.6.38.4/kernel/mutex.c 2011-03-14 21:20:32.000000000 -0400 |
34675 |
++++ linux-2.6.38.4/kernel/mutex.c 2011-04-17 16:24:38.000000000 -0400 |
34676 |
@@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock, |
34677 |
*/ |
34678 |
|
34679 |
@@ -52287,9 +50364,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex.c linux-2.6.38.3/kernel/mutex.c |
34680 |
mutex_set_owner(lock); |
34681 |
|
34682 |
/* set it to 0 if there are no waiters left: */ |
34683 |
-diff -urNp linux-2.6.38.3/kernel/mutex-debug.c linux-2.6.38.3/kernel/mutex-debug.c |
34684 |
---- linux-2.6.38.3/kernel/mutex-debug.c 2011-03-14 21:20:32.000000000 -0400 |
34685 |
-+++ linux-2.6.38.3/kernel/mutex-debug.c 2011-04-17 16:23:07.000000000 -0400 |
34686 |
+diff -urNp linux-2.6.38.4/kernel/mutex-debug.c linux-2.6.38.4/kernel/mutex-debug.c |
34687 |
+--- linux-2.6.38.4/kernel/mutex-debug.c 2011-03-14 21:20:32.000000000 -0400 |
34688 |
++++ linux-2.6.38.4/kernel/mutex-debug.c 2011-04-17 16:23:07.000000000 -0400 |
34689 |
@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute |
34690 |
} |
34691 |
|
34692 |
@@ -52327,9 +50404,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex-debug.c linux-2.6.38.3/kernel/mutex-debug |
34693 |
DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); |
34694 |
mutex_clear_owner(lock); |
34695 |
} |
34696 |
-diff -urNp linux-2.6.38.3/kernel/mutex-debug.h linux-2.6.38.3/kernel/mutex-debug.h |
34697 |
---- linux-2.6.38.3/kernel/mutex-debug.h 2011-03-14 21:20:32.000000000 -0400 |
34698 |
-+++ linux-2.6.38.3/kernel/mutex-debug.h 2011-04-17 16:26:49.000000000 -0400 |
34699 |
+diff -urNp linux-2.6.38.4/kernel/mutex-debug.h linux-2.6.38.4/kernel/mutex-debug.h |
34700 |
+--- linux-2.6.38.4/kernel/mutex-debug.h 2011-03-14 21:20:32.000000000 -0400 |
34701 |
++++ linux-2.6.38.4/kernel/mutex-debug.h 2011-04-17 16:26:49.000000000 -0400 |
34702 |
@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru |
34703 |
extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); |
34704 |
extern void debug_mutex_add_waiter(struct mutex *lock, |
34705 |
@@ -52350,9 +50427,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex-debug.h linux-2.6.38.3/kernel/mutex-debug |
34706 |
} |
34707 |
|
34708 |
static inline void mutex_clear_owner(struct mutex *lock) |
34709 |
-diff -urNp linux-2.6.38.3/kernel/mutex.h linux-2.6.38.3/kernel/mutex.h |
34710 |
---- linux-2.6.38.3/kernel/mutex.h 2011-03-14 21:20:32.000000000 -0400 |
34711 |
-+++ linux-2.6.38.3/kernel/mutex.h 2011-04-17 16:24:51.000000000 -0400 |
34712 |
+diff -urNp linux-2.6.38.4/kernel/mutex.h linux-2.6.38.4/kernel/mutex.h |
34713 |
+--- linux-2.6.38.4/kernel/mutex.h 2011-03-14 21:20:32.000000000 -0400 |
34714 |
++++ linux-2.6.38.4/kernel/mutex.h 2011-04-17 16:24:51.000000000 -0400 |
34715 |
@@ -19,7 +19,7 @@ |
34716 |
#ifdef CONFIG_SMP |
34717 |
static inline void mutex_set_owner(struct mutex *lock) |
34718 |
@@ -52362,9 +50439,9 @@ diff -urNp linux-2.6.38.3/kernel/mutex.h linux-2.6.38.3/kernel/mutex.h |
34719 |
} |
34720 |
|
34721 |
static inline void mutex_clear_owner(struct mutex *lock) |
34722 |
-diff -urNp linux-2.6.38.3/kernel/panic.c linux-2.6.38.3/kernel/panic.c |
34723 |
---- linux-2.6.38.3/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400 |
34724 |
-+++ linux-2.6.38.3/kernel/panic.c 2011-04-17 15:57:32.000000000 -0400 |
34725 |
+diff -urNp linux-2.6.38.4/kernel/panic.c linux-2.6.38.4/kernel/panic.c |
34726 |
+--- linux-2.6.38.4/kernel/panic.c 2011-03-14 21:20:32.000000000 -0400 |
34727 |
++++ linux-2.6.38.4/kernel/panic.c 2011-04-17 15:57:32.000000000 -0400 |
34728 |
@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c |
34729 |
const char *board; |
34730 |
|
34731 |
@@ -52384,9 +50461,9 @@ diff -urNp linux-2.6.38.3/kernel/panic.c linux-2.6.38.3/kernel/panic.c |
34732 |
__builtin_return_address(0)); |
34733 |
} |
34734 |
EXPORT_SYMBOL(__stack_chk_fail); |
34735 |
-diff -urNp linux-2.6.38.3/kernel/pid.c linux-2.6.38.3/kernel/pid.c |
34736 |
---- linux-2.6.38.3/kernel/pid.c 2011-03-14 21:20:32.000000000 -0400 |
34737 |
-+++ linux-2.6.38.3/kernel/pid.c 2011-04-18 19:22:06.000000000 -0400 |
34738 |
+diff -urNp linux-2.6.38.4/kernel/pid.c linux-2.6.38.4/kernel/pid.c |
34739 |
+--- linux-2.6.38.4/kernel/pid.c 2011-04-22 19:20:59.000000000 -0400 |
34740 |
++++ linux-2.6.38.4/kernel/pid.c 2011-04-18 19:22:06.000000000 -0400 |
34741 |
@@ -33,6 +33,7 @@ |
34742 |
#include <linux/rculist.h> |
34743 |
#include <linux/bootmem.h> |
34744 |
@@ -52404,23 +50481,7 @@ diff -urNp linux-2.6.38.3/kernel/pid.c linux-2.6.38.3/kernel/pid.c |
34745 |
|
34746 |
int pid_max_min = RESERVED_PIDS + 1; |
34747 |
int pid_max_max = PID_MAX_LIMIT; |
34748 |
-@@ -217,11 +218,14 @@ static int alloc_pidmap(struct pid_names |
34749 |
- return -1; |
34750 |
- } |
34751 |
- |
34752 |
--int next_pidmap(struct pid_namespace *pid_ns, int last) |
34753 |
-+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last) |
34754 |
- { |
34755 |
- int offset; |
34756 |
- struct pidmap *map, *end; |
34757 |
- |
34758 |
-+ if (last >= PID_MAX_LIMIT) |
34759 |
-+ return -1; |
34760 |
-+ |
34761 |
- offset = (last + 1) & BITS_PER_PAGE_MASK; |
34762 |
- map = &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE]; |
34763 |
- end = &pid_ns->pidmap[PIDMAP_ENTRIES]; |
34764 |
-@@ -416,8 +420,15 @@ EXPORT_SYMBOL(pid_task); |
34765 |
+@@ -419,8 +420,15 @@ EXPORT_SYMBOL(pid_task); |
34766 |
*/ |
34767 |
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns) |
34768 |
{ |
34769 |
@@ -52437,9 +50498,9 @@ diff -urNp linux-2.6.38.3/kernel/pid.c linux-2.6.38.3/kernel/pid.c |
34770 |
} |
34771 |
|
34772 |
struct task_struct *find_task_by_vpid(pid_t vnr) |
34773 |
-diff -urNp linux-2.6.38.3/kernel/posix-cpu-timers.c linux-2.6.38.3/kernel/posix-cpu-timers.c |
34774 |
---- linux-2.6.38.3/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.000000000 -0400 |
34775 |
-+++ linux-2.6.38.3/kernel/posix-cpu-timers.c 2011-04-17 15:57:32.000000000 -0400 |
34776 |
+diff -urNp linux-2.6.38.4/kernel/posix-cpu-timers.c linux-2.6.38.4/kernel/posix-cpu-timers.c |
34777 |
+--- linux-2.6.38.4/kernel/posix-cpu-timers.c 2011-03-14 21:20:32.000000000 -0400 |
34778 |
++++ linux-2.6.38.4/kernel/posix-cpu-timers.c 2011-04-17 15:57:32.000000000 -0400 |
34779 |
@@ -6,6 +6,7 @@ |
34780 |
#include <linux/posix-timers.h> |
34781 |
#include <linux/errno.h> |
34782 |
@@ -52448,9 +50509,9 @@ diff -urNp linux-2.6.38.3/kernel/posix-cpu-timers.c linux-2.6.38.3/kernel/posix- |
34783 |
#include <asm/uaccess.h> |
34784 |
#include <linux/kernel_stat.h> |
34785 |
#include <trace/events/timer.h> |
34786 |
-diff -urNp linux-2.6.38.3/kernel/posix-timers.c linux-2.6.38.3/kernel/posix-timers.c |
34787 |
---- linux-2.6.38.3/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -0400 |
34788 |
-+++ linux-2.6.38.3/kernel/posix-timers.c 2011-04-17 15:57:33.000000000 -0400 |
34789 |
+diff -urNp linux-2.6.38.4/kernel/posix-timers.c linux-2.6.38.4/kernel/posix-timers.c |
34790 |
+--- linux-2.6.38.4/kernel/posix-timers.c 2011-03-14 21:20:32.000000000 -0400 |
34791 |
++++ linux-2.6.38.4/kernel/posix-timers.c 2011-04-17 15:57:33.000000000 -0400 |
34792 |
@@ -42,6 +42,7 @@ |
34793 |
#include <linux/compiler.h> |
34794 |
#include <linux/idr.h> |
34795 |
@@ -52473,9 +50534,9 @@ diff -urNp linux-2.6.38.3/kernel/posix-timers.c linux-2.6.38.3/kernel/posix-time |
34796 |
return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); |
34797 |
} |
34798 |
|
34799 |
-diff -urNp linux-2.6.38.3/kernel/power/poweroff.c linux-2.6.38.3/kernel/power/poweroff.c |
34800 |
---- linux-2.6.38.3/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000 -0400 |
34801 |
-+++ linux-2.6.38.3/kernel/power/poweroff.c 2011-04-17 15:57:33.000000000 -0400 |
34802 |
+diff -urNp linux-2.6.38.4/kernel/power/poweroff.c linux-2.6.38.4/kernel/power/poweroff.c |
34803 |
+--- linux-2.6.38.4/kernel/power/poweroff.c 2011-03-14 21:20:32.000000000 -0400 |
34804 |
++++ linux-2.6.38.4/kernel/power/poweroff.c 2011-04-17 15:57:33.000000000 -0400 |
34805 |
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof |
34806 |
.enable_mask = SYSRQ_ENABLE_BOOT, |
34807 |
}; |
34808 |
@@ -52485,9 +50546,9 @@ diff -urNp linux-2.6.38.3/kernel/power/poweroff.c linux-2.6.38.3/kernel/power/po |
34809 |
{ |
34810 |
register_sysrq_key('o', &sysrq_poweroff_op); |
34811 |
return 0; |
34812 |
-diff -urNp linux-2.6.38.3/kernel/power/process.c linux-2.6.38.3/kernel/power/process.c |
34813 |
---- linux-2.6.38.3/kernel/power/process.c 2011-03-14 21:20:32.000000000 -0400 |
34814 |
-+++ linux-2.6.38.3/kernel/power/process.c 2011-04-17 15:57:33.000000000 -0400 |
34815 |
+diff -urNp linux-2.6.38.4/kernel/power/process.c linux-2.6.38.4/kernel/power/process.c |
34816 |
+--- linux-2.6.38.4/kernel/power/process.c 2011-03-14 21:20:32.000000000 -0400 |
34817 |
++++ linux-2.6.38.4/kernel/power/process.c 2011-04-17 15:57:33.000000000 -0400 |
34818 |
@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_ |
34819 |
u64 elapsed_csecs64; |
34820 |
unsigned int elapsed_csecs; |
34821 |
@@ -52530,9 +50591,9 @@ diff -urNp linux-2.6.38.3/kernel/power/process.c linux-2.6.38.3/kernel/power/pro |
34822 |
break; |
34823 |
|
34824 |
if (pm_wakeup_pending()) { |
34825 |
-diff -urNp linux-2.6.38.3/kernel/printk.c linux-2.6.38.3/kernel/printk.c |
34826 |
---- linux-2.6.38.3/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400 |
34827 |
-+++ linux-2.6.38.3/kernel/printk.c 2011-04-17 15:57:33.000000000 -0400 |
34828 |
+diff -urNp linux-2.6.38.4/kernel/printk.c linux-2.6.38.4/kernel/printk.c |
34829 |
+--- linux-2.6.38.4/kernel/printk.c 2011-03-14 21:20:32.000000000 -0400 |
34830 |
++++ linux-2.6.38.4/kernel/printk.c 2011-04-17 15:57:33.000000000 -0400 |
34831 |
@@ -279,12 +279,17 @@ static int check_syslog_permissions(int |
34832 |
if (from_file && type != SYSLOG_ACTION_OPEN) |
34833 |
return 0; |
34834 |
@@ -52552,9 +50613,9 @@ diff -urNp linux-2.6.38.3/kernel/printk.c linux-2.6.38.3/kernel/printk.c |
34835 |
"but no CAP_SYSLOG (deprecated).\n"); |
34836 |
return 0; |
34837 |
} |
34838 |
-diff -urNp linux-2.6.38.3/kernel/ptrace.c linux-2.6.38.3/kernel/ptrace.c |
34839 |
---- linux-2.6.38.3/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400 |
34840 |
-+++ linux-2.6.38.3/kernel/ptrace.c 2011-04-17 15:57:33.000000000 -0400 |
34841 |
+diff -urNp linux-2.6.38.4/kernel/ptrace.c linux-2.6.38.4/kernel/ptrace.c |
34842 |
+--- linux-2.6.38.4/kernel/ptrace.c 2011-03-14 21:20:32.000000000 -0400 |
34843 |
++++ linux-2.6.38.4/kernel/ptrace.c 2011-04-17 15:57:33.000000000 -0400 |
34844 |
@@ -116,7 +116,8 @@ int ptrace_check_attach(struct task_stru |
34845 |
return ret; |
34846 |
} |
34847 |
@@ -52696,9 +50757,9 @@ diff -urNp linux-2.6.38.3/kernel/ptrace.c linux-2.6.38.3/kernel/ptrace.c |
34848 |
goto out_put_task_struct; |
34849 |
} |
34850 |
|
34851 |
-diff -urNp linux-2.6.38.3/kernel/rcutree.c linux-2.6.38.3/kernel/rcutree.c |
34852 |
---- linux-2.6.38.3/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400 |
34853 |
-+++ linux-2.6.38.3/kernel/rcutree.c 2011-04-17 15:57:33.000000000 -0400 |
34854 |
+diff -urNp linux-2.6.38.4/kernel/rcutree.c linux-2.6.38.4/kernel/rcutree.c |
34855 |
+--- linux-2.6.38.4/kernel/rcutree.c 2011-03-14 21:20:32.000000000 -0400 |
34856 |
++++ linux-2.6.38.4/kernel/rcutree.c 2011-04-17 15:57:33.000000000 -0400 |
34857 |
@@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state |
34858 |
/* |
34859 |
* Do softirq processing for the current CPU. |
34860 |
@@ -52708,9 +50769,9 @@ diff -urNp linux-2.6.38.3/kernel/rcutree.c linux-2.6.38.3/kernel/rcutree.c |
34861 |
{ |
34862 |
/* |
34863 |
* Memory references from any prior RCU read-side critical sections |
34864 |
-diff -urNp linux-2.6.38.3/kernel/rcutree_plugin.h linux-2.6.38.3/kernel/rcutree_plugin.h |
34865 |
---- linux-2.6.38.3/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000 -0400 |
34866 |
-+++ linux-2.6.38.3/kernel/rcutree_plugin.h 2011-04-17 15:57:33.000000000 -0400 |
34867 |
+diff -urNp linux-2.6.38.4/kernel/rcutree_plugin.h linux-2.6.38.4/kernel/rcutree_plugin.h |
34868 |
+--- linux-2.6.38.4/kernel/rcutree_plugin.h 2011-03-14 21:20:32.000000000 -0400 |
34869 |
++++ linux-2.6.38.4/kernel/rcutree_plugin.h 2011-04-17 15:57:33.000000000 -0400 |
34870 |
@@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void) |
34871 |
|
34872 |
/* Clean up and exit. */ |
34873 |
@@ -52720,9 +50781,9 @@ diff -urNp linux-2.6.38.3/kernel/rcutree_plugin.h linux-2.6.38.3/kernel/rcutree_ |
34874 |
unlock_mb_ret: |
34875 |
mutex_unlock(&sync_rcu_preempt_exp_mutex); |
34876 |
mb_ret: |
34877 |
-diff -urNp linux-2.6.38.3/kernel/resource.c linux-2.6.38.3/kernel/resource.c |
34878 |
---- linux-2.6.38.3/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400 |
34879 |
-+++ linux-2.6.38.3/kernel/resource.c 2011-04-17 15:57:33.000000000 -0400 |
34880 |
+diff -urNp linux-2.6.38.4/kernel/resource.c linux-2.6.38.4/kernel/resource.c |
34881 |
+--- linux-2.6.38.4/kernel/resource.c 2011-03-14 21:20:32.000000000 -0400 |
34882 |
++++ linux-2.6.38.4/kernel/resource.c 2011-04-17 15:57:33.000000000 -0400 |
34883 |
@@ -133,8 +133,18 @@ static const struct file_operations proc |
34884 |
|
34885 |
static int __init ioresources_init(void) |
34886 |
@@ -52742,9 +50803,9 @@ diff -urNp linux-2.6.38.3/kernel/resource.c linux-2.6.38.3/kernel/resource.c |
34887 |
return 0; |
34888 |
} |
34889 |
__initcall(ioresources_init); |
34890 |
-diff -urNp linux-2.6.38.3/kernel/rtmutex.c linux-2.6.38.3/kernel/rtmutex.c |
34891 |
---- linux-2.6.38.3/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400 |
34892 |
-+++ linux-2.6.38.3/kernel/rtmutex.c 2011-04-17 15:57:33.000000000 -0400 |
34893 |
+diff -urNp linux-2.6.38.4/kernel/rtmutex.c linux-2.6.38.4/kernel/rtmutex.c |
34894 |
+--- linux-2.6.38.4/kernel/rtmutex.c 2011-03-14 21:20:32.000000000 -0400 |
34895 |
++++ linux-2.6.38.4/kernel/rtmutex.c 2011-04-17 15:57:33.000000000 -0400 |
34896 |
@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt |
34897 |
*/ |
34898 |
raw_spin_lock_irqsave(&pendowner->pi_lock, flags); |
34899 |
@@ -52754,9 +50815,9 @@ diff -urNp linux-2.6.38.3/kernel/rtmutex.c linux-2.6.38.3/kernel/rtmutex.c |
34900 |
WARN_ON(pendowner->pi_blocked_on != waiter); |
34901 |
WARN_ON(pendowner->pi_blocked_on->lock != lock); |
34902 |
|
34903 |
-diff -urNp linux-2.6.38.3/kernel/sched.c linux-2.6.38.3/kernel/sched.c |
34904 |
---- linux-2.6.38.3/kernel/sched.c 2011-04-18 17:27:14.000000000 -0400 |
34905 |
-+++ linux-2.6.38.3/kernel/sched.c 2011-04-17 16:29:21.000000000 -0400 |
34906 |
+diff -urNp linux-2.6.38.4/kernel/sched.c linux-2.6.38.4/kernel/sched.c |
34907 |
+--- linux-2.6.38.4/kernel/sched.c 2011-04-18 17:27:14.000000000 -0400 |
34908 |
++++ linux-2.6.38.4/kernel/sched.c 2011-04-17 16:29:21.000000000 -0400 |
34909 |
@@ -4024,7 +4024,7 @@ EXPORT_SYMBOL(schedule); |
34910 |
* Look out! "owner" is an entirely speculative pointer |
34911 |
* access and not reliable. |
34912 |
@@ -52824,10 +50885,10 @@ diff -urNp linux-2.6.38.3/kernel/sched.c linux-2.6.38.3/kernel/sched.c |
34913 |
|
34914 |
if (cpu != group_first_cpu(sd->groups)) |
34915 |
return; |
34916 |
-diff -urNp linux-2.6.38.3/kernel/sched_fair.c linux-2.6.38.3/kernel/sched_fair.c |
34917 |
---- linux-2.6.38.3/kernel/sched_fair.c 2011-03-14 21:20:32.000000000 -0400 |
34918 |
-+++ linux-2.6.38.3/kernel/sched_fair.c 2011-04-17 15:57:33.000000000 -0400 |
34919 |
-@@ -3960,7 +3960,7 @@ static void nohz_idle_balance(int this_c |
34920 |
+diff -urNp linux-2.6.38.4/kernel/sched_fair.c linux-2.6.38.4/kernel/sched_fair.c |
34921 |
+--- linux-2.6.38.4/kernel/sched_fair.c 2011-04-22 19:20:59.000000000 -0400 |
34922 |
++++ linux-2.6.38.4/kernel/sched_fair.c 2011-04-22 19:21:39.000000000 -0400 |
34923 |
+@@ -3957,7 +3957,7 @@ static void nohz_idle_balance(int this_c |
34924 |
* run_rebalance_domains is triggered when needed from the scheduler tick. |
34925 |
* Also triggered for nohz idle balancing (with nohz_balancing_kick set). |
34926 |
*/ |
34927 |
@@ -52836,9 +50897,9 @@ diff -urNp linux-2.6.38.3/kernel/sched_fair.c linux-2.6.38.3/kernel/sched_fair.c |
34928 |
{ |
34929 |
int this_cpu = smp_processor_id(); |
34930 |
struct rq *this_rq = cpu_rq(this_cpu); |
34931 |
-diff -urNp linux-2.6.38.3/kernel/signal.c linux-2.6.38.3/kernel/signal.c |
34932 |
---- linux-2.6.38.3/kernel/signal.c 2011-04-18 17:27:18.000000000 -0400 |
34933 |
-+++ linux-2.6.38.3/kernel/signal.c 2011-04-17 16:53:48.000000000 -0400 |
34934 |
+diff -urNp linux-2.6.38.4/kernel/signal.c linux-2.6.38.4/kernel/signal.c |
34935 |
+--- linux-2.6.38.4/kernel/signal.c 2011-04-18 17:27:18.000000000 -0400 |
34936 |
++++ linux-2.6.38.4/kernel/signal.c 2011-04-17 16:53:48.000000000 -0400 |
34937 |
@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache |
34938 |
|
34939 |
int print_fatal_signals __read_mostly; |
34940 |
@@ -52941,9 +51002,9 @@ diff -urNp linux-2.6.38.3/kernel/signal.c linux-2.6.38.3/kernel/signal.c |
34941 |
|
34942 |
return ret; |
34943 |
} |
34944 |
-diff -urNp linux-2.6.38.3/kernel/smp.c linux-2.6.38.3/kernel/smp.c |
34945 |
---- linux-2.6.38.3/kernel/smp.c 2011-04-18 17:27:14.000000000 -0400 |
34946 |
-+++ linux-2.6.38.3/kernel/smp.c 2011-04-17 15:57:33.000000000 -0400 |
34947 |
+diff -urNp linux-2.6.38.4/kernel/smp.c linux-2.6.38.4/kernel/smp.c |
34948 |
+--- linux-2.6.38.4/kernel/smp.c 2011-04-18 17:27:14.000000000 -0400 |
34949 |
++++ linux-2.6.38.4/kernel/smp.c 2011-04-17 15:57:33.000000000 -0400 |
34950 |
@@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu |
34951 |
} |
34952 |
EXPORT_SYMBOL(smp_call_function); |
34953 |
@@ -52971,9 +51032,9 @@ diff -urNp linux-2.6.38.3/kernel/smp.c linux-2.6.38.3/kernel/smp.c |
34954 |
{ |
34955 |
raw_spin_unlock_irq(&call_function.lock); |
34956 |
} |
34957 |
-diff -urNp linux-2.6.38.3/kernel/softirq.c linux-2.6.38.3/kernel/softirq.c |
34958 |
---- linux-2.6.38.3/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400 |
34959 |
-+++ linux-2.6.38.3/kernel/softirq.c 2011-04-17 15:57:33.000000000 -0400 |
34960 |
+diff -urNp linux-2.6.38.4/kernel/softirq.c linux-2.6.38.4/kernel/softirq.c |
34961 |
+--- linux-2.6.38.4/kernel/softirq.c 2011-03-14 21:20:32.000000000 -0400 |
34962 |
++++ linux-2.6.38.4/kernel/softirq.c 2011-04-17 15:57:33.000000000 -0400 |
34963 |
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec |
34964 |
|
34965 |
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); |
34966 |
@@ -53028,9 +51089,9 @@ diff -urNp linux-2.6.38.3/kernel/softirq.c linux-2.6.38.3/kernel/softirq.c |
34967 |
{ |
34968 |
struct tasklet_struct *list; |
34969 |
|
34970 |
-diff -urNp linux-2.6.38.3/kernel/sys.c linux-2.6.38.3/kernel/sys.c |
34971 |
---- linux-2.6.38.3/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400 |
34972 |
-+++ linux-2.6.38.3/kernel/sys.c 2011-04-17 15:57:33.000000000 -0400 |
34973 |
+diff -urNp linux-2.6.38.4/kernel/sys.c linux-2.6.38.4/kernel/sys.c |
34974 |
+--- linux-2.6.38.4/kernel/sys.c 2011-03-14 21:20:32.000000000 -0400 |
34975 |
++++ linux-2.6.38.4/kernel/sys.c 2011-04-17 15:57:33.000000000 -0400 |
34976 |
@@ -136,6 +136,12 @@ static int set_one_prio(struct task_stru |
34977 |
error = -EACCES; |
34978 |
goto out; |
34979 |
@@ -53152,9 +51213,9 @@ diff -urNp linux-2.6.38.3/kernel/sys.c linux-2.6.38.3/kernel/sys.c |
34980 |
error = -EINVAL; |
34981 |
break; |
34982 |
} |
34983 |
-diff -urNp linux-2.6.38.3/kernel/sysctl.c linux-2.6.38.3/kernel/sysctl.c |
34984 |
---- linux-2.6.38.3/kernel/sysctl.c 2011-04-18 17:27:16.000000000 -0400 |
34985 |
-+++ linux-2.6.38.3/kernel/sysctl.c 2011-04-17 15:57:33.000000000 -0400 |
34986 |
+diff -urNp linux-2.6.38.4/kernel/sysctl.c linux-2.6.38.4/kernel/sysctl.c |
34987 |
+--- linux-2.6.38.4/kernel/sysctl.c 2011-04-18 17:27:16.000000000 -0400 |
34988 |
++++ linux-2.6.38.4/kernel/sysctl.c 2011-04-17 15:57:33.000000000 -0400 |
34989 |
@@ -84,6 +84,13 @@ |
34990 |
|
34991 |
|
34992 |
@@ -53343,9 +51404,9 @@ diff -urNp linux-2.6.38.3/kernel/sysctl.c linux-2.6.38.3/kernel/sysctl.c |
34993 |
EXPORT_SYMBOL(proc_doulongvec_minmax); |
34994 |
EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); |
34995 |
EXPORT_SYMBOL(register_sysctl_table); |
34996 |
-diff -urNp linux-2.6.38.3/kernel/sysctl_check.c linux-2.6.38.3/kernel/sysctl_check.c |
34997 |
---- linux-2.6.38.3/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -0400 |
34998 |
-+++ linux-2.6.38.3/kernel/sysctl_check.c 2011-04-17 15:57:33.000000000 -0400 |
34999 |
+diff -urNp linux-2.6.38.4/kernel/sysctl_check.c linux-2.6.38.4/kernel/sysctl_check.c |
35000 |
+--- linux-2.6.38.4/kernel/sysctl_check.c 2011-03-14 21:20:32.000000000 -0400 |
35001 |
++++ linux-2.6.38.4/kernel/sysctl_check.c 2011-04-17 15:57:33.000000000 -0400 |
35002 |
@@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n |
35003 |
set_fail(&fail, table, "Directory with extra2"); |
35004 |
} else { |
35005 |
@@ -53354,9 +51415,9 @@ diff -urNp linux-2.6.38.3/kernel/sysctl_check.c linux-2.6.38.3/kernel/sysctl_che |
35006 |
(table->proc_handler == proc_dointvec) || |
35007 |
(table->proc_handler == proc_dointvec_minmax) || |
35008 |
(table->proc_handler == proc_dointvec_jiffies) || |
35009 |
-diff -urNp linux-2.6.38.3/kernel/taskstats.c linux-2.6.38.3/kernel/taskstats.c |
35010 |
---- linux-2.6.38.3/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -0400 |
35011 |
-+++ linux-2.6.38.3/kernel/taskstats.c 2011-04-17 15:57:33.000000000 -0400 |
35012 |
+diff -urNp linux-2.6.38.4/kernel/taskstats.c linux-2.6.38.4/kernel/taskstats.c |
35013 |
+--- linux-2.6.38.4/kernel/taskstats.c 2011-03-14 21:20:32.000000000 -0400 |
35014 |
++++ linux-2.6.38.4/kernel/taskstats.c 2011-04-17 15:57:33.000000000 -0400 |
35015 |
@@ -27,9 +27,12 @@ |
35016 |
#include <linux/cgroup.h> |
35017 |
#include <linux/fs.h> |
35018 |
@@ -53380,9 +51441,9 @@ diff -urNp linux-2.6.38.3/kernel/taskstats.c linux-2.6.38.3/kernel/taskstats.c |
35019 |
if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK]) |
35020 |
return cmd_attr_register_cpumask(info); |
35021 |
else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) |
35022 |
-diff -urNp linux-2.6.38.3/kernel/time/tick-broadcast.c linux-2.6.38.3/kernel/time/tick-broadcast.c |
35023 |
---- linux-2.6.38.3/kernel/time/tick-broadcast.c 2011-03-14 21:20:32.000000000 -0400 |
35024 |
-+++ linux-2.6.38.3/kernel/time/tick-broadcast.c 2011-04-17 15:57:33.000000000 -0400 |
35025 |
+diff -urNp linux-2.6.38.4/kernel/time/tick-broadcast.c linux-2.6.38.4/kernel/time/tick-broadcast.c |
35026 |
+--- linux-2.6.38.4/kernel/time/tick-broadcast.c 2011-03-14 21:20:32.000000000 -0400 |
35027 |
++++ linux-2.6.38.4/kernel/time/tick-broadcast.c 2011-04-17 15:57:33.000000000 -0400 |
35028 |
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl |
35029 |
* then clear the broadcast bit. |
35030 |
*/ |
35031 |
@@ -53392,9 +51453,9 @@ diff -urNp linux-2.6.38.3/kernel/time/tick-broadcast.c linux-2.6.38.3/kernel/tim |
35032 |
|
35033 |
cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); |
35034 |
tick_broadcast_clear_oneshot(cpu); |
35035 |
-diff -urNp linux-2.6.38.3/kernel/time/timekeeping.c linux-2.6.38.3/kernel/time/timekeeping.c |
35036 |
---- linux-2.6.38.3/kernel/time/timekeeping.c 2011-03-14 21:20:32.000000000 -0400 |
35037 |
-+++ linux-2.6.38.3/kernel/time/timekeeping.c 2011-04-17 15:57:33.000000000 -0400 |
35038 |
+diff -urNp linux-2.6.38.4/kernel/time/timekeeping.c linux-2.6.38.4/kernel/time/timekeeping.c |
35039 |
+--- linux-2.6.38.4/kernel/time/timekeeping.c 2011-03-14 21:20:32.000000000 -0400 |
35040 |
++++ linux-2.6.38.4/kernel/time/timekeeping.c 2011-04-17 15:57:33.000000000 -0400 |
35041 |
@@ -14,6 +14,7 @@ |
35042 |
#include <linux/init.h> |
35043 |
#include <linux/mm.h> |
35044 |
@@ -53412,9 +51473,9 @@ diff -urNp linux-2.6.38.3/kernel/time/timekeeping.c linux-2.6.38.3/kernel/time/t |
35045 |
write_seqlock_irqsave(&xtime_lock, flags); |
35046 |
|
35047 |
timekeeping_forward_now(); |
35048 |
-diff -urNp linux-2.6.38.3/kernel/time/timer_list.c linux-2.6.38.3/kernel/time/timer_list.c |
35049 |
---- linux-2.6.38.3/kernel/time/timer_list.c 2011-03-14 21:20:32.000000000 -0400 |
35050 |
-+++ linux-2.6.38.3/kernel/time/timer_list.c 2011-04-17 15:57:33.000000000 -0400 |
35051 |
+diff -urNp linux-2.6.38.4/kernel/time/timer_list.c linux-2.6.38.4/kernel/time/timer_list.c |
35052 |
+--- linux-2.6.38.4/kernel/time/timer_list.c 2011-03-14 21:20:32.000000000 -0400 |
35053 |
++++ linux-2.6.38.4/kernel/time/timer_list.c 2011-04-17 15:57:33.000000000 -0400 |
35054 |
@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, |
35055 |
|
35056 |
static void print_name_offset(struct seq_file *m, void *sym) |
35057 |
@@ -53456,9 +51517,9 @@ diff -urNp linux-2.6.38.3/kernel/time/timer_list.c linux-2.6.38.3/kernel/time/ti |
35058 |
if (!pe) |
35059 |
return -ENOMEM; |
35060 |
return 0; |
35061 |
-diff -urNp linux-2.6.38.3/kernel/time/timer_stats.c linux-2.6.38.3/kernel/time/timer_stats.c |
35062 |
---- linux-2.6.38.3/kernel/time/timer_stats.c 2011-03-14 21:20:32.000000000 -0400 |
35063 |
-+++ linux-2.6.38.3/kernel/time/timer_stats.c 2011-04-17 15:57:33.000000000 -0400 |
35064 |
+diff -urNp linux-2.6.38.4/kernel/time/timer_stats.c linux-2.6.38.4/kernel/time/timer_stats.c |
35065 |
+--- linux-2.6.38.4/kernel/time/timer_stats.c 2011-03-14 21:20:32.000000000 -0400 |
35066 |
++++ linux-2.6.38.4/kernel/time/timer_stats.c 2011-04-17 15:57:33.000000000 -0400 |
35067 |
@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time |
35068 |
|
35069 |
static void print_name_offset(struct seq_file *m, unsigned long addr) |
35070 |
@@ -53488,9 +51549,9 @@ diff -urNp linux-2.6.38.3/kernel/time/timer_stats.c linux-2.6.38.3/kernel/time/t |
35071 |
if (!pe) |
35072 |
return -ENOMEM; |
35073 |
return 0; |
35074 |
-diff -urNp linux-2.6.38.3/kernel/time.c linux-2.6.38.3/kernel/time.c |
35075 |
---- linux-2.6.38.3/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 |
35076 |
-+++ linux-2.6.38.3/kernel/time.c 2011-04-17 15:57:33.000000000 -0400 |
35077 |
+diff -urNp linux-2.6.38.4/kernel/time.c linux-2.6.38.4/kernel/time.c |
35078 |
+--- linux-2.6.38.4/kernel/time.c 2011-03-14 21:20:32.000000000 -0400 |
35079 |
++++ linux-2.6.38.4/kernel/time.c 2011-04-17 15:57:33.000000000 -0400 |
35080 |
@@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec |
35081 |
return error; |
35082 |
|
35083 |
@@ -53503,9 +51564,9 @@ diff -urNp linux-2.6.38.3/kernel/time.c linux-2.6.38.3/kernel/time.c |
35084 |
/* SMP safe, global irq locking makes it work. */ |
35085 |
sys_tz = *tz; |
35086 |
update_vsyscall_tz(); |
35087 |
-diff -urNp linux-2.6.38.3/kernel/timer.c linux-2.6.38.3/kernel/timer.c |
35088 |
---- linux-2.6.38.3/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400 |
35089 |
-+++ linux-2.6.38.3/kernel/timer.c 2011-04-17 15:57:33.000000000 -0400 |
35090 |
+diff -urNp linux-2.6.38.4/kernel/timer.c linux-2.6.38.4/kernel/timer.c |
35091 |
+--- linux-2.6.38.4/kernel/timer.c 2011-03-14 21:20:32.000000000 -0400 |
35092 |
++++ linux-2.6.38.4/kernel/timer.c 2011-04-17 15:57:33.000000000 -0400 |
35093 |
@@ -1276,7 +1276,7 @@ void update_process_times(int user_tick) |
35094 |
/* |
35095 |
* This function runs timers and the timer-tq in bottom half context. |
35096 |
@@ -53515,9 +51576,9 @@ diff -urNp linux-2.6.38.3/kernel/timer.c linux-2.6.38.3/kernel/timer.c |
35097 |
{ |
35098 |
struct tvec_base *base = __this_cpu_read(tvec_bases); |
35099 |
|
35100 |
-diff -urNp linux-2.6.38.3/kernel/trace/ftrace.c linux-2.6.38.3/kernel/trace/ftrace.c |
35101 |
---- linux-2.6.38.3/kernel/trace/ftrace.c 2011-04-18 17:27:14.000000000 -0400 |
35102 |
-+++ linux-2.6.38.3/kernel/trace/ftrace.c 2011-04-17 15:57:33.000000000 -0400 |
35103 |
+diff -urNp linux-2.6.38.4/kernel/trace/ftrace.c linux-2.6.38.4/kernel/trace/ftrace.c |
35104 |
+--- linux-2.6.38.4/kernel/trace/ftrace.c 2011-04-18 17:27:14.000000000 -0400 |
35105 |
++++ linux-2.6.38.4/kernel/trace/ftrace.c 2011-04-17 15:57:33.000000000 -0400 |
35106 |
@@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod, |
35107 |
|
35108 |
ip = rec->ip; |
35109 |
@@ -53539,9 +51600,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/ftrace.c linux-2.6.38.3/kernel/trace/ftra |
35110 |
} |
35111 |
|
35112 |
/* |
35113 |
-diff -urNp linux-2.6.38.3/kernel/trace/ring_buffer.c linux-2.6.38.3/kernel/trace/ring_buffer.c |
35114 |
---- linux-2.6.38.3/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000000 -0400 |
35115 |
-+++ linux-2.6.38.3/kernel/trace/ring_buffer.c 2011-04-17 15:57:33.000000000 -0400 |
35116 |
+diff -urNp linux-2.6.38.4/kernel/trace/ring_buffer.c linux-2.6.38.4/kernel/trace/ring_buffer.c |
35117 |
+--- linux-2.6.38.4/kernel/trace/ring_buffer.c 2011-03-14 21:20:32.000000000 -0400 |
35118 |
++++ linux-2.6.38.4/kernel/trace/ring_buffer.c 2011-04-17 15:57:33.000000000 -0400 |
35119 |
@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st |
35120 |
* the reader page). But if the next page is a header page, |
35121 |
* its flags will be non zero. |
35122 |
@@ -53551,9 +51612,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/ring_buffer.c linux-2.6.38.3/kernel/trace |
35123 |
rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, |
35124 |
struct buffer_page *page, struct list_head *list) |
35125 |
{ |
35126 |
-diff -urNp linux-2.6.38.3/kernel/trace/trace.c linux-2.6.38.3/kernel/trace/trace.c |
35127 |
---- linux-2.6.38.3/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0400 |
35128 |
-+++ linux-2.6.38.3/kernel/trace/trace.c 2011-04-17 15:57:33.000000000 -0400 |
35129 |
+diff -urNp linux-2.6.38.4/kernel/trace/trace.c linux-2.6.38.4/kernel/trace/trace.c |
35130 |
+--- linux-2.6.38.4/kernel/trace/trace.c 2011-03-14 21:20:32.000000000 -0400 |
35131 |
++++ linux-2.6.38.4/kernel/trace/trace.c 2011-04-17 15:57:33.000000000 -0400 |
35132 |
@@ -3967,10 +3967,9 @@ static const struct file_operations trac |
35133 |
}; |
35134 |
#endif |
35135 |
@@ -53578,9 +51639,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace.c linux-2.6.38.3/kernel/trace/trace |
35136 |
static int once; |
35137 |
struct dentry *d_tracer; |
35138 |
|
35139 |
-diff -urNp linux-2.6.38.3/kernel/trace/trace_events.c linux-2.6.38.3/kernel/trace/trace_events.c |
35140 |
---- linux-2.6.38.3/kernel/trace/trace_events.c 2011-03-14 21:20:32.000000000 -0400 |
35141 |
-+++ linux-2.6.38.3/kernel/trace/trace_events.c 2011-04-17 15:57:33.000000000 -0400 |
35142 |
+diff -urNp linux-2.6.38.4/kernel/trace/trace_events.c linux-2.6.38.4/kernel/trace/trace_events.c |
35143 |
+--- linux-2.6.38.4/kernel/trace/trace_events.c 2011-03-14 21:20:32.000000000 -0400 |
35144 |
++++ linux-2.6.38.4/kernel/trace/trace_events.c 2011-04-17 15:57:33.000000000 -0400 |
35145 |
@@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list |
35146 |
struct ftrace_module_file_ops { |
35147 |
struct list_head list; |
35148 |
@@ -53596,9 +51657,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_events.c linux-2.6.38.3/kernel/trac |
35149 |
}; |
35150 |
|
35151 |
static struct ftrace_module_file_ops * |
35152 |
-diff -urNp linux-2.6.38.3/kernel/trace/trace_output.c linux-2.6.38.3/kernel/trace/trace_output.c |
35153 |
---- linux-2.6.38.3/kernel/trace/trace_output.c 2011-03-14 21:20:32.000000000 -0400 |
35154 |
-+++ linux-2.6.38.3/kernel/trace/trace_output.c 2011-04-17 15:57:33.000000000 -0400 |
35155 |
+diff -urNp linux-2.6.38.4/kernel/trace/trace_output.c linux-2.6.38.4/kernel/trace/trace_output.c |
35156 |
+--- linux-2.6.38.4/kernel/trace/trace_output.c 2011-03-14 21:20:32.000000000 -0400 |
35157 |
++++ linux-2.6.38.4/kernel/trace/trace_output.c 2011-04-17 15:57:33.000000000 -0400 |
35158 |
@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, |
35159 |
|
35160 |
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); |
35161 |
@@ -53608,9 +51669,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_output.c linux-2.6.38.3/kernel/trac |
35162 |
if (p) { |
35163 |
s->len = p - s->buffer; |
35164 |
return 1; |
35165 |
-diff -urNp linux-2.6.38.3/kernel/trace/trace_stack.c linux-2.6.38.3/kernel/trace/trace_stack.c |
35166 |
---- linux-2.6.38.3/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000000 -0400 |
35167 |
-+++ linux-2.6.38.3/kernel/trace/trace_stack.c 2011-04-17 15:57:33.000000000 -0400 |
35168 |
+diff -urNp linux-2.6.38.4/kernel/trace/trace_stack.c linux-2.6.38.4/kernel/trace/trace_stack.c |
35169 |
+--- linux-2.6.38.4/kernel/trace/trace_stack.c 2011-03-14 21:20:32.000000000 -0400 |
35170 |
++++ linux-2.6.38.4/kernel/trace/trace_stack.c 2011-04-17 15:57:33.000000000 -0400 |
35171 |
@@ -50,7 +50,7 @@ static inline void check_stack(void) |
35172 |
return; |
35173 |
|
35174 |
@@ -53620,9 +51681,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_stack.c linux-2.6.38.3/kernel/trace |
35175 |
return; |
35176 |
|
35177 |
local_irq_save(flags); |
35178 |
-diff -urNp linux-2.6.38.3/kernel/trace/trace_workqueue.c linux-2.6.38.3/kernel/trace/trace_workqueue.c |
35179 |
---- linux-2.6.38.3/kernel/trace/trace_workqueue.c 2011-03-14 21:20:32.000000000 -0400 |
35180 |
-+++ linux-2.6.38.3/kernel/trace/trace_workqueue.c 2011-04-17 15:57:33.000000000 -0400 |
35181 |
+diff -urNp linux-2.6.38.4/kernel/trace/trace_workqueue.c linux-2.6.38.4/kernel/trace/trace_workqueue.c |
35182 |
+--- linux-2.6.38.4/kernel/trace/trace_workqueue.c 2011-03-14 21:20:32.000000000 -0400 |
35183 |
++++ linux-2.6.38.4/kernel/trace/trace_workqueue.c 2011-04-17 15:57:33.000000000 -0400 |
35184 |
@@ -22,7 +22,7 @@ struct cpu_workqueue_stats { |
35185 |
int cpu; |
35186 |
pid_t pid; |
35187 |
@@ -53650,9 +51711,9 @@ diff -urNp linux-2.6.38.3/kernel/trace/trace_workqueue.c linux-2.6.38.3/kernel/t |
35188 |
tsk->comm); |
35189 |
put_task_struct(tsk); |
35190 |
} |
35191 |
-diff -urNp linux-2.6.38.3/lib/bug.c linux-2.6.38.3/lib/bug.c |
35192 |
---- linux-2.6.38.3/lib/bug.c 2011-03-14 21:20:32.000000000 -0400 |
35193 |
-+++ linux-2.6.38.3/lib/bug.c 2011-04-17 15:57:33.000000000 -0400 |
35194 |
+diff -urNp linux-2.6.38.4/lib/bug.c linux-2.6.38.4/lib/bug.c |
35195 |
+--- linux-2.6.38.4/lib/bug.c 2011-03-14 21:20:32.000000000 -0400 |
35196 |
++++ linux-2.6.38.4/lib/bug.c 2011-04-17 15:57:33.000000000 -0400 |
35197 |
@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l |
35198 |
return BUG_TRAP_TYPE_NONE; |
35199 |
|
35200 |
@@ -53662,9 +51723,9 @@ diff -urNp linux-2.6.38.3/lib/bug.c linux-2.6.38.3/lib/bug.c |
35201 |
|
35202 |
file = NULL; |
35203 |
line = 0; |
35204 |
-diff -urNp linux-2.6.38.3/lib/debugobjects.c linux-2.6.38.3/lib/debugobjects.c |
35205 |
---- linux-2.6.38.3/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -0400 |
35206 |
-+++ linux-2.6.38.3/lib/debugobjects.c 2011-04-17 15:57:33.000000000 -0400 |
35207 |
+diff -urNp linux-2.6.38.4/lib/debugobjects.c linux-2.6.38.4/lib/debugobjects.c |
35208 |
+--- linux-2.6.38.4/lib/debugobjects.c 2011-03-14 21:20:32.000000000 -0400 |
35209 |
++++ linux-2.6.38.4/lib/debugobjects.c 2011-04-17 15:57:33.000000000 -0400 |
35210 |
@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi |
35211 |
if (limit > 4) |
35212 |
return; |
35213 |
@@ -53674,9 +51735,9 @@ diff -urNp linux-2.6.38.3/lib/debugobjects.c linux-2.6.38.3/lib/debugobjects.c |
35214 |
if (is_on_stack == onstack) |
35215 |
return; |
35216 |
|
35217 |
-diff -urNp linux-2.6.38.3/lib/dma-debug.c linux-2.6.38.3/lib/dma-debug.c |
35218 |
---- linux-2.6.38.3/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400 |
35219 |
-+++ linux-2.6.38.3/lib/dma-debug.c 2011-04-17 15:57:33.000000000 -0400 |
35220 |
+diff -urNp linux-2.6.38.4/lib/dma-debug.c linux-2.6.38.4/lib/dma-debug.c |
35221 |
+--- linux-2.6.38.4/lib/dma-debug.c 2011-03-14 21:20:32.000000000 -0400 |
35222 |
++++ linux-2.6.38.4/lib/dma-debug.c 2011-04-17 15:57:33.000000000 -0400 |
35223 |
@@ -862,7 +862,7 @@ out: |
35224 |
|
35225 |
static void check_for_stack(struct device *dev, void *addr) |
35226 |
@@ -53686,9 +51747,9 @@ diff -urNp linux-2.6.38.3/lib/dma-debug.c linux-2.6.38.3/lib/dma-debug.c |
35227 |
err_printk(dev, NULL, "DMA-API: device driver maps memory from" |
35228 |
"stack [addr=%p]\n", addr); |
35229 |
} |
35230 |
-diff -urNp linux-2.6.38.3/lib/inflate.c linux-2.6.38.3/lib/inflate.c |
35231 |
---- linux-2.6.38.3/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400 |
35232 |
-+++ linux-2.6.38.3/lib/inflate.c 2011-04-17 15:57:33.000000000 -0400 |
35233 |
+diff -urNp linux-2.6.38.4/lib/inflate.c linux-2.6.38.4/lib/inflate.c |
35234 |
+--- linux-2.6.38.4/lib/inflate.c 2011-03-14 21:20:32.000000000 -0400 |
35235 |
++++ linux-2.6.38.4/lib/inflate.c 2011-04-17 15:57:33.000000000 -0400 |
35236 |
@@ -269,7 +269,7 @@ static void free(void *where) |
35237 |
malloc_ptr = free_mem_ptr; |
35238 |
} |
35239 |
@@ -53698,9 +51759,9 @@ diff -urNp linux-2.6.38.3/lib/inflate.c linux-2.6.38.3/lib/inflate.c |
35240 |
#define free(a) kfree(a) |
35241 |
#endif |
35242 |
|
35243 |
-diff -urNp linux-2.6.38.3/lib/Kconfig.debug linux-2.6.38.3/lib/Kconfig.debug |
35244 |
---- linux-2.6.38.3/lib/Kconfig.debug 2011-03-14 21:20:32.000000000 -0400 |
35245 |
-+++ linux-2.6.38.3/lib/Kconfig.debug 2011-04-17 15:57:33.000000000 -0400 |
35246 |
+diff -urNp linux-2.6.38.4/lib/Kconfig.debug linux-2.6.38.4/lib/Kconfig.debug |
35247 |
+--- linux-2.6.38.4/lib/Kconfig.debug 2011-04-22 19:20:59.000000000 -0400 |
35248 |
++++ linux-2.6.38.4/lib/Kconfig.debug 2011-04-22 19:21:39.000000000 -0400 |
35249 |
@@ -1066,6 +1066,7 @@ config LATENCYTOP |
35250 |
depends on DEBUG_KERNEL |
35251 |
depends on STACKTRACE_SUPPORT |
35252 |
@@ -53709,9 +51770,9 @@ diff -urNp linux-2.6.38.3/lib/Kconfig.debug linux-2.6.38.3/lib/Kconfig.debug |
35253 |
select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE |
35254 |
select KALLSYMS |
35255 |
select KALLSYMS_ALL |
35256 |
-diff -urNp linux-2.6.38.3/lib/kref.c linux-2.6.38.3/lib/kref.c |
35257 |
---- linux-2.6.38.3/lib/kref.c 2011-03-14 21:20:32.000000000 -0400 |
35258 |
-+++ linux-2.6.38.3/lib/kref.c 2011-04-17 15:57:33.000000000 -0400 |
35259 |
+diff -urNp linux-2.6.38.4/lib/kref.c linux-2.6.38.4/lib/kref.c |
35260 |
+--- linux-2.6.38.4/lib/kref.c 2011-03-14 21:20:32.000000000 -0400 |
35261 |
++++ linux-2.6.38.4/lib/kref.c 2011-04-17 15:57:33.000000000 -0400 |
35262 |
@@ -52,7 +52,7 @@ void kref_get(struct kref *kref) |
35263 |
*/ |
35264 |
int kref_put(struct kref *kref, void (*release)(struct kref *kref)) |
35265 |
@@ -53721,9 +51782,9 @@ diff -urNp linux-2.6.38.3/lib/kref.c linux-2.6.38.3/lib/kref.c |
35266 |
WARN_ON(release == (void (*)(struct kref *))kfree); |
35267 |
|
35268 |
if (atomic_dec_and_test(&kref->refcount)) { |
35269 |
-diff -urNp linux-2.6.38.3/lib/radix-tree.c linux-2.6.38.3/lib/radix-tree.c |
35270 |
---- linux-2.6.38.3/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400 |
35271 |
-+++ linux-2.6.38.3/lib/radix-tree.c 2011-04-17 15:57:33.000000000 -0400 |
35272 |
+diff -urNp linux-2.6.38.4/lib/radix-tree.c linux-2.6.38.4/lib/radix-tree.c |
35273 |
+--- linux-2.6.38.4/lib/radix-tree.c 2011-03-14 21:20:32.000000000 -0400 |
35274 |
++++ linux-2.6.38.4/lib/radix-tree.c 2011-04-17 15:57:33.000000000 -0400 |
35275 |
@@ -80,7 +80,7 @@ struct radix_tree_preload { |
35276 |
int nr; |
35277 |
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; |
35278 |
@@ -53733,9 +51794,9 @@ diff -urNp linux-2.6.38.3/lib/radix-tree.c linux-2.6.38.3/lib/radix-tree.c |
35279 |
|
35280 |
static inline void *ptr_to_indirect(void *ptr) |
35281 |
{ |
35282 |
-diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35283 |
---- linux-2.6.38.3/lib/vsprintf.c 2011-03-14 21:20:32.000000000 -0400 |
35284 |
-+++ linux-2.6.38.3/lib/vsprintf.c 2011-04-17 15:57:33.000000000 -0400 |
35285 |
+diff -urNp linux-2.6.38.4/lib/vsprintf.c linux-2.6.38.4/lib/vsprintf.c |
35286 |
+--- linux-2.6.38.4/lib/vsprintf.c 2011-04-22 19:20:59.000000000 -0400 |
35287 |
++++ linux-2.6.38.4/lib/vsprintf.c 2011-04-22 19:21:39.000000000 -0400 |
35288 |
@@ -16,6 +16,9 @@ |
35289 |
* - scnprintf and vscnprintf |
35290 |
*/ |
35291 |
@@ -53746,7 +51807,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35292 |
#include <stdarg.h> |
35293 |
#include <linux/module.h> |
35294 |
#include <linux/types.h> |
35295 |
-@@ -574,7 +577,7 @@ char *symbol_string(char *buf, char *end |
35296 |
+@@ -433,7 +436,7 @@ char *symbol_string(char *buf, char *end |
35297 |
unsigned long value = (unsigned long) ptr; |
35298 |
#ifdef CONFIG_KALLSYMS |
35299 |
char sym[KSYM_SYMBOL_LEN]; |
35300 |
@@ -53755,7 +51816,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35301 |
sprint_symbol(sym, value); |
35302 |
else |
35303 |
kallsyms_lookup(value, NULL, NULL, NULL, sym); |
35304 |
-@@ -936,7 +939,11 @@ char *uuid_string(char *buf, char *end, |
35305 |
+@@ -795,7 +798,11 @@ char *uuid_string(char *buf, char *end, |
35306 |
return string(buf, end, uuid, spec); |
35307 |
} |
35308 |
|
35309 |
@@ -53767,7 +51828,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35310 |
|
35311 |
/* |
35312 |
* Show a '%p' thing. A kernel extension is that the '%p' is followed |
35313 |
-@@ -949,6 +956,8 @@ int kptr_restrict = 1; |
35314 |
+@@ -808,6 +815,8 @@ int kptr_restrict = 1; |
35315 |
* - 'f' For simple symbolic function names without offset |
35316 |
* - 'S' For symbolic direct pointers with offset |
35317 |
* - 's' For symbolic direct pointers without offset |
35318 |
@@ -53776,7 +51837,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35319 |
* - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref] |
35320 |
* - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201] |
35321 |
* - 'M' For a 6-byte MAC address, it prints the address in the |
35322 |
-@@ -993,12 +1002,12 @@ char *pointer(const char *fmt, char *buf |
35323 |
+@@ -852,12 +861,12 @@ char *pointer(const char *fmt, char *buf |
35324 |
{ |
35325 |
if (!ptr) { |
35326 |
/* |
35327 |
@@ -53791,7 +51852,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35328 |
} |
35329 |
|
35330 |
switch (*fmt) { |
35331 |
-@@ -1008,6 +1017,13 @@ char *pointer(const char *fmt, char *buf |
35332 |
+@@ -867,6 +876,13 @@ char *pointer(const char *fmt, char *buf |
35333 |
/* Fallthrough */ |
35334 |
case 'S': |
35335 |
case 's': |
35336 |
@@ -53805,7 +51866,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35337 |
return symbol_string(buf, end, ptr, spec, *fmt); |
35338 |
case 'R': |
35339 |
case 'r': |
35340 |
-@@ -1772,11 +1788,11 @@ int bstr_printf(char *buf, size_t size, |
35341 |
+@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size, |
35342 |
typeof(type) value; \ |
35343 |
if (sizeof(type) == 8) { \ |
35344 |
args = PTR_ALIGN(args, sizeof(u32)); \ |
35345 |
@@ -53820,7 +51881,7 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35346 |
} \ |
35347 |
args += sizeof(type); \ |
35348 |
value; \ |
35349 |
-@@ -1839,7 +1855,7 @@ int bstr_printf(char *buf, size_t size, |
35350 |
+@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size, |
35351 |
case FORMAT_TYPE_STR: { |
35352 |
const char *str_arg = args; |
35353 |
args += strlen(str_arg) + 1; |
35354 |
@@ -53829,26 +51890,34 @@ diff -urNp linux-2.6.38.3/lib/vsprintf.c linux-2.6.38.3/lib/vsprintf.c |
35355 |
break; |
35356 |
} |
35357 |
|
35358 |
-diff -urNp linux-2.6.38.3/localversion-grsec linux-2.6.38.3/localversion-grsec |
35359 |
---- linux-2.6.38.3/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 |
35360 |
-+++ linux-2.6.38.3/localversion-grsec 2011-04-17 15:57:33.000000000 -0400 |
35361 |
+diff -urNp linux-2.6.38.4/localversion-grsec linux-2.6.38.4/localversion-grsec |
35362 |
+--- linux-2.6.38.4/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 |
35363 |
++++ linux-2.6.38.4/localversion-grsec 2011-04-17 15:57:33.000000000 -0400 |
35364 |
@@ -0,0 +1 @@ |
35365 |
+-grsec |
35366 |
-diff -urNp linux-2.6.38.3/Makefile linux-2.6.38.3/Makefile |
35367 |
---- linux-2.6.38.3/Makefile 2011-04-18 17:27:18.000000000 -0400 |
35368 |
-+++ linux-2.6.38.3/Makefile 2011-04-17 16:53:16.000000000 -0400 |
35369 |
+diff -urNp linux-2.6.38.4/Makefile linux-2.6.38.4/Makefile |
35370 |
+--- linux-2.6.38.4/Makefile 2011-04-22 19:20:59.000000000 -0400 |
35371 |
++++ linux-2.6.38.4/Makefile 2011-04-23 12:47:27.000000000 -0400 |
35372 |
@@ -233,8 +233,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" |
35373 |
|
35374 |
HOSTCC = gcc |
35375 |
HOSTCXX = g++ |
35376 |
-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer |
35377 |
-HOSTCXXFLAGS = -O2 |
35378 |
-+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
35379 |
++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
35380 |
+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks |
35381 |
|
35382 |
# Decide whether to build built-in, modular, or both. |
35383 |
# Normally, just do built-in. |
35384 |
-@@ -681,7 +681,7 @@ export mod_strip_cmd |
35385 |
+@@ -352,6 +352,7 @@ LINUXINCLUDE := -I$(srctree)/arch/$(h |
35386 |
+ KBUILD_CPPFLAGS := -D__KERNEL__ |
35387 |
+ |
35388 |
+ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ |
35389 |
++ -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers \ |
35390 |
+ -fno-strict-aliasing -fno-common \ |
35391 |
+ -Werror-implicit-function-declaration \ |
35392 |
+ -Wno-format-security \ |
35393 |
+@@ -681,7 +682,7 @@ export mod_strip_cmd |
35394 |
|
35395 |
|
35396 |
ifeq ($(KBUILD_EXTMOD),) |
35397 |
@@ -53857,9 +51926,9 @@ diff -urNp linux-2.6.38.3/Makefile linux-2.6.38.3/Makefile |
35398 |
|
35399 |
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
35400 |
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |
35401 |
-diff -urNp linux-2.6.38.3/mm/bootmem.c linux-2.6.38.3/mm/bootmem.c |
35402 |
---- linux-2.6.38.3/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400 |
35403 |
-+++ linux-2.6.38.3/mm/bootmem.c 2011-04-17 15:57:33.000000000 -0400 |
35404 |
+diff -urNp linux-2.6.38.4/mm/bootmem.c linux-2.6.38.4/mm/bootmem.c |
35405 |
+--- linux-2.6.38.4/mm/bootmem.c 2011-03-14 21:20:32.000000000 -0400 |
35406 |
++++ linux-2.6.38.4/mm/bootmem.c 2011-04-17 15:57:33.000000000 -0400 |
35407 |
@@ -201,19 +201,30 @@ static void __init __free_pages_memory(u |
35408 |
unsigned long __init free_all_memory_core_early(int nodeid) |
35409 |
{ |
35410 |
@@ -53893,9 +51962,9 @@ diff -urNp linux-2.6.38.3/mm/bootmem.c linux-2.6.38.3/mm/bootmem.c |
35411 |
|
35412 |
return count; |
35413 |
} |
35414 |
-diff -urNp linux-2.6.38.3/mm/filemap.c linux-2.6.38.3/mm/filemap.c |
35415 |
---- linux-2.6.38.3/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400 |
35416 |
-+++ linux-2.6.38.3/mm/filemap.c 2011-04-17 15:57:33.000000000 -0400 |
35417 |
+diff -urNp linux-2.6.38.4/mm/filemap.c linux-2.6.38.4/mm/filemap.c |
35418 |
+--- linux-2.6.38.4/mm/filemap.c 2011-03-14 21:20:32.000000000 -0400 |
35419 |
++++ linux-2.6.38.4/mm/filemap.c 2011-04-17 15:57:33.000000000 -0400 |
35420 |
@@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file |
35421 |
struct address_space *mapping = file->f_mapping; |
35422 |
|
35423 |
@@ -53913,9 +51982,9 @@ diff -urNp linux-2.6.38.3/mm/filemap.c linux-2.6.38.3/mm/filemap.c |
35424 |
if (*pos >= limit) { |
35425 |
send_sig(SIGXFSZ, current, 0); |
35426 |
return -EFBIG; |
35427 |
-diff -urNp linux-2.6.38.3/mm/fremap.c linux-2.6.38.3/mm/fremap.c |
35428 |
---- linux-2.6.38.3/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400 |
35429 |
-+++ linux-2.6.38.3/mm/fremap.c 2011-04-17 15:57:33.000000000 -0400 |
35430 |
+diff -urNp linux-2.6.38.4/mm/fremap.c linux-2.6.38.4/mm/fremap.c |
35431 |
+--- linux-2.6.38.4/mm/fremap.c 2011-03-14 21:20:32.000000000 -0400 |
35432 |
++++ linux-2.6.38.4/mm/fremap.c 2011-04-17 15:57:33.000000000 -0400 |
35433 |
@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign |
35434 |
retry: |
35435 |
vma = find_vma(mm, start); |
35436 |
@@ -53937,9 +52006,9 @@ diff -urNp linux-2.6.38.3/mm/fremap.c linux-2.6.38.3/mm/fremap.c |
35437 |
munlock_vma_pages_range(vma, start, start + size); |
35438 |
vma->vm_flags = saved_flags; |
35439 |
} |
35440 |
-diff -urNp linux-2.6.38.3/mm/highmem.c linux-2.6.38.3/mm/highmem.c |
35441 |
---- linux-2.6.38.3/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400 |
35442 |
-+++ linux-2.6.38.3/mm/highmem.c 2011-04-17 15:57:33.000000000 -0400 |
35443 |
+diff -urNp linux-2.6.38.4/mm/highmem.c linux-2.6.38.4/mm/highmem.c |
35444 |
+--- linux-2.6.38.4/mm/highmem.c 2011-03-14 21:20:32.000000000 -0400 |
35445 |
++++ linux-2.6.38.4/mm/highmem.c 2011-04-17 15:57:33.000000000 -0400 |
35446 |
@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void) |
35447 |
* So no dangers, even with speculative execution. |
35448 |
*/ |
35449 |
@@ -53965,9 +52034,9 @@ diff -urNp linux-2.6.38.3/mm/highmem.c linux-2.6.38.3/mm/highmem.c |
35450 |
pkmap_count[last_pkmap_nr] = 1; |
35451 |
set_page_address(page, (void *)vaddr); |
35452 |
|
35453 |
-diff -urNp linux-2.6.38.3/mm/hugetlb.c linux-2.6.38.3/mm/hugetlb.c |
35454 |
---- linux-2.6.38.3/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400 |
35455 |
-+++ linux-2.6.38.3/mm/hugetlb.c 2011-04-17 15:57:33.000000000 -0400 |
35456 |
+diff -urNp linux-2.6.38.4/mm/hugetlb.c linux-2.6.38.4/mm/hugetlb.c |
35457 |
+--- linux-2.6.38.4/mm/hugetlb.c 2011-03-14 21:20:32.000000000 -0400 |
35458 |
++++ linux-2.6.38.4/mm/hugetlb.c 2011-04-17 15:57:33.000000000 -0400 |
35459 |
@@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_s |
35460 |
return 1; |
35461 |
} |
35462 |
@@ -54057,9 +52126,9 @@ diff -urNp linux-2.6.38.3/mm/hugetlb.c linux-2.6.38.3/mm/hugetlb.c |
35463 |
ptep = huge_pte_alloc(mm, address, huge_page_size(h)); |
35464 |
if (!ptep) |
35465 |
return VM_FAULT_OOM; |
35466 |
-diff -urNp linux-2.6.38.3/mm/Kconfig linux-2.6.38.3/mm/Kconfig |
35467 |
---- linux-2.6.38.3/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
35468 |
-+++ linux-2.6.38.3/mm/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
35469 |
+diff -urNp linux-2.6.38.4/mm/Kconfig linux-2.6.38.4/mm/Kconfig |
35470 |
+--- linux-2.6.38.4/mm/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
35471 |
++++ linux-2.6.38.4/mm/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
35472 |
@@ -240,7 +240,7 @@ config KSM |
35473 |
config DEFAULT_MMAP_MIN_ADDR |
35474 |
int "Low address space to protect from user allocation" |
35475 |
@@ -54069,9 +52138,9 @@ diff -urNp linux-2.6.38.3/mm/Kconfig linux-2.6.38.3/mm/Kconfig |
35476 |
help |
35477 |
This is the portion of low virtual memory which should be protected |
35478 |
from userspace allocation. Keeping a user from writing to low pages |
35479 |
-diff -urNp linux-2.6.38.3/mm/kmemleak.c linux-2.6.38.3/mm/kmemleak.c |
35480 |
---- linux-2.6.38.3/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400 |
35481 |
-+++ linux-2.6.38.3/mm/kmemleak.c 2011-04-17 15:57:33.000000000 -0400 |
35482 |
+diff -urNp linux-2.6.38.4/mm/kmemleak.c linux-2.6.38.4/mm/kmemleak.c |
35483 |
+--- linux-2.6.38.4/mm/kmemleak.c 2011-03-14 21:20:32.000000000 -0400 |
35484 |
++++ linux-2.6.38.4/mm/kmemleak.c 2011-04-17 15:57:33.000000000 -0400 |
35485 |
@@ -357,7 +357,7 @@ static void print_unreferenced(struct se |
35486 |
|
35487 |
for (i = 0; i < object->trace_len; i++) { |
35488 |
@@ -54081,9 +52150,9 @@ diff -urNp linux-2.6.38.3/mm/kmemleak.c linux-2.6.38.3/mm/kmemleak.c |
35489 |
} |
35490 |
} |
35491 |
|
35492 |
-diff -urNp linux-2.6.38.3/mm/maccess.c linux-2.6.38.3/mm/maccess.c |
35493 |
---- linux-2.6.38.3/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 |
35494 |
-+++ linux-2.6.38.3/mm/maccess.c 2011-04-17 15:57:33.000000000 -0400 |
35495 |
+diff -urNp linux-2.6.38.4/mm/maccess.c linux-2.6.38.4/mm/maccess.c |
35496 |
+--- linux-2.6.38.4/mm/maccess.c 2011-03-14 21:20:32.000000000 -0400 |
35497 |
++++ linux-2.6.38.4/mm/maccess.c 2011-04-17 15:57:33.000000000 -0400 |
35498 |
@@ -15,10 +15,10 @@ |
35499 |
* happens, handle that and return -EFAULT. |
35500 |
*/ |
35501 |
@@ -54110,9 +52179,9 @@ diff -urNp linux-2.6.38.3/mm/maccess.c linux-2.6.38.3/mm/maccess.c |
35502 |
{ |
35503 |
long ret; |
35504 |
mm_segment_t old_fs = get_fs(); |
35505 |
-diff -urNp linux-2.6.38.3/mm/madvise.c linux-2.6.38.3/mm/madvise.c |
35506 |
---- linux-2.6.38.3/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400 |
35507 |
-+++ linux-2.6.38.3/mm/madvise.c 2011-04-17 15:57:33.000000000 -0400 |
35508 |
+diff -urNp linux-2.6.38.4/mm/madvise.c linux-2.6.38.4/mm/madvise.c |
35509 |
+--- linux-2.6.38.4/mm/madvise.c 2011-03-14 21:20:32.000000000 -0400 |
35510 |
++++ linux-2.6.38.4/mm/madvise.c 2011-04-17 15:57:33.000000000 -0400 |
35511 |
@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a |
35512 |
pgoff_t pgoff; |
35513 |
unsigned long new_flags = vma->vm_flags; |
35514 |
@@ -54189,9 +52258,9 @@ diff -urNp linux-2.6.38.3/mm/madvise.c linux-2.6.38.3/mm/madvise.c |
35515 |
error = 0; |
35516 |
if (end == start) |
35517 |
goto out; |
35518 |
-diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35519 |
---- linux-2.6.38.3/mm/memory.c 2011-03-14 21:20:32.000000000 -0400 |
35520 |
-+++ linux-2.6.38.3/mm/memory.c 2011-04-17 15:57:33.000000000 -0400 |
35521 |
+diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c |
35522 |
+--- linux-2.6.38.4/mm/memory.c 2011-04-22 19:20:59.000000000 -0400 |
35523 |
++++ linux-2.6.38.4/mm/memory.c 2011-04-23 14:01:36.000000000 -0400 |
35524 |
@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct |
35525 |
return; |
35526 |
|
35527 |
@@ -54218,7 +52287,21 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35528 |
} |
35529 |
|
35530 |
/* |
35531 |
-@@ -1433,10 +1440,10 @@ int __get_user_pages(struct task_struct |
35532 |
+@@ -1410,13 +1417,6 @@ no_page_table: |
35533 |
+ return page; |
35534 |
+ } |
35535 |
+ |
35536 |
+-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr) |
35537 |
+-{ |
35538 |
+- return (vma->vm_flags & VM_GROWSDOWN) && |
35539 |
+- (vma->vm_start == addr) && |
35540 |
+- !vma_stack_continue(vma->vm_prev, addr); |
35541 |
+-} |
35542 |
+- |
35543 |
+ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, |
35544 |
+ unsigned long start, int nr_pages, unsigned int gup_flags, |
35545 |
+ struct page **pages, struct vm_area_struct **vmas, |
35546 |
+@@ -1440,10 +1440,10 @@ int __get_user_pages(struct task_struct |
35547 |
(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); |
35548 |
i = 0; |
35549 |
|
35550 |
@@ -54230,9 +52313,9 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35551 |
+ vma = find_vma(mm, start); |
35552 |
if (!vma && in_gate_area(tsk, start)) { |
35553 |
unsigned long pg = start & PAGE_MASK; |
35554 |
- struct vm_area_struct *gate_vma = get_gate_vma(tsk); |
35555 |
-@@ -1489,7 +1496,7 @@ int __get_user_pages(struct task_struct |
35556 |
- continue; |
35557 |
+ pgd_t *pgd; |
35558 |
+@@ -1491,7 +1491,7 @@ int __get_user_pages(struct task_struct |
35559 |
+ goto next_page; |
35560 |
} |
35561 |
|
35562 |
- if (!vma || |
35563 |
@@ -54240,7 +52323,21 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35564 |
(vma->vm_flags & (VM_IO | VM_PFNMAP)) || |
35565 |
!(vm_flags & vma->vm_flags)) |
35566 |
return i ? : -EFAULT; |
35567 |
-@@ -1575,7 +1582,7 @@ int __get_user_pages(struct task_struct |
35568 |
+@@ -1502,13 +1502,6 @@ int __get_user_pages(struct task_struct |
35569 |
+ continue; |
35570 |
+ } |
35571 |
+ |
35572 |
+- /* |
35573 |
+- * If we don't actually want the page itself, |
35574 |
+- * and it's the stack guard page, just skip it. |
35575 |
+- */ |
35576 |
+- if (!pages && stack_guard_page(vma, start)) |
35577 |
+- goto next_page; |
35578 |
+- |
35579 |
+ do { |
35580 |
+ struct page *page; |
35581 |
+ unsigned int foll_flags = gup_flags; |
35582 |
+@@ -1585,7 +1578,7 @@ next_page: |
35583 |
start += PAGE_SIZE; |
35584 |
nr_pages--; |
35585 |
} while (nr_pages && start < vma->vm_end); |
35586 |
@@ -54249,7 +52346,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35587 |
return i; |
35588 |
} |
35589 |
|
35590 |
-@@ -1724,6 +1731,10 @@ static int insert_page(struct vm_area_st |
35591 |
+@@ -1734,6 +1727,10 @@ static int insert_page(struct vm_area_st |
35592 |
page_add_file_rmap(page); |
35593 |
set_pte_at(mm, addr, pte, mk_pte(page, prot)); |
35594 |
|
35595 |
@@ -54260,7 +52357,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35596 |
retval = 0; |
35597 |
pte_unmap_unlock(pte, ptl); |
35598 |
return retval; |
35599 |
-@@ -1758,10 +1769,22 @@ out: |
35600 |
+@@ -1768,10 +1765,22 @@ out: |
35601 |
int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, |
35602 |
struct page *page) |
35603 |
{ |
35604 |
@@ -54283,7 +52380,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35605 |
vma->vm_flags |= VM_INSERTPAGE; |
35606 |
return insert_page(vma, addr, page, vma->vm_page_prot); |
35607 |
} |
35608 |
-@@ -1847,6 +1870,7 @@ int vm_insert_mixed(struct vm_area_struc |
35609 |
+@@ -1857,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struc |
35610 |
unsigned long pfn) |
35611 |
{ |
35612 |
BUG_ON(!(vma->vm_flags & VM_MIXEDMAP)); |
35613 |
@@ -54291,7 +52388,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35614 |
|
35615 |
if (addr < vma->vm_start || addr >= vma->vm_end) |
35616 |
return -EFAULT; |
35617 |
-@@ -2162,6 +2186,186 @@ static inline void cow_user_page(struct |
35618 |
+@@ -2172,6 +2182,186 @@ static inline void cow_user_page(struct |
35619 |
copy_user_highpage(dst, src, va, vma); |
35620 |
} |
35621 |
|
35622 |
@@ -54478,7 +52575,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35623 |
/* |
35624 |
* This routine handles present pages, when users try to write |
35625 |
* to a shared page. It is done by copying the page to a new address |
35626 |
-@@ -2373,6 +2577,12 @@ gotten: |
35627 |
+@@ -2383,6 +2573,12 @@ gotten: |
35628 |
*/ |
35629 |
page_table = pte_offset_map_lock(mm, pmd, address, &ptl); |
35630 |
if (likely(pte_same(*page_table, orig_pte))) { |
35631 |
@@ -54491,7 +52588,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35632 |
if (old_page) { |
35633 |
if (!PageAnon(old_page)) { |
35634 |
dec_mm_counter_fast(mm, MM_FILEPAGES); |
35635 |
-@@ -2424,6 +2634,10 @@ gotten: |
35636 |
+@@ -2434,6 +2630,10 @@ gotten: |
35637 |
page_remove_rmap(old_page); |
35638 |
} |
35639 |
|
35640 |
@@ -54502,7 +52599,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35641 |
/* Free the old page.. */ |
35642 |
new_page = old_page; |
35643 |
ret |= VM_FAULT_WRITE; |
35644 |
-@@ -2834,6 +3048,11 @@ static int do_swap_page(struct mm_struct |
35645 |
+@@ -2844,6 +3044,11 @@ static int do_swap_page(struct mm_struct |
35646 |
swap_free(entry); |
35647 |
if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) |
35648 |
try_to_free_swap(page); |
35649 |
@@ -54514,7 +52611,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35650 |
unlock_page(page); |
35651 |
if (swapcache) { |
35652 |
/* |
35653 |
-@@ -2857,6 +3076,11 @@ static int do_swap_page(struct mm_struct |
35654 |
+@@ -2867,6 +3072,11 @@ static int do_swap_page(struct mm_struct |
35655 |
|
35656 |
/* No need to invalidate - it was non-present before */ |
35657 |
update_mmu_cache(vma, address, page_table); |
35658 |
@@ -54526,7 +52623,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35659 |
unlock: |
35660 |
pte_unmap_unlock(page_table, ptl); |
35661 |
out: |
35662 |
-@@ -2876,40 +3100,6 @@ out_release: |
35663 |
+@@ -2886,40 +3096,6 @@ out_release: |
35664 |
} |
35665 |
|
35666 |
/* |
35667 |
@@ -54567,7 +52664,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35668 |
* We enter with non-exclusive mmap_sem (to exclude vma changes, |
35669 |
* but allow concurrent faults), and pte mapped but not yet locked. |
35670 |
* We return with mmap_sem still held, but pte unmapped and unlocked. |
35671 |
-@@ -2918,27 +3108,23 @@ static int do_anonymous_page(struct mm_s |
35672 |
+@@ -2928,27 +3104,23 @@ static int do_anonymous_page(struct mm_s |
35673 |
unsigned long address, pte_t *page_table, pmd_t *pmd, |
35674 |
unsigned int flags) |
35675 |
{ |
35676 |
@@ -54600,7 +52697,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35677 |
if (unlikely(anon_vma_prepare(vma))) |
35678 |
goto oom; |
35679 |
page = alloc_zeroed_user_highpage_movable(vma, address); |
35680 |
-@@ -2957,6 +3143,11 @@ static int do_anonymous_page(struct mm_s |
35681 |
+@@ -2967,6 +3139,11 @@ static int do_anonymous_page(struct mm_s |
35682 |
if (!pte_none(*page_table)) |
35683 |
goto release; |
35684 |
|
35685 |
@@ -54612,7 +52709,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35686 |
inc_mm_counter_fast(mm, MM_ANONPAGES); |
35687 |
page_add_new_anon_rmap(page, vma, address); |
35688 |
setpte: |
35689 |
-@@ -2964,6 +3155,12 @@ setpte: |
35690 |
+@@ -2974,6 +3151,12 @@ setpte: |
35691 |
|
35692 |
/* No need to invalidate - it was non-present before */ |
35693 |
update_mmu_cache(vma, address, page_table); |
35694 |
@@ -54625,7 +52722,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35695 |
unlock: |
35696 |
pte_unmap_unlock(page_table, ptl); |
35697 |
return 0; |
35698 |
-@@ -3101,6 +3298,12 @@ static int __do_fault(struct mm_struct * |
35699 |
+@@ -3111,6 +3294,12 @@ static int __do_fault(struct mm_struct * |
35700 |
*/ |
35701 |
/* Only go through if we didn't race with anybody else... */ |
35702 |
if (likely(pte_same(*page_table, orig_pte))) { |
35703 |
@@ -54638,7 +52735,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35704 |
flush_icache_page(vma, page); |
35705 |
entry = mk_pte(page, vma->vm_page_prot); |
35706 |
if (flags & FAULT_FLAG_WRITE) |
35707 |
-@@ -3120,6 +3323,14 @@ static int __do_fault(struct mm_struct * |
35708 |
+@@ -3130,6 +3319,14 @@ static int __do_fault(struct mm_struct * |
35709 |
|
35710 |
/* no need to invalidate: a not-present page won't be cached */ |
35711 |
update_mmu_cache(vma, address, page_table); |
35712 |
@@ -54653,7 +52750,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35713 |
} else { |
35714 |
if (charged) |
35715 |
mem_cgroup_uncharge_page(page); |
35716 |
-@@ -3267,6 +3478,12 @@ int handle_pte_fault(struct mm_struct *m |
35717 |
+@@ -3277,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *m |
35718 |
if (flags & FAULT_FLAG_WRITE) |
35719 |
flush_tlb_fix_spurious_fault(vma, address); |
35720 |
} |
35721 |
@@ -54666,7 +52763,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35722 |
unlock: |
35723 |
pte_unmap_unlock(pte, ptl); |
35724 |
return 0; |
35725 |
-@@ -3283,6 +3500,10 @@ int handle_mm_fault(struct mm_struct *mm |
35726 |
+@@ -3293,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm |
35727 |
pmd_t *pmd; |
35728 |
pte_t *pte; |
35729 |
|
35730 |
@@ -54677,7 +52774,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35731 |
__set_current_state(TASK_RUNNING); |
35732 |
|
35733 |
count_vm_event(PGFAULT); |
35734 |
-@@ -3293,6 +3514,34 @@ int handle_mm_fault(struct mm_struct *mm |
35735 |
+@@ -3303,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm |
35736 |
if (unlikely(is_vm_hugetlb_page(vma))) |
35737 |
return hugetlb_fault(mm, vma, address, flags); |
35738 |
|
35739 |
@@ -54712,7 +52809,7 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35740 |
pgd = pgd_offset(mm, address); |
35741 |
pud = pud_alloc(mm, pgd, address); |
35742 |
if (!pud) |
35743 |
-@@ -3426,7 +3675,7 @@ static int __init gate_vma_init(void) |
35744 |
+@@ -3436,7 +3671,7 @@ static int __init gate_vma_init(void) |
35745 |
gate_vma.vm_start = FIXADDR_USER_START; |
35746 |
gate_vma.vm_end = FIXADDR_USER_END; |
35747 |
gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; |
35748 |
@@ -54721,9 +52818,9 @@ diff -urNp linux-2.6.38.3/mm/memory.c linux-2.6.38.3/mm/memory.c |
35749 |
/* |
35750 |
* Make sure the vDSO gets into every core dump. |
35751 |
* Dumping its contents makes post-mortem fully interpretable later |
35752 |
-diff -urNp linux-2.6.38.3/mm/memory-failure.c linux-2.6.38.3/mm/memory-failure.c |
35753 |
---- linux-2.6.38.3/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -0400 |
35754 |
-+++ linux-2.6.38.3/mm/memory-failure.c 2011-04-17 15:57:33.000000000 -0400 |
35755 |
+diff -urNp linux-2.6.38.4/mm/memory-failure.c linux-2.6.38.4/mm/memory-failure.c |
35756 |
+--- linux-2.6.38.4/mm/memory-failure.c 2011-03-14 21:20:32.000000000 -0400 |
35757 |
++++ linux-2.6.38.4/mm/memory-failure.c 2011-04-17 15:57:33.000000000 -0400 |
35758 |
@@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r |
35759 |
|
35760 |
int sysctl_memory_failure_recovery __read_mostly = 1; |
35761 |
@@ -54796,9 +52893,9 @@ diff -urNp linux-2.6.38.3/mm/memory-failure.c linux-2.6.38.3/mm/memory-failure.c |
35762 |
SetPageHWPoison(page); |
35763 |
/* keep elevated page count for bad page */ |
35764 |
return ret; |
35765 |
-diff -urNp linux-2.6.38.3/mm/mempolicy.c linux-2.6.38.3/mm/mempolicy.c |
35766 |
---- linux-2.6.38.3/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400 |
35767 |
-+++ linux-2.6.38.3/mm/mempolicy.c 2011-04-17 15:57:33.000000000 -0400 |
35768 |
+diff -urNp linux-2.6.38.4/mm/mempolicy.c linux-2.6.38.4/mm/mempolicy.c |
35769 |
+--- linux-2.6.38.4/mm/mempolicy.c 2011-03-14 21:20:32.000000000 -0400 |
35770 |
++++ linux-2.6.38.4/mm/mempolicy.c 2011-04-17 15:57:33.000000000 -0400 |
35771 |
@@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct |
35772 |
unsigned long vmstart; |
35773 |
unsigned long vmend; |
35774 |
@@ -54879,9 +52976,9 @@ diff -urNp linux-2.6.38.3/mm/mempolicy.c linux-2.6.38.3/mm/mempolicy.c |
35775 |
} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { |
35776 |
seq_printf(m, " heap"); |
35777 |
} else if (vma->vm_start <= mm->start_stack && |
35778 |
-diff -urNp linux-2.6.38.3/mm/migrate.c linux-2.6.38.3/mm/migrate.c |
35779 |
---- linux-2.6.38.3/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400 |
35780 |
-+++ linux-2.6.38.3/mm/migrate.c 2011-04-17 15:57:33.000000000 -0400 |
35781 |
+diff -urNp linux-2.6.38.4/mm/migrate.c linux-2.6.38.4/mm/migrate.c |
35782 |
+--- linux-2.6.38.4/mm/migrate.c 2011-03-14 21:20:32.000000000 -0400 |
35783 |
++++ linux-2.6.38.4/mm/migrate.c 2011-04-17 15:57:33.000000000 -0400 |
35784 |
@@ -1299,6 +1299,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, |
35785 |
if (!mm) |
35786 |
return -EINVAL; |
35787 |
@@ -54907,9 +53004,9 @@ diff -urNp linux-2.6.38.3/mm/migrate.c linux-2.6.38.3/mm/migrate.c |
35788 |
rcu_read_unlock(); |
35789 |
err = -EPERM; |
35790 |
goto out; |
35791 |
-diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c |
35792 |
---- linux-2.6.38.3/mm/mlock.c 2011-03-14 21:20:32.000000000 -0400 |
35793 |
-+++ linux-2.6.38.3/mm/mlock.c 2011-04-17 15:57:33.000000000 -0400 |
35794 |
+diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c |
35795 |
+--- linux-2.6.38.4/mm/mlock.c 2011-04-22 19:20:59.000000000 -0400 |
35796 |
++++ linux-2.6.38.4/mm/mlock.c 2011-04-17 15:57:33.000000000 -0400 |
35797 |
@@ -13,6 +13,7 @@ |
35798 |
#include <linux/pagemap.h> |
35799 |
#include <linux/mempolicy.h> |
35800 |
@@ -54918,34 +53015,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c |
35801 |
#include <linux/sched.h> |
35802 |
#include <linux/module.h> |
35803 |
#include <linux/rmap.h> |
35804 |
-@@ -135,13 +136,6 @@ void munlock_vma_page(struct page *page) |
35805 |
- } |
35806 |
- } |
35807 |
- |
35808 |
--static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr) |
35809 |
--{ |
35810 |
-- return (vma->vm_flags & VM_GROWSDOWN) && |
35811 |
-- (vma->vm_start == addr) && |
35812 |
-- !vma_stack_continue(vma->vm_prev, addr); |
35813 |
--} |
35814 |
-- |
35815 |
- /** |
35816 |
- * __mlock_vma_pages_range() - mlock a range of pages in the vma. |
35817 |
- * @vma: target vma |
35818 |
-@@ -188,12 +182,6 @@ static long __mlock_vma_pages_range(stru |
35819 |
- if (vma->vm_flags & VM_LOCKED) |
35820 |
- gup_flags |= FOLL_MLOCK; |
35821 |
- |
35822 |
-- /* We don't try to access the guard page of a stack vma */ |
35823 |
-- if (stack_guard_page(vma, start)) { |
35824 |
-- addr += PAGE_SIZE; |
35825 |
-- nr_pages--; |
35826 |
-- } |
35827 |
-- |
35828 |
- return __get_user_pages(current, mm, addr, nr_pages, gup_flags, |
35829 |
- NULL, NULL, nonblocking); |
35830 |
- } |
35831 |
-@@ -393,6 +381,9 @@ static int do_mlock(unsigned long start, |
35832 |
+@@ -380,6 +381,9 @@ static int do_mlock(unsigned long start, |
35833 |
return -EINVAL; |
35834 |
if (end == start) |
35835 |
return 0; |
35836 |
@@ -54955,7 +53025,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c |
35837 |
vma = find_vma_prev(current->mm, start, &prev); |
35838 |
if (!vma || vma->vm_start > start) |
35839 |
return -ENOMEM; |
35840 |
-@@ -403,6 +394,11 @@ static int do_mlock(unsigned long start, |
35841 |
+@@ -390,6 +394,11 @@ static int do_mlock(unsigned long start, |
35842 |
for (nstart = start ; ; ) { |
35843 |
unsigned int newflags; |
35844 |
|
35845 |
@@ -54967,7 +53037,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c |
35846 |
/* Here we know that vma->vm_start <= nstart < vma->vm_end. */ |
35847 |
|
35848 |
newflags = vma->vm_flags | VM_LOCKED; |
35849 |
-@@ -508,6 +504,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st |
35850 |
+@@ -495,6 +504,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st |
35851 |
lock_limit >>= PAGE_SHIFT; |
35852 |
|
35853 |
/* check against resource limits */ |
35854 |
@@ -54975,7 +53045,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c |
35855 |
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK)) |
35856 |
error = do_mlock(start, len, 1); |
35857 |
up_write(¤t->mm->mmap_sem); |
35858 |
-@@ -531,17 +528,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, |
35859 |
+@@ -518,17 +528,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, |
35860 |
static int do_mlockall(int flags) |
35861 |
{ |
35862 |
struct vm_area_struct * vma, * prev = NULL; |
35863 |
@@ -55003,7 +53073,7 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c |
35864 |
newflags = vma->vm_flags | VM_LOCKED; |
35865 |
if (!(flags & MCL_CURRENT)) |
35866 |
newflags &= ~VM_LOCKED; |
35867 |
-@@ -573,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) |
35868 |
+@@ -560,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) |
35869 |
lock_limit >>= PAGE_SHIFT; |
35870 |
|
35871 |
ret = -ENOMEM; |
35872 |
@@ -55011,9 +53081,9 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c |
35873 |
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || |
35874 |
capable(CAP_IPC_LOCK)) |
35875 |
ret = do_mlockall(flags); |
35876 |
-diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35877 |
---- linux-2.6.38.3/mm/mmap.c 2011-03-14 21:20:32.000000000 -0400 |
35878 |
-+++ linux-2.6.38.3/mm/mmap.c 2011-04-17 15:57:33.000000000 -0400 |
35879 |
+diff -urNp linux-2.6.38.4/mm/mmap.c linux-2.6.38.4/mm/mmap.c |
35880 |
+--- linux-2.6.38.4/mm/mmap.c 2011-04-22 19:20:59.000000000 -0400 |
35881 |
++++ linux-2.6.38.4/mm/mmap.c 2011-04-22 19:25:32.000000000 -0400 |
35882 |
@@ -46,6 +46,16 @@ |
35883 |
#define arch_rebalance_pgtables(addr, len) (addr) |
35884 |
#endif |
35885 |
@@ -55795,20 +53865,21 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35886 |
size = vma->vm_end - address; |
35887 |
grow = (vma->vm_start - address) >> PAGE_SHIFT; |
35888 |
|
35889 |
-@@ -1818,10 +2100,21 @@ static int expand_downwards(struct vm_ar |
35890 |
- if (!error) { |
35891 |
- vma->vm_start = address; |
35892 |
- vma->vm_pgoff -= grow; |
35893 |
-+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags); |
35894 |
+@@ -1820,11 +2102,22 @@ static int expand_downwards(struct vm_ar |
35895 |
+ if (!error) { |
35896 |
+ vma->vm_start = address; |
35897 |
+ vma->vm_pgoff -= grow; |
35898 |
++ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags); |
35899 |
+ |
35900 |
+#ifdef CONFIG_PAX_SEGMEXEC |
35901 |
-+ if (vma_m) { |
35902 |
-+ vma_m->vm_start -= grow << PAGE_SHIFT; |
35903 |
-+ vma_m->vm_pgoff -= grow; |
35904 |
-+ } |
35905 |
++ if (vma_m) { |
35906 |
++ vma_m->vm_start -= grow << PAGE_SHIFT; |
35907 |
++ vma_m->vm_pgoff -= grow; |
35908 |
++ } |
35909 |
+#endif |
35910 |
+ |
35911 |
- perf_event_mmap(vma); |
35912 |
+ perf_event_mmap(vma); |
35913 |
+ } |
35914 |
} |
35915 |
} |
35916 |
vma_unlock_anon_vma(vma); |
35917 |
@@ -55817,7 +53888,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35918 |
khugepaged_enter_vma_merge(vma); |
35919 |
return error; |
35920 |
} |
35921 |
-@@ -1896,6 +2189,13 @@ static void remove_vma_list(struct mm_st |
35922 |
+@@ -1899,6 +2192,13 @@ static void remove_vma_list(struct mm_st |
35923 |
do { |
35924 |
long nrpages = vma_pages(vma); |
35925 |
|
35926 |
@@ -55831,7 +53902,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35927 |
mm->total_vm -= nrpages; |
35928 |
vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); |
35929 |
vma = remove_vma(vma); |
35930 |
-@@ -1941,6 +2241,16 @@ detach_vmas_to_be_unmapped(struct mm_str |
35931 |
+@@ -1944,6 +2244,16 @@ detach_vmas_to_be_unmapped(struct mm_str |
35932 |
insertion_point = (prev ? &prev->vm_next : &mm->mmap); |
35933 |
vma->vm_prev = NULL; |
35934 |
do { |
35935 |
@@ -55848,7 +53919,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35936 |
rb_erase(&vma->vm_rb, &mm->mm_rb); |
35937 |
mm->map_count--; |
35938 |
tail_vma = vma; |
35939 |
-@@ -1969,14 +2279,33 @@ static int __split_vma(struct mm_struct |
35940 |
+@@ -1972,14 +2282,33 @@ static int __split_vma(struct mm_struct |
35941 |
struct vm_area_struct *new; |
35942 |
int err = -ENOMEM; |
35943 |
|
35944 |
@@ -55882,7 +53953,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35945 |
/* most fields are the same, copy all, and then fixup */ |
35946 |
*new = *vma; |
35947 |
|
35948 |
-@@ -1989,6 +2318,22 @@ static int __split_vma(struct mm_struct |
35949 |
+@@ -1992,6 +2321,22 @@ static int __split_vma(struct mm_struct |
35950 |
new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); |
35951 |
} |
35952 |
|
35953 |
@@ -55905,7 +53976,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35954 |
pol = mpol_dup(vma_policy(vma)); |
35955 |
if (IS_ERR(pol)) { |
35956 |
err = PTR_ERR(pol); |
35957 |
-@@ -2014,6 +2359,42 @@ static int __split_vma(struct mm_struct |
35958 |
+@@ -2017,6 +2362,42 @@ static int __split_vma(struct mm_struct |
35959 |
else |
35960 |
err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); |
35961 |
|
35962 |
@@ -55948,7 +54019,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35963 |
/* Success. */ |
35964 |
if (!err) |
35965 |
return 0; |
35966 |
-@@ -2026,10 +2407,18 @@ static int __split_vma(struct mm_struct |
35967 |
+@@ -2029,10 +2410,18 @@ static int __split_vma(struct mm_struct |
35968 |
removed_exe_file_vma(mm); |
35969 |
fput(new->vm_file); |
35970 |
} |
35971 |
@@ -55968,7 +54039,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35972 |
kmem_cache_free(vm_area_cachep, new); |
35973 |
out_err: |
35974 |
return err; |
35975 |
-@@ -2042,6 +2431,15 @@ static int __split_vma(struct mm_struct |
35976 |
+@@ -2045,6 +2434,15 @@ static int __split_vma(struct mm_struct |
35977 |
int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, |
35978 |
unsigned long addr, int new_below) |
35979 |
{ |
35980 |
@@ -55984,13 +54055,13 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35981 |
if (mm->map_count >= sysctl_max_map_count) |
35982 |
return -ENOMEM; |
35983 |
|
35984 |
-@@ -2053,11 +2451,30 @@ int split_vma(struct mm_struct *mm, stru |
35985 |
+@@ -2056,11 +2454,30 @@ int split_vma(struct mm_struct *mm, stru |
35986 |
* work. This now handles partial unmappings. |
35987 |
* Jeremy Fitzhardinge <jeremy@××××.org> |
35988 |
*/ |
35989 |
+#ifdef CONFIG_PAX_SEGMEXEC |
35990 |
- int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) |
35991 |
- { |
35992 |
++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) |
35993 |
++{ |
35994 |
+ int ret = __do_munmap(mm, start, len); |
35995 |
+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC)) |
35996 |
+ return ret; |
35997 |
@@ -56000,9 +54071,9 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
35998 |
+ |
35999 |
+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len) |
36000 |
+#else |
36001 |
-+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) |
36002 |
+ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) |
36003 |
+#endif |
36004 |
-+{ |
36005 |
+ { |
36006 |
unsigned long end; |
36007 |
struct vm_area_struct *vma, *prev, *last; |
36008 |
|
36009 |
@@ -56015,7 +54086,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36010 |
if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) |
36011 |
return -EINVAL; |
36012 |
|
36013 |
-@@ -2131,6 +2548,8 @@ int do_munmap(struct mm_struct *mm, unsi |
36014 |
+@@ -2134,6 +2551,8 @@ int do_munmap(struct mm_struct *mm, unsi |
36015 |
/* Fix up all other VM information */ |
36016 |
remove_vma_list(mm, vma); |
36017 |
|
36018 |
@@ -56024,7 +54095,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36019 |
return 0; |
36020 |
} |
36021 |
|
36022 |
-@@ -2143,22 +2562,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a |
36023 |
+@@ -2146,22 +2565,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a |
36024 |
|
36025 |
profile_munmap(addr); |
36026 |
|
36027 |
@@ -56053,7 +54124,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36028 |
/* |
36029 |
* this is really a simplified "do_mmap". it only handles |
36030 |
* anonymous maps. eventually we may be able to do some |
36031 |
-@@ -2172,6 +2587,7 @@ unsigned long do_brk(unsigned long addr, |
36032 |
+@@ -2175,6 +2590,7 @@ unsigned long do_brk(unsigned long addr, |
36033 |
struct rb_node ** rb_link, * rb_parent; |
36034 |
pgoff_t pgoff = addr >> PAGE_SHIFT; |
36035 |
int error; |
36036 |
@@ -56061,7 +54132,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36037 |
|
36038 |
len = PAGE_ALIGN(len); |
36039 |
if (!len) |
36040 |
-@@ -2183,16 +2599,30 @@ unsigned long do_brk(unsigned long addr, |
36041 |
+@@ -2186,16 +2602,30 @@ unsigned long do_brk(unsigned long addr, |
36042 |
|
36043 |
flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; |
36044 |
|
36045 |
@@ -56093,7 +54164,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36046 |
locked += mm->locked_vm; |
36047 |
lock_limit = rlimit(RLIMIT_MEMLOCK); |
36048 |
lock_limit >>= PAGE_SHIFT; |
36049 |
-@@ -2209,22 +2639,22 @@ unsigned long do_brk(unsigned long addr, |
36050 |
+@@ -2212,22 +2642,22 @@ unsigned long do_brk(unsigned long addr, |
36051 |
/* |
36052 |
* Clear old maps. this also does some error checking for us |
36053 |
*/ |
36054 |
@@ -56120,7 +54191,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36055 |
return -ENOMEM; |
36056 |
|
36057 |
/* Can we just expand an old private anonymous mapping? */ |
36058 |
-@@ -2238,7 +2668,7 @@ unsigned long do_brk(unsigned long addr, |
36059 |
+@@ -2241,7 +2671,7 @@ unsigned long do_brk(unsigned long addr, |
36060 |
*/ |
36061 |
vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); |
36062 |
if (!vma) { |
36063 |
@@ -56129,7 +54200,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36064 |
return -ENOMEM; |
36065 |
} |
36066 |
|
36067 |
-@@ -2252,11 +2682,12 @@ unsigned long do_brk(unsigned long addr, |
36068 |
+@@ -2255,11 +2685,12 @@ unsigned long do_brk(unsigned long addr, |
36069 |
vma_link(mm, vma, prev, rb_link, rb_parent); |
36070 |
out: |
36071 |
perf_event_mmap(vma); |
36072 |
@@ -56144,7 +54215,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36073 |
return addr; |
36074 |
} |
36075 |
|
36076 |
-@@ -2303,8 +2734,10 @@ void exit_mmap(struct mm_struct *mm) |
36077 |
+@@ -2306,8 +2737,10 @@ void exit_mmap(struct mm_struct *mm) |
36078 |
* Walk the list again, actually closing and freeing it, |
36079 |
* with preemption enabled, without holding any MM locks. |
36080 |
*/ |
36081 |
@@ -56156,7 +54227,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36082 |
|
36083 |
BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); |
36084 |
} |
36085 |
-@@ -2318,6 +2751,13 @@ int insert_vm_struct(struct mm_struct * |
36086 |
+@@ -2321,6 +2754,13 @@ int insert_vm_struct(struct mm_struct * |
36087 |
struct vm_area_struct * __vma, * prev; |
36088 |
struct rb_node ** rb_link, * rb_parent; |
36089 |
|
36090 |
@@ -56170,7 +54241,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36091 |
/* |
36092 |
* The vm_pgoff of a purely anonymous vma should be irrelevant |
36093 |
* until its first write fault, when page's anon_vma and index |
36094 |
-@@ -2340,7 +2780,22 @@ int insert_vm_struct(struct mm_struct * |
36095 |
+@@ -2343,7 +2783,22 @@ int insert_vm_struct(struct mm_struct * |
36096 |
if ((vma->vm_flags & VM_ACCOUNT) && |
36097 |
security_vm_enough_memory_mm(mm, vma_pages(vma))) |
36098 |
return -ENOMEM; |
36099 |
@@ -56193,7 +54264,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36100 |
return 0; |
36101 |
} |
36102 |
|
36103 |
-@@ -2358,6 +2813,8 @@ struct vm_area_struct *copy_vma(struct v |
36104 |
+@@ -2361,6 +2816,8 @@ struct vm_area_struct *copy_vma(struct v |
36105 |
struct rb_node **rb_link, *rb_parent; |
36106 |
struct mempolicy *pol; |
36107 |
|
36108 |
@@ -56202,7 +54273,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36109 |
/* |
36110 |
* If anonymous vma has not yet been faulted, update new pgoff |
36111 |
* to match new location, to increase its chance of merging. |
36112 |
-@@ -2407,6 +2864,39 @@ struct vm_area_struct *copy_vma(struct v |
36113 |
+@@ -2410,6 +2867,39 @@ struct vm_area_struct *copy_vma(struct v |
36114 |
kmem_cache_free(vm_area_cachep, new_vma); |
36115 |
return NULL; |
36116 |
} |
36117 |
@@ -56242,7 +54313,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36118 |
|
36119 |
/* |
36120 |
* Return true if the calling process may expand its vm space by the passed |
36121 |
-@@ -2418,7 +2908,7 @@ int may_expand_vm(struct mm_struct *mm, |
36122 |
+@@ -2421,7 +2911,7 @@ int may_expand_vm(struct mm_struct *mm, |
36123 |
unsigned long lim; |
36124 |
|
36125 |
lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT; |
36126 |
@@ -56251,7 +54322,7 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36127 |
if (cur + npages > lim) |
36128 |
return 0; |
36129 |
return 1; |
36130 |
-@@ -2489,6 +2979,22 @@ int install_special_mapping(struct mm_st |
36131 |
+@@ -2492,6 +2982,22 @@ int install_special_mapping(struct mm_st |
36132 |
vma->vm_start = addr; |
36133 |
vma->vm_end = addr + len; |
36134 |
|
36135 |
@@ -56274,9 +54345,9 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c |
36136 |
vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; |
36137 |
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); |
36138 |
|
36139 |
-diff -urNp linux-2.6.38.3/mm/mprotect.c linux-2.6.38.3/mm/mprotect.c |
36140 |
---- linux-2.6.38.3/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400 |
36141 |
-+++ linux-2.6.38.3/mm/mprotect.c 2011-04-17 15:57:33.000000000 -0400 |
36142 |
+diff -urNp linux-2.6.38.4/mm/mprotect.c linux-2.6.38.4/mm/mprotect.c |
36143 |
+--- linux-2.6.38.4/mm/mprotect.c 2011-03-14 21:20:32.000000000 -0400 |
36144 |
++++ linux-2.6.38.4/mm/mprotect.c 2011-04-17 15:57:33.000000000 -0400 |
36145 |
@@ -23,10 +23,16 @@ |
36146 |
#include <linux/mmu_notifier.h> |
36147 |
#include <linux/migrate.h> |
36148 |
@@ -56503,9 +54574,9 @@ diff -urNp linux-2.6.38.3/mm/mprotect.c linux-2.6.38.3/mm/mprotect.c |
36149 |
nstart = tmp; |
36150 |
|
36151 |
if (nstart < prev->vm_end) |
36152 |
-diff -urNp linux-2.6.38.3/mm/mremap.c linux-2.6.38.3/mm/mremap.c |
36153 |
---- linux-2.6.38.3/mm/mremap.c 2011-04-18 17:27:18.000000000 -0400 |
36154 |
-+++ linux-2.6.38.3/mm/mremap.c 2011-04-17 16:53:48.000000000 -0400 |
36155 |
+diff -urNp linux-2.6.38.4/mm/mremap.c linux-2.6.38.4/mm/mremap.c |
36156 |
+--- linux-2.6.38.4/mm/mremap.c 2011-04-18 17:27:18.000000000 -0400 |
36157 |
++++ linux-2.6.38.4/mm/mremap.c 2011-04-17 16:53:48.000000000 -0400 |
36158 |
@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str |
36159 |
continue; |
36160 |
pte = ptep_clear_flush(vma, old_addr, old_pte); |
36161 |
@@ -56610,9 +54681,9 @@ diff -urNp linux-2.6.38.3/mm/mremap.c linux-2.6.38.3/mm/mremap.c |
36162 |
} |
36163 |
out: |
36164 |
if (ret & ~PAGE_MASK) |
36165 |
-diff -urNp linux-2.6.38.3/mm/nommu.c linux-2.6.38.3/mm/nommu.c |
36166 |
---- linux-2.6.38.3/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400 |
36167 |
-+++ linux-2.6.38.3/mm/nommu.c 2011-04-17 15:57:33.000000000 -0400 |
36168 |
+diff -urNp linux-2.6.38.4/mm/nommu.c linux-2.6.38.4/mm/nommu.c |
36169 |
+--- linux-2.6.38.4/mm/nommu.c 2011-03-14 21:20:32.000000000 -0400 |
36170 |
++++ linux-2.6.38.4/mm/nommu.c 2011-04-17 15:57:33.000000000 -0400 |
36171 |
@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI |
36172 |
int sysctl_overcommit_ratio = 50; /* default is 50% */ |
36173 |
int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; |
36174 |
@@ -56645,9 +54716,9 @@ diff -urNp linux-2.6.38.3/mm/nommu.c linux-2.6.38.3/mm/nommu.c |
36175 |
*region = *vma->vm_region; |
36176 |
new->vm_region = region; |
36177 |
|
36178 |
-diff -urNp linux-2.6.38.3/mm/page_alloc.c linux-2.6.38.3/mm/page_alloc.c |
36179 |
---- linux-2.6.38.3/mm/page_alloc.c 2011-04-18 17:27:16.000000000 -0400 |
36180 |
-+++ linux-2.6.38.3/mm/page_alloc.c 2011-04-17 15:57:33.000000000 -0400 |
36181 |
+diff -urNp linux-2.6.38.4/mm/page_alloc.c linux-2.6.38.4/mm/page_alloc.c |
36182 |
+--- linux-2.6.38.4/mm/page_alloc.c 2011-04-18 17:27:16.000000000 -0400 |
36183 |
++++ linux-2.6.38.4/mm/page_alloc.c 2011-04-17 15:57:33.000000000 -0400 |
36184 |
@@ -644,6 +644,10 @@ static bool free_pages_prepare(struct pa |
36185 |
int i; |
36186 |
int bad = 0; |
36187 |
@@ -56683,9 +54754,9 @@ diff -urNp linux-2.6.38.3/mm/page_alloc.c linux-2.6.38.3/mm/page_alloc.c |
36188 |
|
36189 |
if (order && (gfp_flags & __GFP_COMP)) |
36190 |
prep_compound_page(page, order); |
36191 |
-diff -urNp linux-2.6.38.3/mm/percpu.c linux-2.6.38.3/mm/percpu.c |
36192 |
---- linux-2.6.38.3/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400 |
36193 |
-+++ linux-2.6.38.3/mm/percpu.c 2011-04-17 15:57:33.000000000 -0400 |
36194 |
+diff -urNp linux-2.6.38.4/mm/percpu.c linux-2.6.38.4/mm/percpu.c |
36195 |
+--- linux-2.6.38.4/mm/percpu.c 2011-03-14 21:20:32.000000000 -0400 |
36196 |
++++ linux-2.6.38.4/mm/percpu.c 2011-04-17 15:57:33.000000000 -0400 |
36197 |
@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu |
36198 |
static unsigned int pcpu_last_unit_cpu __read_mostly; |
36199 |
|
36200 |
@@ -56695,9 +54766,9 @@ diff -urNp linux-2.6.38.3/mm/percpu.c linux-2.6.38.3/mm/percpu.c |
36201 |
EXPORT_SYMBOL_GPL(pcpu_base_addr); |
36202 |
|
36203 |
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ |
36204 |
-diff -urNp linux-2.6.38.3/mm/rmap.c linux-2.6.38.3/mm/rmap.c |
36205 |
---- linux-2.6.38.3/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400 |
36206 |
-+++ linux-2.6.38.3/mm/rmap.c 2011-04-17 15:57:33.000000000 -0400 |
36207 |
+diff -urNp linux-2.6.38.4/mm/rmap.c linux-2.6.38.4/mm/rmap.c |
36208 |
+--- linux-2.6.38.4/mm/rmap.c 2011-03-14 21:20:32.000000000 -0400 |
36209 |
++++ linux-2.6.38.4/mm/rmap.c 2011-04-17 15:57:33.000000000 -0400 |
36210 |
@@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru |
36211 |
struct anon_vma *anon_vma = vma->anon_vma; |
36212 |
struct anon_vma_chain *avc; |
36213 |
@@ -56787,9 +54858,9 @@ diff -urNp linux-2.6.38.3/mm/rmap.c linux-2.6.38.3/mm/rmap.c |
36214 |
{ |
36215 |
struct anon_vma_chain *avc; |
36216 |
struct anon_vma *anon_vma; |
36217 |
-diff -urNp linux-2.6.38.3/mm/shmem.c linux-2.6.38.3/mm/shmem.c |
36218 |
---- linux-2.6.38.3/mm/shmem.c 2011-04-18 17:27:16.000000000 -0400 |
36219 |
-+++ linux-2.6.38.3/mm/shmem.c 2011-04-18 22:03:12.000000000 -0400 |
36220 |
+diff -urNp linux-2.6.38.4/mm/shmem.c linux-2.6.38.4/mm/shmem.c |
36221 |
+--- linux-2.6.38.4/mm/shmem.c 2011-04-18 17:27:16.000000000 -0400 |
36222 |
++++ linux-2.6.38.4/mm/shmem.c 2011-04-18 22:03:12.000000000 -0400 |
36223 |
@@ -31,7 +31,7 @@ |
36224 |
#include <linux/percpu_counter.h> |
36225 |
#include <linux/swap.h> |
36226 |
@@ -56817,9 +54888,9 @@ diff -urNp linux-2.6.38.3/mm/shmem.c linux-2.6.38.3/mm/shmem.c |
36227 |
/* do it inline */ |
36228 |
memcpy(info, symname, len); |
36229 |
inode->i_op = &shmem_symlink_inline_operations; |
36230 |
-diff -urNp linux-2.6.38.3/mm/slab.c linux-2.6.38.3/mm/slab.c |
36231 |
---- linux-2.6.38.3/mm/slab.c 2011-04-18 17:27:16.000000000 -0400 |
36232 |
-+++ linux-2.6.38.3/mm/slab.c 2011-04-18 22:03:34.000000000 -0400 |
36233 |
+diff -urNp linux-2.6.38.4/mm/slab.c linux-2.6.38.4/mm/slab.c |
36234 |
+--- linux-2.6.38.4/mm/slab.c 2011-04-18 17:27:16.000000000 -0400 |
36235 |
++++ linux-2.6.38.4/mm/slab.c 2011-04-23 12:47:28.000000000 -0400 |
36236 |
@@ -150,7 +150,7 @@ |
36237 |
|
36238 |
/* Legal flag mask for kmem_cache_create(). */ |
36239 |
@@ -56856,24 +54927,15 @@ diff -urNp linux-2.6.38.3/mm/slab.c linux-2.6.38.3/mm/slab.c |
36240 |
{ |
36241 |
u32 offset = (obj - slab->s_mem); |
36242 |
return reciprocal_divide(offset, cache->reciprocal_buffer_size); |
36243 |
-@@ -560,14 +560,14 @@ struct cache_names { |
36244 |
+@@ -560,7 +560,7 @@ struct cache_names { |
36245 |
static struct cache_names __initdata cache_names[] = { |
36246 |
#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" }, |
36247 |
#include <linux/kmalloc_sizes.h> |
36248 |
- {NULL,} |
36249 |
-+ {NULL, NULL} |
36250 |
++ {NULL} |
36251 |
#undef CACHE |
36252 |
}; |
36253 |
|
36254 |
- static struct arraycache_init initarray_cache __initdata = |
36255 |
-- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; |
36256 |
-+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; |
36257 |
- static struct arraycache_init initarray_generic = |
36258 |
-- { {0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; |
36259 |
-+ { {0, BOOT_CPUCACHE_ENTRIES, 1, 0}, {NULL} }; |
36260 |
- |
36261 |
- /* internal cache of cache description objs */ |
36262 |
- static struct kmem_cache cache_cache = { |
36263 |
@@ -1526,7 +1526,7 @@ void __init kmem_cache_init(void) |
36264 |
sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name, |
36265 |
sizes[INDEX_AC].cs_size, |
36266 |
@@ -56970,9 +55032,9 @@ diff -urNp linux-2.6.38.3/mm/slab.c linux-2.6.38.3/mm/slab.c |
36267 |
/** |
36268 |
* ksize - get the actual amount of memory allocated for a given object |
36269 |
* @objp: Pointer to the object |
36270 |
-diff -urNp linux-2.6.38.3/mm/slob.c linux-2.6.38.3/mm/slob.c |
36271 |
---- linux-2.6.38.3/mm/slob.c 2011-03-14 21:20:32.000000000 -0400 |
36272 |
-+++ linux-2.6.38.3/mm/slob.c 2011-04-17 15:57:33.000000000 -0400 |
36273 |
+diff -urNp linux-2.6.38.4/mm/slob.c linux-2.6.38.4/mm/slob.c |
36274 |
+--- linux-2.6.38.4/mm/slob.c 2011-03-14 21:20:32.000000000 -0400 |
36275 |
++++ linux-2.6.38.4/mm/slob.c 2011-04-17 15:57:33.000000000 -0400 |
36276 |
@@ -29,7 +29,7 @@ |
36277 |
* If kmalloc is asked for objects of PAGE_SIZE or larger, it calls |
36278 |
* alloc_pages() directly, allocating compound pages so the page order |
36279 |
@@ -57289,9 +55351,9 @@ diff -urNp linux-2.6.38.3/mm/slob.c linux-2.6.38.3/mm/slob.c |
36280 |
} |
36281 |
|
36282 |
trace_kmem_cache_free(_RET_IP_, b); |
36283 |
-diff -urNp linux-2.6.38.3/mm/slub.c linux-2.6.38.3/mm/slub.c |
36284 |
---- linux-2.6.38.3/mm/slub.c 2011-03-14 21:20:32.000000000 -0400 |
36285 |
-+++ linux-2.6.38.3/mm/slub.c 2011-04-17 15:57:33.000000000 -0400 |
36286 |
+diff -urNp linux-2.6.38.4/mm/slub.c linux-2.6.38.4/mm/slub.c |
36287 |
+--- linux-2.6.38.4/mm/slub.c 2011-03-14 21:20:32.000000000 -0400 |
36288 |
++++ linux-2.6.38.4/mm/slub.c 2011-04-17 15:57:33.000000000 -0400 |
36289 |
@@ -390,7 +390,7 @@ static void print_track(const char *s, s |
36290 |
if (!t->addr) |
36291 |
return; |
36292 |
@@ -57466,9 +55528,9 @@ diff -urNp linux-2.6.38.3/mm/slub.c linux-2.6.38.3/mm/slub.c |
36293 |
return 0; |
36294 |
} |
36295 |
module_init(slab_proc_init); |
36296 |
-diff -urNp linux-2.6.38.3/mm/util.c linux-2.6.38.3/mm/util.c |
36297 |
---- linux-2.6.38.3/mm/util.c 2011-03-14 21:20:32.000000000 -0400 |
36298 |
-+++ linux-2.6.38.3/mm/util.c 2011-04-17 15:57:33.000000000 -0400 |
36299 |
+diff -urNp linux-2.6.38.4/mm/util.c linux-2.6.38.4/mm/util.c |
36300 |
+--- linux-2.6.38.4/mm/util.c 2011-03-14 21:20:32.000000000 -0400 |
36301 |
++++ linux-2.6.38.4/mm/util.c 2011-04-17 15:57:33.000000000 -0400 |
36302 |
@@ -219,6 +219,12 @@ EXPORT_SYMBOL(strndup_user); |
36303 |
void arch_pick_mmap_layout(struct mm_struct *mm) |
36304 |
{ |
36305 |
@@ -57482,9 +55544,9 @@ diff -urNp linux-2.6.38.3/mm/util.c linux-2.6.38.3/mm/util.c |
36306 |
mm->get_unmapped_area = arch_get_unmapped_area; |
36307 |
mm->unmap_area = arch_unmap_area; |
36308 |
} |
36309 |
-diff -urNp linux-2.6.38.3/mm/vmalloc.c linux-2.6.38.3/mm/vmalloc.c |
36310 |
---- linux-2.6.38.3/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400 |
36311 |
-+++ linux-2.6.38.3/mm/vmalloc.c 2011-04-17 15:57:33.000000000 -0400 |
36312 |
+diff -urNp linux-2.6.38.4/mm/vmalloc.c linux-2.6.38.4/mm/vmalloc.c |
36313 |
+--- linux-2.6.38.4/mm/vmalloc.c 2011-03-14 21:20:32.000000000 -0400 |
36314 |
++++ linux-2.6.38.4/mm/vmalloc.c 2011-04-17 15:57:33.000000000 -0400 |
36315 |
@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, |
36316 |
|
36317 |
pte = pte_offset_kernel(pmd, addr); |
36318 |
@@ -57717,9 +55779,9 @@ diff -urNp linux-2.6.38.3/mm/vmalloc.c linux-2.6.38.3/mm/vmalloc.c |
36319 |
if ((PAGE_SIZE-1) & (unsigned long)addr) |
36320 |
return -EINVAL; |
36321 |
|
36322 |
-diff -urNp linux-2.6.38.3/mm/vmstat.c linux-2.6.38.3/mm/vmstat.c |
36323 |
---- linux-2.6.38.3/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400 |
36324 |
-+++ linux-2.6.38.3/mm/vmstat.c 2011-04-17 15:57:33.000000000 -0400 |
36325 |
+diff -urNp linux-2.6.38.4/mm/vmstat.c linux-2.6.38.4/mm/vmstat.c |
36326 |
+--- linux-2.6.38.4/mm/vmstat.c 2011-03-14 21:20:32.000000000 -0400 |
36327 |
++++ linux-2.6.38.4/mm/vmstat.c 2011-04-17 15:57:33.000000000 -0400 |
36328 |
@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu) |
36329 |
* |
36330 |
* vm_stat contains the global counters |
36331 |
@@ -57772,9 +55834,9 @@ diff -urNp linux-2.6.38.3/mm/vmstat.c linux-2.6.38.3/mm/vmstat.c |
36332 |
#endif |
36333 |
return 0; |
36334 |
} |
36335 |
-diff -urNp linux-2.6.38.3/net/8021q/vlan.c linux-2.6.38.3/net/8021q/vlan.c |
36336 |
---- linux-2.6.38.3/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400 |
36337 |
-+++ linux-2.6.38.3/net/8021q/vlan.c 2011-04-17 15:57:33.000000000 -0400 |
36338 |
+diff -urNp linux-2.6.38.4/net/8021q/vlan.c linux-2.6.38.4/net/8021q/vlan.c |
36339 |
+--- linux-2.6.38.4/net/8021q/vlan.c 2011-03-14 21:20:32.000000000 -0400 |
36340 |
++++ linux-2.6.38.4/net/8021q/vlan.c 2011-04-17 15:57:33.000000000 -0400 |
36341 |
@@ -589,8 +589,7 @@ static int vlan_ioctl_handler(struct net |
36342 |
err = -EPERM; |
36343 |
if (!capable(CAP_NET_ADMIN)) |
36344 |
@@ -57785,9 +55847,9 @@ diff -urNp linux-2.6.38.3/net/8021q/vlan.c linux-2.6.38.3/net/8021q/vlan.c |
36345 |
struct vlan_net *vn; |
36346 |
|
36347 |
vn = net_generic(net, vlan_net_id); |
36348 |
-diff -urNp linux-2.6.38.3/net/atm/atm_misc.c linux-2.6.38.3/net/atm/atm_misc.c |
36349 |
---- linux-2.6.38.3/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -0400 |
36350 |
-+++ linux-2.6.38.3/net/atm/atm_misc.c 2011-04-17 15:57:33.000000000 -0400 |
36351 |
+diff -urNp linux-2.6.38.4/net/atm/atm_misc.c linux-2.6.38.4/net/atm/atm_misc.c |
36352 |
+--- linux-2.6.38.4/net/atm/atm_misc.c 2011-03-14 21:20:32.000000000 -0400 |
36353 |
++++ linux-2.6.38.4/net/atm/atm_misc.c 2011-04-17 15:57:33.000000000 -0400 |
36354 |
@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int |
36355 |
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) |
36356 |
return 1; |
36357 |
@@ -57824,9 +55886,9 @@ diff -urNp linux-2.6.38.3/net/atm/atm_misc.c linux-2.6.38.3/net/atm/atm_misc.c |
36358 |
__SONET_ITEMS |
36359 |
#undef __HANDLE_ITEM |
36360 |
} |
36361 |
-diff -urNp linux-2.6.38.3/net/atm/proc.c linux-2.6.38.3/net/atm/proc.c |
36362 |
---- linux-2.6.38.3/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400 |
36363 |
-+++ linux-2.6.38.3/net/atm/proc.c 2011-04-17 15:57:33.000000000 -0400 |
36364 |
+diff -urNp linux-2.6.38.4/net/atm/proc.c linux-2.6.38.4/net/atm/proc.c |
36365 |
+--- linux-2.6.38.4/net/atm/proc.c 2011-03-14 21:20:32.000000000 -0400 |
36366 |
++++ linux-2.6.38.4/net/atm/proc.c 2011-04-17 15:57:33.000000000 -0400 |
36367 |
@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s |
36368 |
const struct k_atm_aal_stats *stats) |
36369 |
{ |
36370 |
@@ -57865,9 +55927,9 @@ diff -urNp linux-2.6.38.3/net/atm/proc.c linux-2.6.38.3/net/atm/proc.c |
36371 |
else |
36372 |
seq_printf(seq, "%3d %3d %5d ", |
36373 |
vcc->dev->number, vcc->vpi, vcc->vci); |
36374 |
-diff -urNp linux-2.6.38.3/net/atm/resources.c linux-2.6.38.3/net/atm/resources.c |
36375 |
---- linux-2.6.38.3/net/atm/resources.c 2011-03-14 21:20:32.000000000 -0400 |
36376 |
-+++ linux-2.6.38.3/net/atm/resources.c 2011-04-17 15:57:33.000000000 -0400 |
36377 |
+diff -urNp linux-2.6.38.4/net/atm/resources.c linux-2.6.38.4/net/atm/resources.c |
36378 |
+--- linux-2.6.38.4/net/atm/resources.c 2011-03-14 21:20:32.000000000 -0400 |
36379 |
++++ linux-2.6.38.4/net/atm/resources.c 2011-04-17 15:57:33.000000000 -0400 |
36380 |
@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister); |
36381 |
static void copy_aal_stats(struct k_atm_aal_stats *from, |
36382 |
struct atm_aal_stats *to) |
36383 |
@@ -57886,9 +55948,9 @@ diff -urNp linux-2.6.38.3/net/atm/resources.c linux-2.6.38.3/net/atm/resources.c |
36384 |
__AAL_STAT_ITEMS |
36385 |
#undef __HANDLE_ITEM |
36386 |
} |
36387 |
-diff -urNp linux-2.6.38.3/net/bridge/br_multicast.c linux-2.6.38.3/net/bridge/br_multicast.c |
36388 |
---- linux-2.6.38.3/net/bridge/br_multicast.c 2011-03-14 21:20:32.000000000 -0400 |
36389 |
-+++ linux-2.6.38.3/net/bridge/br_multicast.c 2011-04-17 15:57:33.000000000 -0400 |
36390 |
+diff -urNp linux-2.6.38.4/net/bridge/br_multicast.c linux-2.6.38.4/net/bridge/br_multicast.c |
36391 |
+--- linux-2.6.38.4/net/bridge/br_multicast.c 2011-04-22 19:20:59.000000000 -0400 |
36392 |
++++ linux-2.6.38.4/net/bridge/br_multicast.c 2011-04-22 19:21:47.000000000 -0400 |
36393 |
@@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct |
36394 |
nexthdr = ip6h->nexthdr; |
36395 |
offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr); |
36396 |
@@ -57898,9 +55960,9 @@ diff -urNp linux-2.6.38.3/net/bridge/br_multicast.c linux-2.6.38.3/net/bridge/br |
36397 |
return 0; |
36398 |
|
36399 |
/* Okay, we found ICMPv6 header */ |
36400 |
-diff -urNp linux-2.6.38.3/net/bridge/netfilter/ebtables.c linux-2.6.38.3/net/bridge/netfilter/ebtables.c |
36401 |
---- linux-2.6.38.3/net/bridge/netfilter/ebtables.c 2011-04-18 17:27:18.000000000 -0400 |
36402 |
-+++ linux-2.6.38.3/net/bridge/netfilter/ebtables.c 2011-04-17 17:00:29.000000000 -0400 |
36403 |
+diff -urNp linux-2.6.38.4/net/bridge/netfilter/ebtables.c linux-2.6.38.4/net/bridge/netfilter/ebtables.c |
36404 |
+--- linux-2.6.38.4/net/bridge/netfilter/ebtables.c 2011-04-18 17:27:18.000000000 -0400 |
36405 |
++++ linux-2.6.38.4/net/bridge/netfilter/ebtables.c 2011-04-17 17:00:29.000000000 -0400 |
36406 |
@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s |
36407 |
tmp.valid_hooks = t->table->valid_hooks; |
36408 |
} |
36409 |
@@ -57910,9 +55972,9 @@ diff -urNp linux-2.6.38.3/net/bridge/netfilter/ebtables.c linux-2.6.38.3/net/bri |
36410 |
BUGPRINT("c2u Didn't work\n"); |
36411 |
ret = -EFAULT; |
36412 |
break; |
36413 |
-diff -urNp linux-2.6.38.3/net/can/bcm.c linux-2.6.38.3/net/can/bcm.c |
36414 |
---- linux-2.6.38.3/net/can/bcm.c 2011-03-14 21:20:32.000000000 -0400 |
36415 |
-+++ linux-2.6.38.3/net/can/bcm.c 2011-04-17 15:57:33.000000000 -0400 |
36416 |
+diff -urNp linux-2.6.38.4/net/can/bcm.c linux-2.6.38.4/net/can/bcm.c |
36417 |
+--- linux-2.6.38.4/net/can/bcm.c 2011-03-14 21:20:32.000000000 -0400 |
36418 |
++++ linux-2.6.38.4/net/can/bcm.c 2011-04-17 15:57:33.000000000 -0400 |
36419 |
@@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file |
36420 |
struct bcm_sock *bo = bcm_sk(sk); |
36421 |
struct bcm_op *op; |
36422 |
@@ -57929,9 +55991,26 @@ diff -urNp linux-2.6.38.3/net/can/bcm.c linux-2.6.38.3/net/can/bcm.c |
36423 |
seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs); |
36424 |
seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex)); |
36425 |
seq_printf(m, " <<<\n"); |
36426 |
-diff -urNp linux-2.6.38.3/net/core/dev.c linux-2.6.38.3/net/core/dev.c |
36427 |
---- linux-2.6.38.3/net/core/dev.c 2011-03-14 21:20:32.000000000 -0400 |
36428 |
-+++ linux-2.6.38.3/net/core/dev.c 2011-04-17 15:57:33.000000000 -0400 |
36429 |
+diff -urNp linux-2.6.38.4/net/can/raw.c linux-2.6.38.4/net/can/raw.c |
36430 |
+--- linux-2.6.38.4/net/can/raw.c 2011-03-14 21:20:32.000000000 -0400 |
36431 |
++++ linux-2.6.38.4/net/can/raw.c 2011-04-22 19:39:11.000000000 -0400 |
36432 |
+@@ -305,7 +305,12 @@ static int raw_init(struct sock *sk) |
36433 |
+ static int raw_release(struct socket *sock) |
36434 |
+ { |
36435 |
+ struct sock *sk = sock->sk; |
36436 |
+- struct raw_sock *ro = raw_sk(sk); |
36437 |
++ struct raw_sock *ro; |
36438 |
++ |
36439 |
++ if (!sk) |
36440 |
++ return 0; |
36441 |
++ |
36442 |
++ ro = raw_sk(sk); |
36443 |
+ |
36444 |
+ unregister_netdevice_notifier(&ro->notifier); |
36445 |
+ |
36446 |
+diff -urNp linux-2.6.38.4/net/core/dev.c linux-2.6.38.4/net/core/dev.c |
36447 |
+--- linux-2.6.38.4/net/core/dev.c 2011-03-14 21:20:32.000000000 -0400 |
36448 |
++++ linux-2.6.38.4/net/core/dev.c 2011-04-17 15:57:33.000000000 -0400 |
36449 |
@@ -1124,10 +1124,14 @@ void dev_load(struct net *net, const cha |
36450 |
if (no_module && capable(CAP_NET_ADMIN)) |
36451 |
no_module = request_module("netdev-%s", name); |
36452 |
@@ -57965,9 +56044,9 @@ diff -urNp linux-2.6.38.3/net/core/dev.c linux-2.6.38.3/net/core/dev.c |
36453 |
{ |
36454 |
struct softnet_data *sd = &__get_cpu_var(softnet_data); |
36455 |
unsigned long time_limit = jiffies + 2; |
36456 |
-diff -urNp linux-2.6.38.3/net/core/sock.c linux-2.6.38.3/net/core/sock.c |
36457 |
---- linux-2.6.38.3/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400 |
36458 |
-+++ linux-2.6.38.3/net/core/sock.c 2011-04-17 15:57:33.000000000 -0400 |
36459 |
+diff -urNp linux-2.6.38.4/net/core/sock.c linux-2.6.38.4/net/core/sock.c |
36460 |
+--- linux-2.6.38.4/net/core/sock.c 2011-03-14 21:20:32.000000000 -0400 |
36461 |
++++ linux-2.6.38.4/net/core/sock.c 2011-04-17 15:57:33.000000000 -0400 |
36462 |
@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock, |
36463 |
return -ENOTCONN; |
36464 |
if (lv < len) |
36465 |
@@ -57986,37 +56065,9 @@ diff -urNp linux-2.6.38.3/net/core/sock.c linux-2.6.38.3/net/core/sock.c |
36466 |
return -EFAULT; |
36467 |
lenout: |
36468 |
if (put_user(len, optlen)) |
36469 |
-diff -urNp linux-2.6.38.3/net/dccp/ccids/ccid3.c linux-2.6.38.3/net/dccp/ccids/ccid3.c |
36470 |
---- linux-2.6.38.3/net/dccp/ccids/ccid3.c 2011-03-14 21:20:32.000000000 -0400 |
36471 |
-+++ linux-2.6.38.3/net/dccp/ccids/ccid3.c 2011-04-17 15:57:33.000000000 -0400 |
36472 |
-@@ -41,7 +41,7 @@ |
36473 |
- static int ccid3_debug; |
36474 |
- #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) |
36475 |
- #else |
36476 |
--#define ccid3_pr_debug(format, a...) |
36477 |
-+#define ccid3_pr_debug(format, a...) do {} while (0) |
36478 |
- #endif |
36479 |
- |
36480 |
- /* |
36481 |
-diff -urNp linux-2.6.38.3/net/dccp/dccp.h linux-2.6.38.3/net/dccp/dccp.h |
36482 |
---- linux-2.6.38.3/net/dccp/dccp.h 2011-03-14 21:20:32.000000000 -0400 |
36483 |
-+++ linux-2.6.38.3/net/dccp/dccp.h 2011-04-17 15:57:33.000000000 -0400 |
36484 |
-@@ -44,9 +44,9 @@ extern int dccp_debug; |
36485 |
- #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) |
36486 |
- #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) |
36487 |
- #else |
36488 |
--#define dccp_pr_debug(format, a...) |
36489 |
--#define dccp_pr_debug_cat(format, a...) |
36490 |
--#define dccp_debug(format, a...) |
36491 |
-+#define dccp_pr_debug(format, a...) do {} while (0) |
36492 |
-+#define dccp_pr_debug_cat(format, a...) do {} while (0) |
36493 |
-+#define dccp_debug(format, a...) do {} while (0) |
36494 |
- #endif |
36495 |
- |
36496 |
- extern struct inet_hashinfo dccp_hashinfo; |
36497 |
-diff -urNp linux-2.6.38.3/net/decnet/sysctl_net_decnet.c linux-2.6.38.3/net/decnet/sysctl_net_decnet.c |
36498 |
---- linux-2.6.38.3/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.000000000 -0400 |
36499 |
-+++ linux-2.6.38.3/net/decnet/sysctl_net_decnet.c 2011-04-17 15:57:33.000000000 -0400 |
36500 |
+diff -urNp linux-2.6.38.4/net/decnet/sysctl_net_decnet.c linux-2.6.38.4/net/decnet/sysctl_net_decnet.c |
36501 |
+--- linux-2.6.38.4/net/decnet/sysctl_net_decnet.c 2011-03-14 21:20:32.000000000 -0400 |
36502 |
++++ linux-2.6.38.4/net/decnet/sysctl_net_decnet.c 2011-04-17 15:57:33.000000000 -0400 |
36503 |
@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t |
36504 |
|
36505 |
if (len > *lenp) len = *lenp; |
36506 |
@@ -58035,9 +56086,9 @@ diff -urNp linux-2.6.38.3/net/decnet/sysctl_net_decnet.c linux-2.6.38.3/net/decn |
36507 |
return -EFAULT; |
36508 |
|
36509 |
*lenp = len; |
36510 |
-diff -urNp linux-2.6.38.3/net/econet/Kconfig linux-2.6.38.3/net/econet/Kconfig |
36511 |
---- linux-2.6.38.3/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
36512 |
-+++ linux-2.6.38.3/net/econet/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
36513 |
+diff -urNp linux-2.6.38.4/net/econet/Kconfig linux-2.6.38.4/net/econet/Kconfig |
36514 |
+--- linux-2.6.38.4/net/econet/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
36515 |
++++ linux-2.6.38.4/net/econet/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
36516 |
@@ -4,7 +4,7 @@ |
36517 |
|
36518 |
config ECONET |
36519 |
@@ -58047,9 +56098,9 @@ diff -urNp linux-2.6.38.3/net/econet/Kconfig linux-2.6.38.3/net/econet/Kconfig |
36520 |
---help--- |
36521 |
Econet is a fairly old and slow networking protocol mainly used by |
36522 |
Acorn computers to access file and print servers. It uses native |
36523 |
-diff -urNp linux-2.6.38.3/net/ipv4/inet_diag.c linux-2.6.38.3/net/ipv4/inet_diag.c |
36524 |
---- linux-2.6.38.3/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0400 |
36525 |
-+++ linux-2.6.38.3/net/ipv4/inet_diag.c 2011-04-17 15:57:33.000000000 -0400 |
36526 |
+diff -urNp linux-2.6.38.4/net/ipv4/inet_diag.c linux-2.6.38.4/net/ipv4/inet_diag.c |
36527 |
+--- linux-2.6.38.4/net/ipv4/inet_diag.c 2011-03-14 21:20:32.000000000 -0400 |
36528 |
++++ linux-2.6.38.4/net/ipv4/inet_diag.c 2011-04-17 15:57:33.000000000 -0400 |
36529 |
@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc |
36530 |
r->idiag_retrans = 0; |
36531 |
|
36532 |
@@ -58111,9 +56162,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/inet_diag.c linux-2.6.38.3/net/ipv4/inet_diag |
36533 |
|
36534 |
tmo = req->expires - jiffies; |
36535 |
if (tmo < 0) |
36536 |
-diff -urNp linux-2.6.38.3/net/ipv4/inet_hashtables.c linux-2.6.38.3/net/ipv4/inet_hashtables.c |
36537 |
---- linux-2.6.38.3/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000000 -0400 |
36538 |
-+++ linux-2.6.38.3/net/ipv4/inet_hashtables.c 2011-04-17 15:57:33.000000000 -0400 |
36539 |
+diff -urNp linux-2.6.38.4/net/ipv4/inet_hashtables.c linux-2.6.38.4/net/ipv4/inet_hashtables.c |
36540 |
+--- linux-2.6.38.4/net/ipv4/inet_hashtables.c 2011-03-14 21:20:32.000000000 -0400 |
36541 |
++++ linux-2.6.38.4/net/ipv4/inet_hashtables.c 2011-04-17 15:57:33.000000000 -0400 |
36542 |
@@ -18,11 +18,14 @@ |
36543 |
#include <linux/sched.h> |
36544 |
#include <linux/slab.h> |
36545 |
@@ -58138,9 +56189,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/inet_hashtables.c linux-2.6.38.3/net/ipv4/ine |
36546 |
if (tw) { |
36547 |
inet_twsk_deschedule(tw, death_row); |
36548 |
while (twrefcnt) { |
36549 |
-diff -urNp linux-2.6.38.3/net/ipv4/inetpeer.c linux-2.6.38.3/net/ipv4/inetpeer.c |
36550 |
---- linux-2.6.38.3/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -0400 |
36551 |
-+++ linux-2.6.38.3/net/ipv4/inetpeer.c 2011-04-17 15:57:33.000000000 -0400 |
36552 |
+diff -urNp linux-2.6.38.4/net/ipv4/inetpeer.c linux-2.6.38.4/net/ipv4/inetpeer.c |
36553 |
+--- linux-2.6.38.4/net/ipv4/inetpeer.c 2011-03-14 21:20:32.000000000 -0400 |
36554 |
++++ linux-2.6.38.4/net/ipv4/inetpeer.c 2011-04-17 15:57:33.000000000 -0400 |
36555 |
@@ -509,8 +509,8 @@ struct inet_peer *inet_getpeer(struct in |
36556 |
if (p) { |
36557 |
p->daddr = *daddr; |
36558 |
@@ -58152,9 +56203,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/inetpeer.c linux-2.6.38.3/net/ipv4/inetpeer.c |
36559 |
p->tcp_ts_stamp = 0; |
36560 |
INIT_LIST_HEAD(&p->unused); |
36561 |
|
36562 |
-diff -urNp linux-2.6.38.3/net/ipv4/ip_fragment.c linux-2.6.38.3/net/ipv4/ip_fragment.c |
36563 |
---- linux-2.6.38.3/net/ipv4/ip_fragment.c 2011-03-14 21:20:32.000000000 -0400 |
36564 |
-+++ linux-2.6.38.3/net/ipv4/ip_fragment.c 2011-04-17 15:57:33.000000000 -0400 |
36565 |
+diff -urNp linux-2.6.38.4/net/ipv4/ip_fragment.c linux-2.6.38.4/net/ipv4/ip_fragment.c |
36566 |
+--- linux-2.6.38.4/net/ipv4/ip_fragment.c 2011-03-14 21:20:32.000000000 -0400 |
36567 |
++++ linux-2.6.38.4/net/ipv4/ip_fragment.c 2011-04-17 15:57:33.000000000 -0400 |
36568 |
@@ -298,7 +298,7 @@ static inline int ip_frag_too_far(struct |
36569 |
return 0; |
36570 |
|
36571 |
@@ -58164,9 +56215,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/ip_fragment.c linux-2.6.38.3/net/ipv4/ip_frag |
36572 |
qp->rid = end; |
36573 |
|
36574 |
rc = qp->q.fragments && (end - start) > max; |
36575 |
-diff -urNp linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c |
36576 |
---- linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:20:32.000000000 -0400 |
36577 |
-+++ linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:57:33.000000000 -0400 |
36578 |
+diff -urNp linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c |
36579 |
+--- linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-14 21:20:32.000000000 -0400 |
36580 |
++++ linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:57:33.000000000 -0400 |
36581 |
@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode( |
36582 |
|
36583 |
*len = 0; |
36584 |
@@ -58176,9 +56227,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.3/ |
36585 |
if (*octets == NULL) { |
36586 |
if (net_ratelimit()) |
36587 |
pr_notice("OOM in bsalg (%d)\n", __LINE__); |
36588 |
-diff -urNp linux-2.6.38.3/net/ipv4/raw.c linux-2.6.38.3/net/ipv4/raw.c |
36589 |
---- linux-2.6.38.3/net/ipv4/raw.c 2011-03-14 21:20:32.000000000 -0400 |
36590 |
-+++ linux-2.6.38.3/net/ipv4/raw.c 2011-04-17 15:57:33.000000000 -0400 |
36591 |
+diff -urNp linux-2.6.38.4/net/ipv4/raw.c linux-2.6.38.4/net/ipv4/raw.c |
36592 |
+--- linux-2.6.38.4/net/ipv4/raw.c 2011-03-14 21:20:32.000000000 -0400 |
36593 |
++++ linux-2.6.38.4/net/ipv4/raw.c 2011-04-17 15:57:33.000000000 -0400 |
36594 |
@@ -724,15 +724,19 @@ static int raw_init(struct sock *sk) |
36595 |
|
36596 |
static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen) |
36597 |
@@ -58211,9 +56262,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/raw.c linux-2.6.38.3/net/ipv4/raw.c |
36598 |
goto out; |
36599 |
ret = 0; |
36600 |
out: return ret; |
36601 |
-diff -urNp linux-2.6.38.3/net/ipv4/route.c linux-2.6.38.3/net/ipv4/route.c |
36602 |
---- linux-2.6.38.3/net/ipv4/route.c 2011-03-14 21:20:32.000000000 -0400 |
36603 |
-+++ linux-2.6.38.3/net/ipv4/route.c 2011-04-17 15:57:33.000000000 -0400 |
36604 |
+diff -urNp linux-2.6.38.4/net/ipv4/route.c linux-2.6.38.4/net/ipv4/route.c |
36605 |
+--- linux-2.6.38.4/net/ipv4/route.c 2011-04-22 19:20:59.000000000 -0400 |
36606 |
++++ linux-2.6.38.4/net/ipv4/route.c 2011-04-22 19:21:47.000000000 -0400 |
36607 |
@@ -2857,7 +2857,7 @@ static int rt_fill_info(struct net *net, |
36608 |
expires = rt->dst.expires ? rt->dst.expires - jiffies : 0; |
36609 |
if (rt->peer) { |
36610 |
@@ -58223,9 +56274,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/route.c linux-2.6.38.3/net/ipv4/route.c |
36611 |
if (rt->peer->tcp_ts_stamp) { |
36612 |
ts = rt->peer->tcp_ts; |
36613 |
tsage = get_seconds() - rt->peer->tcp_ts_stamp; |
36614 |
-diff -urNp linux-2.6.38.3/net/ipv4/tcp_ipv4.c linux-2.6.38.3/net/ipv4/tcp_ipv4.c |
36615 |
---- linux-2.6.38.3/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -0400 |
36616 |
-+++ linux-2.6.38.3/net/ipv4/tcp_ipv4.c 2011-04-17 15:57:33.000000000 -0400 |
36617 |
+diff -urNp linux-2.6.38.4/net/ipv4/tcp_ipv4.c linux-2.6.38.4/net/ipv4/tcp_ipv4.c |
36618 |
+--- linux-2.6.38.4/net/ipv4/tcp_ipv4.c 2011-03-14 21:20:32.000000000 -0400 |
36619 |
++++ linux-2.6.38.4/net/ipv4/tcp_ipv4.c 2011-04-17 15:57:33.000000000 -0400 |
36620 |
@@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly; |
36621 |
int sysctl_tcp_low_latency __read_mostly; |
36622 |
EXPORT_SYMBOL(sysctl_tcp_low_latency); |
36623 |
@@ -58321,9 +56372,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_ipv4.c linux-2.6.38.3/net/ipv4/tcp_ipv4.c |
36624 |
} |
36625 |
|
36626 |
#define TMPSZ 150 |
36627 |
-diff -urNp linux-2.6.38.3/net/ipv4/tcp_minisocks.c linux-2.6.38.3/net/ipv4/tcp_minisocks.c |
36628 |
---- linux-2.6.38.3/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.000000000 -0400 |
36629 |
-+++ linux-2.6.38.3/net/ipv4/tcp_minisocks.c 2011-04-17 15:57:33.000000000 -0400 |
36630 |
+diff -urNp linux-2.6.38.4/net/ipv4/tcp_minisocks.c linux-2.6.38.4/net/ipv4/tcp_minisocks.c |
36631 |
+--- linux-2.6.38.4/net/ipv4/tcp_minisocks.c 2011-03-14 21:20:32.000000000 -0400 |
36632 |
++++ linux-2.6.38.4/net/ipv4/tcp_minisocks.c 2011-04-17 15:57:33.000000000 -0400 |
36633 |
@@ -27,6 +27,10 @@ |
36634 |
#include <net/inet_common.h> |
36635 |
#include <net/xfrm.h> |
36636 |
@@ -58346,9 +56397,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_minisocks.c linux-2.6.38.3/net/ipv4/tcp_m |
36637 |
if (!(flg & TCP_FLAG_RST)) |
36638 |
req->rsk_ops->send_reset(sk, skb); |
36639 |
|
36640 |
-diff -urNp linux-2.6.38.3/net/ipv4/tcp_probe.c linux-2.6.38.3/net/ipv4/tcp_probe.c |
36641 |
---- linux-2.6.38.3/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0400 |
36642 |
-+++ linux-2.6.38.3/net/ipv4/tcp_probe.c 2011-04-17 15:57:33.000000000 -0400 |
36643 |
+diff -urNp linux-2.6.38.4/net/ipv4/tcp_probe.c linux-2.6.38.4/net/ipv4/tcp_probe.c |
36644 |
+--- linux-2.6.38.4/net/ipv4/tcp_probe.c 2011-03-14 21:20:32.000000000 -0400 |
36645 |
++++ linux-2.6.38.4/net/ipv4/tcp_probe.c 2011-04-17 15:57:33.000000000 -0400 |
36646 |
@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file |
36647 |
if (cnt + width >= len) |
36648 |
break; |
36649 |
@@ -58358,9 +56409,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_probe.c linux-2.6.38.3/net/ipv4/tcp_probe |
36650 |
return -EFAULT; |
36651 |
cnt += width; |
36652 |
} |
36653 |
-diff -urNp linux-2.6.38.3/net/ipv4/tcp_timer.c linux-2.6.38.3/net/ipv4/tcp_timer.c |
36654 |
---- linux-2.6.38.3/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0400 |
36655 |
-+++ linux-2.6.38.3/net/ipv4/tcp_timer.c 2011-04-17 15:57:33.000000000 -0400 |
36656 |
+diff -urNp linux-2.6.38.4/net/ipv4/tcp_timer.c linux-2.6.38.4/net/ipv4/tcp_timer.c |
36657 |
+--- linux-2.6.38.4/net/ipv4/tcp_timer.c 2011-03-14 21:20:32.000000000 -0400 |
36658 |
++++ linux-2.6.38.4/net/ipv4/tcp_timer.c 2011-04-17 15:57:33.000000000 -0400 |
36659 |
@@ -22,6 +22,10 @@ |
36660 |
#include <linux/gfp.h> |
36661 |
#include <net/tcp.h> |
36662 |
@@ -58386,9 +56437,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/tcp_timer.c linux-2.6.38.3/net/ipv4/tcp_timer |
36663 |
if (retransmits_timed_out(sk, retry_until, |
36664 |
syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { |
36665 |
/* Has it gone just too far? */ |
36666 |
-diff -urNp linux-2.6.38.3/net/ipv4/udp.c linux-2.6.38.3/net/ipv4/udp.c |
36667 |
---- linux-2.6.38.3/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400 |
36668 |
-+++ linux-2.6.38.3/net/ipv4/udp.c 2011-04-17 15:57:33.000000000 -0400 |
36669 |
+diff -urNp linux-2.6.38.4/net/ipv4/udp.c linux-2.6.38.4/net/ipv4/udp.c |
36670 |
+--- linux-2.6.38.4/net/ipv4/udp.c 2011-03-14 21:20:32.000000000 -0400 |
36671 |
++++ linux-2.6.38.4/net/ipv4/udp.c 2011-04-17 15:57:33.000000000 -0400 |
36672 |
@@ -86,6 +86,7 @@ |
36673 |
#include <linux/types.h> |
36674 |
#include <linux/fcntl.h> |
36675 |
@@ -58472,21 +56523,9 @@ diff -urNp linux-2.6.38.3/net/ipv4/udp.c linux-2.6.38.3/net/ipv4/udp.c |
36676 |
atomic_read(&sp->sk_drops), len); |
36677 |
} |
36678 |
|
36679 |
-diff -urNp linux-2.6.38.3/net/ipv6/exthdrs.c linux-2.6.38.3/net/ipv6/exthdrs.c |
36680 |
---- linux-2.6.38.3/net/ipv6/exthdrs.c 2011-03-14 21:20:32.000000000 -0400 |
36681 |
-+++ linux-2.6.38.3/net/ipv6/exthdrs.c 2011-04-17 15:57:33.000000000 -0400 |
36682 |
-@@ -634,7 +634,7 @@ static struct tlvtype_proc tlvprochopopt |
36683 |
- .type = IPV6_TLV_JUMBO, |
36684 |
- .func = ipv6_hop_jumbo, |
36685 |
- }, |
36686 |
-- { -1, } |
36687 |
-+ { -1, NULL } |
36688 |
- }; |
36689 |
- |
36690 |
- int ipv6_parse_hopopts(struct sk_buff *skb) |
36691 |
-diff -urNp linux-2.6.38.3/net/ipv6/raw.c linux-2.6.38.3/net/ipv6/raw.c |
36692 |
---- linux-2.6.38.3/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400 |
36693 |
-+++ linux-2.6.38.3/net/ipv6/raw.c 2011-04-17 15:57:33.000000000 -0400 |
36694 |
+diff -urNp linux-2.6.38.4/net/ipv6/raw.c linux-2.6.38.4/net/ipv6/raw.c |
36695 |
+--- linux-2.6.38.4/net/ipv6/raw.c 2011-03-14 21:20:32.000000000 -0400 |
36696 |
++++ linux-2.6.38.4/net/ipv6/raw.c 2011-04-17 15:57:33.000000000 -0400 |
36697 |
@@ -602,7 +602,7 @@ out: |
36698 |
return err; |
36699 |
} |
36700 |
@@ -58546,9 +56585,9 @@ diff -urNp linux-2.6.38.3/net/ipv6/raw.c linux-2.6.38.3/net/ipv6/raw.c |
36701 |
} |
36702 |
|
36703 |
static int raw6_seq_show(struct seq_file *seq, void *v) |
36704 |
-diff -urNp linux-2.6.38.3/net/ipv6/tcp_ipv6.c linux-2.6.38.3/net/ipv6/tcp_ipv6.c |
36705 |
---- linux-2.6.38.3/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -0400 |
36706 |
-+++ linux-2.6.38.3/net/ipv6/tcp_ipv6.c 2011-04-17 15:57:33.000000000 -0400 |
36707 |
+diff -urNp linux-2.6.38.4/net/ipv6/tcp_ipv6.c linux-2.6.38.4/net/ipv6/tcp_ipv6.c |
36708 |
+--- linux-2.6.38.4/net/ipv6/tcp_ipv6.c 2011-03-14 21:20:32.000000000 -0400 |
36709 |
++++ linux-2.6.38.4/net/ipv6/tcp_ipv6.c 2011-04-17 15:57:33.000000000 -0400 |
36710 |
@@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 |
36711 |
} |
36712 |
#endif |
36713 |
@@ -58648,9 +56687,9 @@ diff -urNp linux-2.6.38.3/net/ipv6/tcp_ipv6.c linux-2.6.38.3/net/ipv6/tcp_ipv6.c |
36714 |
} |
36715 |
|
36716 |
static int tcp6_seq_show(struct seq_file *seq, void *v) |
36717 |
-diff -urNp linux-2.6.38.3/net/ipv6/udp.c linux-2.6.38.3/net/ipv6/udp.c |
36718 |
---- linux-2.6.38.3/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400 |
36719 |
-+++ linux-2.6.38.3/net/ipv6/udp.c 2011-04-17 15:57:33.000000000 -0400 |
36720 |
+diff -urNp linux-2.6.38.4/net/ipv6/udp.c linux-2.6.38.4/net/ipv6/udp.c |
36721 |
+--- linux-2.6.38.4/net/ipv6/udp.c 2011-03-14 21:20:32.000000000 -0400 |
36722 |
++++ linux-2.6.38.4/net/ipv6/udp.c 2011-04-17 15:57:33.000000000 -0400 |
36723 |
@@ -50,6 +50,10 @@ |
36724 |
#include <linux/seq_file.h> |
36725 |
#include "udp_impl.h" |
36726 |
@@ -58686,9 +56725,9 @@ diff -urNp linux-2.6.38.3/net/ipv6/udp.c linux-2.6.38.3/net/ipv6/udp.c |
36727 |
atomic_read(&sp->sk_drops)); |
36728 |
} |
36729 |
|
36730 |
-diff -urNp linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c |
36731 |
---- linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.000000000 -0400 |
36732 |
-+++ linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:57:33.000000000 -0400 |
36733 |
+diff -urNp linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c |
36734 |
+--- linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c 2011-03-14 21:20:32.000000000 -0400 |
36735 |
++++ linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:57:33.000000000 -0400 |
36736 |
@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st |
36737 |
add_wait_queue(&self->open_wait, &wait); |
36738 |
|
36739 |
@@ -58811,9 +56850,9 @@ diff -urNp linux-2.6.38.3/net/irda/ircomm/ircomm_tty.c linux-2.6.38.3/net/irda/i |
36740 |
seq_printf(m, "Max data size: %d\n", self->max_data_size); |
36741 |
seq_printf(m, "Max header size: %d\n", self->max_header_size); |
36742 |
|
36743 |
-diff -urNp linux-2.6.38.3/net/key/af_key.c linux-2.6.38.3/net/key/af_key.c |
36744 |
---- linux-2.6.38.3/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400 |
36745 |
-+++ linux-2.6.38.3/net/key/af_key.c 2011-04-17 15:57:33.000000000 -0400 |
36746 |
+diff -urNp linux-2.6.38.4/net/key/af_key.c linux-2.6.38.4/net/key/af_key.c |
36747 |
+--- linux-2.6.38.4/net/key/af_key.c 2011-03-14 21:20:32.000000000 -0400 |
36748 |
++++ linux-2.6.38.4/net/key/af_key.c 2011-04-17 15:57:33.000000000 -0400 |
36749 |
@@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil |
36750 |
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); |
36751 |
else |
36752 |
@@ -58826,9 +56865,9 @@ diff -urNp linux-2.6.38.3/net/key/af_key.c linux-2.6.38.3/net/key/af_key.c |
36753 |
atomic_read(&s->sk_refcnt), |
36754 |
sk_rmem_alloc_get(s), |
36755 |
sk_wmem_alloc_get(s), |
36756 |
-diff -urNp linux-2.6.38.3/net/mac80211/cfg.c linux-2.6.38.3/net/mac80211/cfg.c |
36757 |
---- linux-2.6.38.3/net/mac80211/cfg.c 2011-03-14 21:20:32.000000000 -0400 |
36758 |
-+++ linux-2.6.38.3/net/mac80211/cfg.c 2011-04-17 15:57:33.000000000 -0400 |
36759 |
+diff -urNp linux-2.6.38.4/net/mac80211/cfg.c linux-2.6.38.4/net/mac80211/cfg.c |
36760 |
+--- linux-2.6.38.4/net/mac80211/cfg.c 2011-03-14 21:20:32.000000000 -0400 |
36761 |
++++ linux-2.6.38.4/net/mac80211/cfg.c 2011-04-17 15:57:33.000000000 -0400 |
36762 |
@@ -1939,7 +1939,7 @@ static int ieee80211_get_antenna(struct |
36763 |
return drv_get_antenna(local, tx_ant, rx_ant); |
36764 |
} |
36765 |
@@ -58838,9 +56877,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/cfg.c linux-2.6.38.3/net/mac80211/cfg.c |
36766 |
.add_virtual_intf = ieee80211_add_iface, |
36767 |
.del_virtual_intf = ieee80211_del_iface, |
36768 |
.change_virtual_intf = ieee80211_change_iface, |
36769 |
-diff -urNp linux-2.6.38.3/net/mac80211/cfg.h linux-2.6.38.3/net/mac80211/cfg.h |
36770 |
---- linux-2.6.38.3/net/mac80211/cfg.h 2011-03-14 21:20:32.000000000 -0400 |
36771 |
-+++ linux-2.6.38.3/net/mac80211/cfg.h 2011-04-17 15:57:33.000000000 -0400 |
36772 |
+diff -urNp linux-2.6.38.4/net/mac80211/cfg.h linux-2.6.38.4/net/mac80211/cfg.h |
36773 |
+--- linux-2.6.38.4/net/mac80211/cfg.h 2011-03-14 21:20:32.000000000 -0400 |
36774 |
++++ linux-2.6.38.4/net/mac80211/cfg.h 2011-04-17 15:57:33.000000000 -0400 |
36775 |
@@ -4,6 +4,6 @@ |
36776 |
#ifndef __CFG_H |
36777 |
#define __CFG_H |
36778 |
@@ -58849,9 +56888,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/cfg.h linux-2.6.38.3/net/mac80211/cfg.h |
36779 |
+extern const struct cfg80211_ops mac80211_config_ops; |
36780 |
|
36781 |
#endif /* __CFG_H */ |
36782 |
-diff -urNp linux-2.6.38.3/net/mac80211/ieee80211_i.h linux-2.6.38.3/net/mac80211/ieee80211_i.h |
36783 |
---- linux-2.6.38.3/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000000 -0400 |
36784 |
-+++ linux-2.6.38.3/net/mac80211/ieee80211_i.h 2011-04-17 15:57:33.000000000 -0400 |
36785 |
+diff -urNp linux-2.6.38.4/net/mac80211/ieee80211_i.h linux-2.6.38.4/net/mac80211/ieee80211_i.h |
36786 |
+--- linux-2.6.38.4/net/mac80211/ieee80211_i.h 2011-03-14 21:20:32.000000000 -0400 |
36787 |
++++ linux-2.6.38.4/net/mac80211/ieee80211_i.h 2011-04-17 15:57:33.000000000 -0400 |
36788 |
@@ -27,6 +27,7 @@ |
36789 |
#include <net/ieee80211_radiotap.h> |
36790 |
#include <net/cfg80211.h> |
36791 |
@@ -58869,9 +56908,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/ieee80211_i.h linux-2.6.38.3/net/mac80211 |
36792 |
int monitors, cooked_mntrs; |
36793 |
/* number of interfaces with corresponding FIF_ flags */ |
36794 |
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll, |
36795 |
-diff -urNp linux-2.6.38.3/net/mac80211/iface.c linux-2.6.38.3/net/mac80211/iface.c |
36796 |
---- linux-2.6.38.3/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0400 |
36797 |
-+++ linux-2.6.38.3/net/mac80211/iface.c 2011-04-17 15:57:33.000000000 -0400 |
36798 |
+diff -urNp linux-2.6.38.4/net/mac80211/iface.c linux-2.6.38.4/net/mac80211/iface.c |
36799 |
+--- linux-2.6.38.4/net/mac80211/iface.c 2011-03-14 21:20:32.000000000 -0400 |
36800 |
++++ linux-2.6.38.4/net/mac80211/iface.c 2011-04-17 15:57:33.000000000 -0400 |
36801 |
@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_ |
36802 |
break; |
36803 |
} |
36804 |
@@ -58926,9 +56965,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/iface.c linux-2.6.38.3/net/mac80211/iface |
36805 |
if (local->ops->napi_poll) |
36806 |
napi_disable(&local->napi); |
36807 |
ieee80211_clear_tx_pending(local); |
36808 |
-diff -urNp linux-2.6.38.3/net/mac80211/main.c linux-2.6.38.3/net/mac80211/main.c |
36809 |
---- linux-2.6.38.3/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -0400 |
36810 |
-+++ linux-2.6.38.3/net/mac80211/main.c 2011-04-17 15:57:33.000000000 -0400 |
36811 |
+diff -urNp linux-2.6.38.4/net/mac80211/main.c linux-2.6.38.4/net/mac80211/main.c |
36812 |
+--- linux-2.6.38.4/net/mac80211/main.c 2011-03-14 21:20:32.000000000 -0400 |
36813 |
++++ linux-2.6.38.4/net/mac80211/main.c 2011-04-17 15:57:33.000000000 -0400 |
36814 |
@@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211 |
36815 |
local->hw.conf.power_level = power; |
36816 |
} |
36817 |
@@ -58938,9 +56977,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/main.c linux-2.6.38.3/net/mac80211/main.c |
36818 |
ret = drv_config(local, changed); |
36819 |
/* |
36820 |
* Goal: |
36821 |
-diff -urNp linux-2.6.38.3/net/mac80211/pm.c linux-2.6.38.3/net/mac80211/pm.c |
36822 |
---- linux-2.6.38.3/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400 |
36823 |
-+++ linux-2.6.38.3/net/mac80211/pm.c 2011-04-17 15:57:33.000000000 -0400 |
36824 |
+diff -urNp linux-2.6.38.4/net/mac80211/pm.c linux-2.6.38.4/net/mac80211/pm.c |
36825 |
+--- linux-2.6.38.4/net/mac80211/pm.c 2011-03-14 21:20:32.000000000 -0400 |
36826 |
++++ linux-2.6.38.4/net/mac80211/pm.c 2011-04-17 15:57:33.000000000 -0400 |
36827 |
@@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211 |
36828 |
} |
36829 |
|
36830 |
@@ -58950,9 +56989,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/pm.c linux-2.6.38.3/net/mac80211/pm.c |
36831 |
ieee80211_stop_device(local); |
36832 |
|
36833 |
local->suspended = true; |
36834 |
-diff -urNp linux-2.6.38.3/net/mac80211/rate.c linux-2.6.38.3/net/mac80211/rate.c |
36835 |
---- linux-2.6.38.3/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -0400 |
36836 |
-+++ linux-2.6.38.3/net/mac80211/rate.c 2011-04-17 15:57:33.000000000 -0400 |
36837 |
+diff -urNp linux-2.6.38.4/net/mac80211/rate.c linux-2.6.38.4/net/mac80211/rate.c |
36838 |
+--- linux-2.6.38.4/net/mac80211/rate.c 2011-03-14 21:20:32.000000000 -0400 |
36839 |
++++ linux-2.6.38.4/net/mac80211/rate.c 2011-04-17 15:57:33.000000000 -0400 |
36840 |
@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct |
36841 |
|
36842 |
ASSERT_RTNL(); |
36843 |
@@ -58962,9 +57001,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/rate.c linux-2.6.38.3/net/mac80211/rate.c |
36844 |
return -EBUSY; |
36845 |
|
36846 |
if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) { |
36847 |
-diff -urNp linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c |
36848 |
---- linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
36849 |
-+++ linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c 2011-04-17 15:57:33.000000000 -0400 |
36850 |
+diff -urNp linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c |
36851 |
+--- linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c 2011-03-14 21:20:32.000000000 -0400 |
36852 |
++++ linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c 2011-04-17 15:57:33.000000000 -0400 |
36853 |
@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r |
36854 |
|
36855 |
spin_unlock_irqrestore(&events->lock, status); |
36856 |
@@ -58974,9 +57013,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.3/net/ |
36857 |
return -EFAULT; |
36858 |
|
36859 |
return p; |
36860 |
-diff -urNp linux-2.6.38.3/net/mac80211/tx.c linux-2.6.38.3/net/mac80211/tx.c |
36861 |
---- linux-2.6.38.3/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400 |
36862 |
-+++ linux-2.6.38.3/net/mac80211/tx.c 2011-04-17 15:57:33.000000000 -0400 |
36863 |
+diff -urNp linux-2.6.38.4/net/mac80211/tx.c linux-2.6.38.4/net/mac80211/tx.c |
36864 |
+--- linux-2.6.38.4/net/mac80211/tx.c 2011-03-14 21:20:32.000000000 -0400 |
36865 |
++++ linux-2.6.38.4/net/mac80211/tx.c 2011-04-17 15:57:33.000000000 -0400 |
36866 |
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct |
36867 |
return cpu_to_le16(dur); |
36868 |
} |
36869 |
@@ -58986,9 +57025,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/tx.c linux-2.6.38.3/net/mac80211/tx.c |
36870 |
struct net_device *dev) |
36871 |
{ |
36872 |
return local == wdev_priv(dev->ieee80211_ptr); |
36873 |
-diff -urNp linux-2.6.38.3/net/mac80211/util.c linux-2.6.38.3/net/mac80211/util.c |
36874 |
---- linux-2.6.38.3/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -0400 |
36875 |
-+++ linux-2.6.38.3/net/mac80211/util.c 2011-04-17 15:57:33.000000000 -0400 |
36876 |
+diff -urNp linux-2.6.38.4/net/mac80211/util.c linux-2.6.38.4/net/mac80211/util.c |
36877 |
+--- linux-2.6.38.4/net/mac80211/util.c 2011-03-14 21:20:32.000000000 -0400 |
36878 |
++++ linux-2.6.38.4/net/mac80211/util.c 2011-04-17 15:57:33.000000000 -0400 |
36879 |
@@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_ |
36880 |
local->resuming = true; |
36881 |
|
36882 |
@@ -58998,9 +57037,9 @@ diff -urNp linux-2.6.38.3/net/mac80211/util.c linux-2.6.38.3/net/mac80211/util.c |
36883 |
/* |
36884 |
* Upon resume hardware can sometimes be goofy due to |
36885 |
* various platform / driver / bus issues, so restarting |
36886 |
-diff -urNp linux-2.6.38.3/net/netfilter/Kconfig linux-2.6.38.3/net/netfilter/Kconfig |
36887 |
---- linux-2.6.38.3/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
36888 |
-+++ linux-2.6.38.3/net/netfilter/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
36889 |
+diff -urNp linux-2.6.38.4/net/netfilter/Kconfig linux-2.6.38.4/net/netfilter/Kconfig |
36890 |
+--- linux-2.6.38.4/net/netfilter/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
36891 |
++++ linux-2.6.38.4/net/netfilter/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
36892 |
@@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP |
36893 |
|
36894 |
To compile it as a module, choose M here. If unsure, say N. |
36895 |
@@ -59018,9 +57057,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/Kconfig linux-2.6.38.3/net/netfilter/Kco |
36896 |
config NETFILTER_XT_MATCH_HASHLIMIT |
36897 |
tristate '"hashlimit" match support' |
36898 |
depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) |
36899 |
-diff -urNp linux-2.6.38.3/net/netfilter/Makefile linux-2.6.38.3/net/netfilter/Makefile |
36900 |
---- linux-2.6.38.3/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 -0400 |
36901 |
-+++ linux-2.6.38.3/net/netfilter/Makefile 2011-04-17 15:57:33.000000000 -0400 |
36902 |
+diff -urNp linux-2.6.38.4/net/netfilter/Makefile linux-2.6.38.4/net/netfilter/Makefile |
36903 |
+--- linux-2.6.38.4/net/netfilter/Makefile 2011-03-14 21:20:32.000000000 -0400 |
36904 |
++++ linux-2.6.38.4/net/netfilter/Makefile 2011-04-17 15:57:33.000000000 -0400 |
36905 |
@@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) += |
36906 |
obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o |
36907 |
obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o |
36908 |
@@ -59029,9 +57068,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/Makefile linux-2.6.38.3/net/netfilter/Ma |
36909 |
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o |
36910 |
obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o |
36911 |
obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o |
36912 |
-diff -urNp linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c |
36913 |
---- linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20:32.000000000 -0400 |
36914 |
-+++ linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:57:33.000000000 -0400 |
36915 |
+diff -urNp linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c |
36916 |
+--- linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c 2011-03-14 21:20:32.000000000 -0400 |
36917 |
++++ linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:57:33.000000000 -0400 |
36918 |
@@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla |
36919 |
static int |
36920 |
ctnetlink_parse_tuple(const struct nlattr * const cda[], |
36921 |
@@ -59041,9 +57080,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.3/ne |
36922 |
{ |
36923 |
struct nlattr *tb[CTA_TUPLE_MAX+1]; |
36924 |
int err; |
36925 |
-diff -urNp linux-2.6.38.3/net/netfilter/xt_gradm.c linux-2.6.38.3/net/netfilter/xt_gradm.c |
36926 |
---- linux-2.6.38.3/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 |
36927 |
-+++ linux-2.6.38.3/net/netfilter/xt_gradm.c 2011-04-17 15:57:33.000000000 -0400 |
36928 |
+diff -urNp linux-2.6.38.4/net/netfilter/xt_gradm.c linux-2.6.38.4/net/netfilter/xt_gradm.c |
36929 |
+--- linux-2.6.38.4/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 |
36930 |
++++ linux-2.6.38.4/net/netfilter/xt_gradm.c 2011-04-17 15:57:33.000000000 -0400 |
36931 |
@@ -0,0 +1,51 @@ |
36932 |
+/* |
36933 |
+ * gradm match for netfilter |
36934 |
@@ -59096,9 +57135,9 @@ diff -urNp linux-2.6.38.3/net/netfilter/xt_gradm.c linux-2.6.38.3/net/netfilter/ |
36935 |
+MODULE_LICENSE("GPL"); |
36936 |
+MODULE_ALIAS("ipt_gradm"); |
36937 |
+MODULE_ALIAS("ip6t_gradm"); |
36938 |
-diff -urNp linux-2.6.38.3/net/netlink/af_netlink.c linux-2.6.38.3/net/netlink/af_netlink.c |
36939 |
---- linux-2.6.38.3/net/netlink/af_netlink.c 2011-03-14 21:20:32.000000000 -0400 |
36940 |
-+++ linux-2.6.38.3/net/netlink/af_netlink.c 2011-04-17 15:57:33.000000000 -0400 |
36941 |
+diff -urNp linux-2.6.38.4/net/netlink/af_netlink.c linux-2.6.38.4/net/netlink/af_netlink.c |
36942 |
+--- linux-2.6.38.4/net/netlink/af_netlink.c 2011-03-14 21:20:32.000000000 -0400 |
36943 |
++++ linux-2.6.38.4/net/netlink/af_netlink.c 2011-04-17 15:57:33.000000000 -0400 |
36944 |
@@ -2001,13 +2001,21 @@ static int netlink_seq_show(struct seq_f |
36945 |
struct netlink_sock *nlk = nlk_sk(s); |
36946 |
|
36947 |
@@ -59121,9 +57160,9 @@ diff -urNp linux-2.6.38.3/net/netlink/af_netlink.c linux-2.6.38.3/net/netlink/af |
36948 |
atomic_read(&s->sk_refcnt), |
36949 |
atomic_read(&s->sk_drops), |
36950 |
sock_i_ino(s) |
36951 |
-diff -urNp linux-2.6.38.3/net/netrom/af_netrom.c linux-2.6.38.3/net/netrom/af_netrom.c |
36952 |
---- linux-2.6.38.3/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 -0400 |
36953 |
-+++ linux-2.6.38.3/net/netrom/af_netrom.c 2011-04-17 15:57:33.000000000 -0400 |
36954 |
+diff -urNp linux-2.6.38.4/net/netrom/af_netrom.c linux-2.6.38.4/net/netrom/af_netrom.c |
36955 |
+--- linux-2.6.38.4/net/netrom/af_netrom.c 2011-03-14 21:20:32.000000000 -0400 |
36956 |
++++ linux-2.6.38.4/net/netrom/af_netrom.c 2011-04-17 15:57:33.000000000 -0400 |
36957 |
@@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc |
36958 |
struct sock *sk = sock->sk; |
36959 |
struct nr_sock *nr = nr_sk(sk); |
36960 |
@@ -59140,9 +57179,9 @@ diff -urNp linux-2.6.38.3/net/netrom/af_netrom.c linux-2.6.38.3/net/netrom/af_ne |
36961 |
sax->fsa_ax25.sax25_call = nr->source_addr; |
36962 |
*uaddr_len = sizeof(struct sockaddr_ax25); |
36963 |
} |
36964 |
-diff -urNp linux-2.6.38.3/net/packet/af_packet.c linux-2.6.38.3/net/packet/af_packet.c |
36965 |
---- linux-2.6.38.3/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 -0400 |
36966 |
-+++ linux-2.6.38.3/net/packet/af_packet.c 2011-04-17 15:57:33.000000000 -0400 |
36967 |
+diff -urNp linux-2.6.38.4/net/packet/af_packet.c linux-2.6.38.4/net/packet/af_packet.c |
36968 |
+--- linux-2.6.38.4/net/packet/af_packet.c 2011-03-14 21:20:32.000000000 -0400 |
36969 |
++++ linux-2.6.38.4/net/packet/af_packet.c 2011-04-17 15:57:33.000000000 -0400 |
36970 |
@@ -2134,7 +2134,7 @@ static int packet_getsockopt(struct sock |
36971 |
case PACKET_HDRLEN: |
36972 |
if (len > sizeof(int)) |
36973 |
@@ -59173,9 +57212,9 @@ diff -urNp linux-2.6.38.3/net/packet/af_packet.c linux-2.6.38.3/net/packet/af_pa |
36974 |
atomic_read(&s->sk_refcnt), |
36975 |
s->sk_type, |
36976 |
ntohs(po->num), |
36977 |
-diff -urNp linux-2.6.38.3/net/phonet/af_phonet.c linux-2.6.38.3/net/phonet/af_phonet.c |
36978 |
---- linux-2.6.38.3/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 -0400 |
36979 |
-+++ linux-2.6.38.3/net/phonet/af_phonet.c 2011-04-17 15:57:33.000000000 -0400 |
36980 |
+diff -urNp linux-2.6.38.4/net/phonet/af_phonet.c linux-2.6.38.4/net/phonet/af_phonet.c |
36981 |
+--- linux-2.6.38.4/net/phonet/af_phonet.c 2011-03-14 21:20:32.000000000 -0400 |
36982 |
++++ linux-2.6.38.4/net/phonet/af_phonet.c 2011-04-17 15:57:33.000000000 -0400 |
36983 |
@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr |
36984 |
{ |
36985 |
struct phonet_protocol *pp; |
36986 |
@@ -59194,9 +57233,9 @@ diff -urNp linux-2.6.38.3/net/phonet/af_phonet.c linux-2.6.38.3/net/phonet/af_ph |
36987 |
return -EINVAL; |
36988 |
|
36989 |
err = proto_register(pp->prot, 1); |
36990 |
-diff -urNp linux-2.6.38.3/net/phonet/socket.c linux-2.6.38.3/net/phonet/socket.c |
36991 |
---- linux-2.6.38.3/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -0400 |
36992 |
-+++ linux-2.6.38.3/net/phonet/socket.c 2011-04-17 15:57:33.000000000 -0400 |
36993 |
+diff -urNp linux-2.6.38.4/net/phonet/socket.c linux-2.6.38.4/net/phonet/socket.c |
36994 |
+--- linux-2.6.38.4/net/phonet/socket.c 2011-03-14 21:20:32.000000000 -0400 |
36995 |
++++ linux-2.6.38.4/net/phonet/socket.c 2011-04-17 15:57:33.000000000 -0400 |
36996 |
@@ -637,7 +637,12 @@ static int pn_sock_seq_show(struct seq_f |
36997 |
sk->sk_state, |
36998 |
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), |
36999 |
@@ -59211,9 +57250,9 @@ diff -urNp linux-2.6.38.3/net/phonet/socket.c linux-2.6.38.3/net/phonet/socket.c |
37000 |
atomic_read(&sk->sk_drops), &len); |
37001 |
} |
37002 |
seq_printf(seq, "%*s\n", 127 - len, ""); |
37003 |
-diff -urNp linux-2.6.38.3/net/sctp/proc.c linux-2.6.38.3/net/sctp/proc.c |
37004 |
---- linux-2.6.38.3/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400 |
37005 |
-+++ linux-2.6.38.3/net/sctp/proc.c 2011-04-17 15:57:33.000000000 -0400 |
37006 |
+diff -urNp linux-2.6.38.4/net/sctp/proc.c linux-2.6.38.4/net/sctp/proc.c |
37007 |
+--- linux-2.6.38.4/net/sctp/proc.c 2011-03-14 21:20:32.000000000 -0400 |
37008 |
++++ linux-2.6.38.4/net/sctp/proc.c 2011-04-17 15:57:33.000000000 -0400 |
37009 |
@@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_ |
37010 |
sctp_for_each_hentry(epb, node, &head->chain) { |
37011 |
ep = sctp_ep(epb); |
37012 |
@@ -59242,18 +57281,9 @@ diff -urNp linux-2.6.38.3/net/sctp/proc.c linux-2.6.38.3/net/sctp/proc.c |
37013 |
assoc->state, hash, |
37014 |
assoc->assoc_id, |
37015 |
assoc->sndbuf_used, |
37016 |
-diff -urNp linux-2.6.38.3/net/sctp/socket.c linux-2.6.38.3/net/sctp/socket.c |
37017 |
---- linux-2.6.38.3/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400 |
37018 |
-+++ linux-2.6.38.3/net/sctp/socket.c 2011-04-17 15:57:33.000000000 -0400 |
37019 |
-@@ -1496,7 +1496,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc |
37020 |
- struct sctp_sndrcvinfo *sinfo; |
37021 |
- struct sctp_initmsg *sinit; |
37022 |
- sctp_assoc_t associd = 0; |
37023 |
-- sctp_cmsgs_t cmsgs = { NULL }; |
37024 |
-+ sctp_cmsgs_t cmsgs = { NULL, NULL }; |
37025 |
- int err; |
37026 |
- sctp_scope_t scope; |
37027 |
- long timeo; |
37028 |
+diff -urNp linux-2.6.38.4/net/sctp/socket.c linux-2.6.38.4/net/sctp/socket.c |
37029 |
+--- linux-2.6.38.4/net/sctp/socket.c 2011-03-14 21:20:32.000000000 -0400 |
37030 |
++++ linux-2.6.38.4/net/sctp/socket.c 2011-04-23 12:47:28.000000000 -0400 |
37031 |
@@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(st |
37032 |
addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; |
37033 |
if (space_left < addrlen) |
37034 |
@@ -59263,9 +57293,9 @@ diff -urNp linux-2.6.38.3/net/sctp/socket.c linux-2.6.38.3/net/sctp/socket.c |
37035 |
return -EFAULT; |
37036 |
to += addrlen; |
37037 |
cnt++; |
37038 |
-diff -urNp linux-2.6.38.3/net/socket.c linux-2.6.38.3/net/socket.c |
37039 |
---- linux-2.6.38.3/net/socket.c 2011-04-18 17:27:16.000000000 -0400 |
37040 |
-+++ linux-2.6.38.3/net/socket.c 2011-04-17 15:57:33.000000000 -0400 |
37041 |
+diff -urNp linux-2.6.38.4/net/socket.c linux-2.6.38.4/net/socket.c |
37042 |
+--- linux-2.6.38.4/net/socket.c 2011-04-18 17:27:16.000000000 -0400 |
37043 |
++++ linux-2.6.38.4/net/socket.c 2011-04-17 15:57:33.000000000 -0400 |
37044 |
@@ -88,6 +88,7 @@ |
37045 |
#include <linux/nsproxy.h> |
37046 |
#include <linux/magic.h> |
37047 |
@@ -59416,9 +57446,9 @@ diff -urNp linux-2.6.38.3/net/socket.c linux-2.6.38.3/net/socket.c |
37048 |
err = |
37049 |
security_socket_connect(sock, (struct sockaddr *)&address, addrlen); |
37050 |
if (err) |
37051 |
-diff -urNp linux-2.6.38.3/net/sunrpc/sched.c linux-2.6.38.3/net/sunrpc/sched.c |
37052 |
---- linux-2.6.38.3/net/sunrpc/sched.c 2011-04-18 17:27:14.000000000 -0400 |
37053 |
-+++ linux-2.6.38.3/net/sunrpc/sched.c 2011-04-17 15:57:33.000000000 -0400 |
37054 |
+diff -urNp linux-2.6.38.4/net/sunrpc/sched.c linux-2.6.38.4/net/sunrpc/sched.c |
37055 |
+--- linux-2.6.38.4/net/sunrpc/sched.c 2011-04-18 17:27:14.000000000 -0400 |
37056 |
++++ linux-2.6.38.4/net/sunrpc/sched.c 2011-04-17 15:57:33.000000000 -0400 |
37057 |
@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w |
37058 |
#ifdef RPC_DEBUG |
37059 |
static void rpc_task_set_debuginfo(struct rpc_task *task) |
37060 |
@@ -59431,9 +57461,9 @@ diff -urNp linux-2.6.38.3/net/sunrpc/sched.c linux-2.6.38.3/net/sunrpc/sched.c |
37061 |
} |
37062 |
#else |
37063 |
static inline void rpc_task_set_debuginfo(struct rpc_task *task) |
37064 |
-diff -urNp linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c |
37065 |
---- linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.000000000 -0400 |
37066 |
-+++ linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:57:33.000000000 -0400 |
37067 |
+diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c |
37068 |
+--- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-14 21:20:32.000000000 -0400 |
37069 |
++++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-04-17 15:57:33.000000000 -0400 |
37070 |
@@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta |
37071 |
len -= *ppos; |
37072 |
if (len > *lenp) |
37073 |
@@ -59443,9 +57473,9 @@ diff -urNp linux-2.6.38.3/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.3/net/sunr |
37074 |
return -EFAULT; |
37075 |
*lenp = len; |
37076 |
*ppos += len; |
37077 |
-diff -urNp linux-2.6.38.3/net/sysctl_net.c linux-2.6.38.3/net/sysctl_net.c |
37078 |
---- linux-2.6.38.3/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400 |
37079 |
-+++ linux-2.6.38.3/net/sysctl_net.c 2011-04-17 15:57:33.000000000 -0400 |
37080 |
+diff -urNp linux-2.6.38.4/net/sysctl_net.c linux-2.6.38.4/net/sysctl_net.c |
37081 |
+--- linux-2.6.38.4/net/sysctl_net.c 2011-03-14 21:20:32.000000000 -0400 |
37082 |
++++ linux-2.6.38.4/net/sysctl_net.c 2011-04-17 15:57:33.000000000 -0400 |
37083 |
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct |
37084 |
struct ctl_table *table) |
37085 |
{ |
37086 |
@@ -59455,24 +57485,9 @@ diff -urNp linux-2.6.38.3/net/sysctl_net.c linux-2.6.38.3/net/sysctl_net.c |
37087 |
int mode = (table->mode >> 6) & 7; |
37088 |
return (mode << 6) | (mode << 3) | mode; |
37089 |
} |
37090 |
-diff -urNp linux-2.6.38.3/net/tipc/socket.c linux-2.6.38.3/net/tipc/socket.c |
37091 |
---- linux-2.6.38.3/net/tipc/socket.c 2011-03-14 21:20:32.000000000 -0400 |
37092 |
-+++ linux-2.6.38.3/net/tipc/socket.c 2011-04-17 15:57:33.000000000 -0400 |
37093 |
-@@ -1447,8 +1447,9 @@ static int connect(struct socket *sock, |
37094 |
- } else { |
37095 |
- if (res == 0) |
37096 |
- res = -ETIMEDOUT; |
37097 |
-- else |
37098 |
-- ; /* leave "res" unchanged */ |
37099 |
-+ else { |
37100 |
-+ /* leave "res" unchanged */ |
37101 |
-+ } |
37102 |
- sock->state = SS_DISCONNECTING; |
37103 |
- } |
37104 |
- |
37105 |
-diff -urNp linux-2.6.38.3/net/unix/af_unix.c linux-2.6.38.3/net/unix/af_unix.c |
37106 |
---- linux-2.6.38.3/net/unix/af_unix.c 2011-03-14 21:20:32.000000000 -0400 |
37107 |
-+++ linux-2.6.38.3/net/unix/af_unix.c 2011-04-17 15:57:33.000000000 -0400 |
37108 |
+diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c |
37109 |
+--- linux-2.6.38.4/net/unix/af_unix.c 2011-03-14 21:20:32.000000000 -0400 |
37110 |
++++ linux-2.6.38.4/net/unix/af_unix.c 2011-04-17 15:57:33.000000000 -0400 |
37111 |
@@ -765,6 +765,12 @@ static struct sock *unix_find_other(stru |
37112 |
err = -ECONNREFUSED; |
37113 |
if (!S_ISSOCK(inode->i_mode)) |
37114 |
@@ -59543,21 +57558,9 @@ diff -urNp linux-2.6.38.3/net/unix/af_unix.c linux-2.6.38.3/net/unix/af_unix.c |
37115 |
atomic_read(&s->sk_refcnt), |
37116 |
0, |
37117 |
s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, |
37118 |
-diff -urNp linux-2.6.38.3/net/wireless/reg.c linux-2.6.38.3/net/wireless/reg.c |
37119 |
---- linux-2.6.38.3/net/wireless/reg.c 2011-03-14 21:20:32.000000000 -0400 |
37120 |
-+++ linux-2.6.38.3/net/wireless/reg.c 2011-04-17 15:57:33.000000000 -0400 |
37121 |
-@@ -54,7 +54,7 @@ |
37122 |
- printk(KERN_DEBUG pr_fmt(format), ##args); \ |
37123 |
- } while (0) |
37124 |
- #else |
37125 |
--#define REG_DBG_PRINT(args...) |
37126 |
-+#define REG_DBG_PRINT(args...) do {} while (0) |
37127 |
- #endif |
37128 |
- |
37129 |
- /* Receipt of information from last regulatory request */ |
37130 |
-diff -urNp linux-2.6.38.3/net/wireless/wext-core.c linux-2.6.38.3/net/wireless/wext-core.c |
37131 |
---- linux-2.6.38.3/net/wireless/wext-core.c 2011-03-14 21:20:32.000000000 -0400 |
37132 |
-+++ linux-2.6.38.3/net/wireless/wext-core.c 2011-04-17 15:57:33.000000000 -0400 |
37133 |
+diff -urNp linux-2.6.38.4/net/wireless/wext-core.c linux-2.6.38.4/net/wireless/wext-core.c |
37134 |
+--- linux-2.6.38.4/net/wireless/wext-core.c 2011-03-14 21:20:32.000000000 -0400 |
37135 |
++++ linux-2.6.38.4/net/wireless/wext-core.c 2011-04-17 15:57:33.000000000 -0400 |
37136 |
@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc |
37137 |
*/ |
37138 |
|
37139 |
@@ -59591,22 +57594,9 @@ diff -urNp linux-2.6.38.3/net/wireless/wext-core.c linux-2.6.38.3/net/wireless/w |
37140 |
err = handler(dev, info, (union iwreq_data *) iwp, extra); |
37141 |
|
37142 |
iwp->length += essid_compat; |
37143 |
-diff -urNp linux-2.6.38.3/net/x25/x25_facilities.c linux-2.6.38.3/net/x25/x25_facilities.c |
37144 |
---- linux-2.6.38.3/net/x25/x25_facilities.c 2011-03-14 21:20:32.000000000 -0400 |
37145 |
-+++ linux-2.6.38.3/net/x25/x25_facilities.c 2011-04-17 15:57:33.000000000 -0400 |
37146 |
-@@ -167,7 +167,8 @@ int x25_parse_facilities(struct sk_buff |
37147 |
- break; |
37148 |
- default: |
37149 |
- printk(KERN_DEBUG "X.25: unknown facility %02X," |
37150 |
-- "length %d\n", p[0], p[1]); |
37151 |
-+ "length %d, values %02X, %02X\n", |
37152 |
-+ p[0], p[1], p[2], p[3]); |
37153 |
- break; |
37154 |
- } |
37155 |
- len -= p[1] + 2; |
37156 |
-diff -urNp linux-2.6.38.3/net/xfrm/xfrm_policy.c linux-2.6.38.3/net/xfrm/xfrm_policy.c |
37157 |
---- linux-2.6.38.3/net/xfrm/xfrm_policy.c 2011-03-14 21:20:32.000000000 -0400 |
37158 |
-+++ linux-2.6.38.3/net/xfrm/xfrm_policy.c 2011-04-17 15:57:33.000000000 -0400 |
37159 |
+diff -urNp linux-2.6.38.4/net/xfrm/xfrm_policy.c linux-2.6.38.4/net/xfrm/xfrm_policy.c |
37160 |
+--- linux-2.6.38.4/net/xfrm/xfrm_policy.c 2011-04-22 19:20:59.000000000 -0400 |
37161 |
++++ linux-2.6.38.4/net/xfrm/xfrm_policy.c 2011-04-22 19:21:47.000000000 -0400 |
37162 |
@@ -1507,7 +1507,7 @@ free_dst: |
37163 |
goto out; |
37164 |
} |
37165 |
@@ -59634,9 +57624,9 @@ diff -urNp linux-2.6.38.3/net/xfrm/xfrm_policy.c linux-2.6.38.3/net/xfrm/xfrm_po |
37166 |
xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) |
37167 |
{ |
37168 |
#ifdef CONFIG_XFRM_SUB_POLICY |
37169 |
-diff -urNp linux-2.6.38.3/scripts/basic/fixdep.c linux-2.6.38.3/scripts/basic/fixdep.c |
37170 |
---- linux-2.6.38.3/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 -0400 |
37171 |
-+++ linux-2.6.38.3/scripts/basic/fixdep.c 2011-04-17 15:57:33.000000000 -0400 |
37172 |
+diff -urNp linux-2.6.38.4/scripts/basic/fixdep.c linux-2.6.38.4/scripts/basic/fixdep.c |
37173 |
+--- linux-2.6.38.4/scripts/basic/fixdep.c 2011-03-14 21:20:32.000000000 -0400 |
37174 |
++++ linux-2.6.38.4/scripts/basic/fixdep.c 2011-04-17 15:57:33.000000000 -0400 |
37175 |
@@ -235,9 +235,9 @@ static void use_config(const char *m, in |
37176 |
|
37177 |
static void parse_config_file(const char *map, size_t len) |
37178 |
@@ -59658,27 +57648,9 @@ diff -urNp linux-2.6.38.3/scripts/basic/fixdep.c linux-2.6.38.3/scripts/basic/fi |
37179 |
|
37180 |
if (*p != INT_CONF) { |
37181 |
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", |
37182 |
-diff -urNp linux-2.6.38.3/scripts/kallsyms.c linux-2.6.38.3/scripts/kallsyms.c |
37183 |
---- linux-2.6.38.3/scripts/kallsyms.c 2011-03-14 21:20:32.000000000 -0400 |
37184 |
-+++ linux-2.6.38.3/scripts/kallsyms.c 2011-04-17 15:57:33.000000000 -0400 |
37185 |
-@@ -43,10 +43,10 @@ struct text_range { |
37186 |
- |
37187 |
- static unsigned long long _text; |
37188 |
- static struct text_range text_ranges[] = { |
37189 |
-- { "_stext", "_etext" }, |
37190 |
-- { "_sinittext", "_einittext" }, |
37191 |
-- { "_stext_l1", "_etext_l1" }, /* Blackfin on-chip L1 inst SRAM */ |
37192 |
-- { "_stext_l2", "_etext_l2" }, /* Blackfin on-chip L2 SRAM */ |
37193 |
-+ { "_stext", "_etext", 0, 0 }, |
37194 |
-+ { "_sinittext", "_einittext", 0, 0 }, |
37195 |
-+ { "_stext_l1", "_etext_l1", 0, 0 }, /* Blackfin on-chip L1 inst SRAM */ |
37196 |
-+ { "_stext_l2", "_etext_l2", 0, 0 }, /* Blackfin on-chip L2 SRAM */ |
37197 |
- }; |
37198 |
- #define text_range_text (&text_ranges[0]) |
37199 |
- #define text_range_inittext (&text_ranges[1]) |
37200 |
-diff -urNp linux-2.6.38.3/scripts/mod/file2alias.c linux-2.6.38.3/scripts/mod/file2alias.c |
37201 |
---- linux-2.6.38.3/scripts/mod/file2alias.c 2011-03-14 21:20:32.000000000 -0400 |
37202 |
-+++ linux-2.6.38.3/scripts/mod/file2alias.c 2011-04-17 15:57:33.000000000 -0400 |
37203 |
+diff -urNp linux-2.6.38.4/scripts/mod/file2alias.c linux-2.6.38.4/scripts/mod/file2alias.c |
37204 |
+--- linux-2.6.38.4/scripts/mod/file2alias.c 2011-03-14 21:20:32.000000000 -0400 |
37205 |
++++ linux-2.6.38.4/scripts/mod/file2alias.c 2011-04-17 15:57:33.000000000 -0400 |
37206 |
@@ -72,7 +72,7 @@ static void device_id_check(const char * |
37207 |
unsigned long size, unsigned long id_size, |
37208 |
void *symval) |
37209 |
@@ -59733,9 +57705,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/file2alias.c linux-2.6.38.3/scripts/mod/fi |
37210 |
|
37211 |
sprintf(alias, "dmi*"); |
37212 |
|
37213 |
-diff -urNp linux-2.6.38.3/scripts/mod/modpost.c linux-2.6.38.3/scripts/mod/modpost.c |
37214 |
---- linux-2.6.38.3/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -0400 |
37215 |
-+++ linux-2.6.38.3/scripts/mod/modpost.c 2011-04-17 15:57:33.000000000 -0400 |
37216 |
+diff -urNp linux-2.6.38.4/scripts/mod/modpost.c linux-2.6.38.4/scripts/mod/modpost.c |
37217 |
+--- linux-2.6.38.4/scripts/mod/modpost.c 2011-03-14 21:20:32.000000000 -0400 |
37218 |
++++ linux-2.6.38.4/scripts/mod/modpost.c 2011-04-17 15:57:33.000000000 -0400 |
37219 |
@@ -896,6 +896,7 @@ enum mismatch { |
37220 |
ANY_INIT_TO_ANY_EXIT, |
37221 |
ANY_EXIT_TO_ANY_INIT, |
37222 |
@@ -59803,9 +57775,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/modpost.c linux-2.6.38.3/scripts/mod/modpo |
37223 |
goto close_write; |
37224 |
|
37225 |
tmp = NOFAIL(malloc(b->pos)); |
37226 |
-diff -urNp linux-2.6.38.3/scripts/mod/modpost.h linux-2.6.38.3/scripts/mod/modpost.h |
37227 |
---- linux-2.6.38.3/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -0400 |
37228 |
-+++ linux-2.6.38.3/scripts/mod/modpost.h 2011-04-17 15:57:33.000000000 -0400 |
37229 |
+diff -urNp linux-2.6.38.4/scripts/mod/modpost.h linux-2.6.38.4/scripts/mod/modpost.h |
37230 |
+--- linux-2.6.38.4/scripts/mod/modpost.h 2011-03-14 21:20:32.000000000 -0400 |
37231 |
++++ linux-2.6.38.4/scripts/mod/modpost.h 2011-04-17 15:57:33.000000000 -0400 |
37232 |
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e |
37233 |
|
37234 |
struct buffer { |
37235 |
@@ -59825,9 +57797,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/modpost.h linux-2.6.38.3/scripts/mod/modpo |
37236 |
|
37237 |
struct module { |
37238 |
struct module *next; |
37239 |
-diff -urNp linux-2.6.38.3/scripts/mod/sumversion.c linux-2.6.38.3/scripts/mod/sumversion.c |
37240 |
---- linux-2.6.38.3/scripts/mod/sumversion.c 2011-03-14 21:20:32.000000000 -0400 |
37241 |
-+++ linux-2.6.38.3/scripts/mod/sumversion.c 2011-04-17 15:57:33.000000000 -0400 |
37242 |
+diff -urNp linux-2.6.38.4/scripts/mod/sumversion.c linux-2.6.38.4/scripts/mod/sumversion.c |
37243 |
+--- linux-2.6.38.4/scripts/mod/sumversion.c 2011-03-14 21:20:32.000000000 -0400 |
37244 |
++++ linux-2.6.38.4/scripts/mod/sumversion.c 2011-04-17 15:57:33.000000000 -0400 |
37245 |
@@ -470,7 +470,7 @@ static void write_version(const char *fi |
37246 |
goto out; |
37247 |
} |
37248 |
@@ -59837,9 +57809,9 @@ diff -urNp linux-2.6.38.3/scripts/mod/sumversion.c linux-2.6.38.3/scripts/mod/su |
37249 |
warn("writing sum in %s failed: %s\n", |
37250 |
filename, strerror(errno)); |
37251 |
goto out; |
37252 |
-diff -urNp linux-2.6.38.3/scripts/pnmtologo.c linux-2.6.38.3/scripts/pnmtologo.c |
37253 |
---- linux-2.6.38.3/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -0400 |
37254 |
-+++ linux-2.6.38.3/scripts/pnmtologo.c 2011-04-17 15:57:33.000000000 -0400 |
37255 |
+diff -urNp linux-2.6.38.4/scripts/pnmtologo.c linux-2.6.38.4/scripts/pnmtologo.c |
37256 |
+--- linux-2.6.38.4/scripts/pnmtologo.c 2011-03-14 21:20:32.000000000 -0400 |
37257 |
++++ linux-2.6.38.4/scripts/pnmtologo.c 2011-04-17 15:57:33.000000000 -0400 |
37258 |
@@ -237,14 +237,14 @@ static void write_header(void) |
37259 |
fprintf(out, " * Linux logo %s\n", logoname); |
37260 |
fputs(" */\n\n", out); |
37261 |
@@ -59866,9 +57838,9 @@ diff -urNp linux-2.6.38.3/scripts/pnmtologo.c linux-2.6.38.3/scripts/pnmtologo.c |
37262 |
logoname); |
37263 |
write_hex_cnt = 0; |
37264 |
for (i = 0; i < logo_clutsize; i++) { |
37265 |
-diff -urNp linux-2.6.38.3/security/apparmor/lsm.c linux-2.6.38.3/security/apparmor/lsm.c |
37266 |
---- linux-2.6.38.3/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000 -0400 |
37267 |
-+++ linux-2.6.38.3/security/apparmor/lsm.c 2011-04-17 15:57:33.000000000 -0400 |
37268 |
+diff -urNp linux-2.6.38.4/security/apparmor/lsm.c linux-2.6.38.4/security/apparmor/lsm.c |
37269 |
+--- linux-2.6.38.4/security/apparmor/lsm.c 2011-03-14 21:20:32.000000000 -0400 |
37270 |
++++ linux-2.6.38.4/security/apparmor/lsm.c 2011-04-17 15:57:33.000000000 -0400 |
37271 |
@@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc |
37272 |
return error; |
37273 |
} |
37274 |
@@ -59878,9 +57850,9 @@ diff -urNp linux-2.6.38.3/security/apparmor/lsm.c linux-2.6.38.3/security/apparm |
37275 |
.name = "apparmor", |
37276 |
|
37277 |
.ptrace_access_check = apparmor_ptrace_access_check, |
37278 |
-diff -urNp linux-2.6.38.3/security/commoncap.c linux-2.6.38.3/security/commoncap.c |
37279 |
---- linux-2.6.38.3/security/commoncap.c 2011-03-14 21:20:32.000000000 -0400 |
37280 |
-+++ linux-2.6.38.3/security/commoncap.c 2011-04-17 15:57:33.000000000 -0400 |
37281 |
+diff -urNp linux-2.6.38.4/security/commoncap.c linux-2.6.38.4/security/commoncap.c |
37282 |
+--- linux-2.6.38.4/security/commoncap.c 2011-03-14 21:20:32.000000000 -0400 |
37283 |
++++ linux-2.6.38.4/security/commoncap.c 2011-04-17 15:57:33.000000000 -0400 |
37284 |
@@ -27,6 +27,7 @@ |
37285 |
#include <linux/sched.h> |
37286 |
#include <linux/prctl.h> |
37287 |
@@ -59912,9 +57884,9 @@ diff -urNp linux-2.6.38.3/security/commoncap.c linux-2.6.38.3/security/commoncap |
37288 |
if (cred->uid != 0) { |
37289 |
if (bprm->cap_effective) |
37290 |
return 1; |
37291 |
-diff -urNp linux-2.6.38.3/security/integrity/ima/ima_api.c linux-2.6.38.3/security/integrity/ima/ima_api.c |
37292 |
---- linux-2.6.38.3/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.000000000 -0400 |
37293 |
-+++ linux-2.6.38.3/security/integrity/ima/ima_api.c 2011-04-17 15:57:33.000000000 -0400 |
37294 |
+diff -urNp linux-2.6.38.4/security/integrity/ima/ima_api.c linux-2.6.38.4/security/integrity/ima/ima_api.c |
37295 |
+--- linux-2.6.38.4/security/integrity/ima/ima_api.c 2011-03-14 21:20:32.000000000 -0400 |
37296 |
++++ linux-2.6.38.4/security/integrity/ima/ima_api.c 2011-04-17 15:57:33.000000000 -0400 |
37297 |
@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino |
37298 |
int result; |
37299 |
|
37300 |
@@ -59924,9 +57896,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/ima_api.c linux-2.6.38.3/securi |
37301 |
|
37302 |
entry = kmalloc(sizeof(*entry), GFP_KERNEL); |
37303 |
if (!entry) { |
37304 |
-diff -urNp linux-2.6.38.3/security/integrity/ima/ima_fs.c linux-2.6.38.3/security/integrity/ima/ima_fs.c |
37305 |
---- linux-2.6.38.3/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.000000000 -0400 |
37306 |
-+++ linux-2.6.38.3/security/integrity/ima/ima_fs.c 2011-04-17 15:57:33.000000000 -0400 |
37307 |
+diff -urNp linux-2.6.38.4/security/integrity/ima/ima_fs.c linux-2.6.38.4/security/integrity/ima/ima_fs.c |
37308 |
+--- linux-2.6.38.4/security/integrity/ima/ima_fs.c 2011-03-14 21:20:32.000000000 -0400 |
37309 |
++++ linux-2.6.38.4/security/integrity/ima/ima_fs.c 2011-04-17 15:57:33.000000000 -0400 |
37310 |
@@ -28,12 +28,12 @@ |
37311 |
static int valid_policy = 1; |
37312 |
#define TMPBUFLEN 12 |
37313 |
@@ -59942,9 +57914,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/ima_fs.c linux-2.6.38.3/securit |
37314 |
return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); |
37315 |
} |
37316 |
|
37317 |
-diff -urNp linux-2.6.38.3/security/integrity/ima/ima.h linux-2.6.38.3/security/integrity/ima/ima.h |
37318 |
---- linux-2.6.38.3/security/integrity/ima/ima.h 2011-03-14 21:20:32.000000000 -0400 |
37319 |
-+++ linux-2.6.38.3/security/integrity/ima/ima.h 2011-04-17 15:57:33.000000000 -0400 |
37320 |
+diff -urNp linux-2.6.38.4/security/integrity/ima/ima.h linux-2.6.38.4/security/integrity/ima/ima.h |
37321 |
+--- linux-2.6.38.4/security/integrity/ima/ima.h 2011-03-14 21:20:32.000000000 -0400 |
37322 |
++++ linux-2.6.38.4/security/integrity/ima/ima.h 2011-04-17 15:57:33.000000000 -0400 |
37323 |
@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino |
37324 |
extern spinlock_t ima_queue_lock; |
37325 |
|
37326 |
@@ -59956,9 +57928,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/ima.h linux-2.6.38.3/security/i |
37327 |
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; |
37328 |
}; |
37329 |
extern struct ima_h_table ima_htable; |
37330 |
-diff -urNp linux-2.6.38.3/security/integrity/ima/ima_queue.c linux-2.6.38.3/security/integrity/ima/ima_queue.c |
37331 |
---- linux-2.6.38.3/security/integrity/ima/ima_queue.c 2011-03-14 21:20:32.000000000 -0400 |
37332 |
-+++ linux-2.6.38.3/security/integrity/ima/ima_queue.c 2011-04-17 15:57:33.000000000 -0400 |
37333 |
+diff -urNp linux-2.6.38.4/security/integrity/ima/ima_queue.c linux-2.6.38.4/security/integrity/ima/ima_queue.c |
37334 |
+--- linux-2.6.38.4/security/integrity/ima/ima_queue.c 2011-03-14 21:20:32.000000000 -0400 |
37335 |
++++ linux-2.6.38.4/security/integrity/ima/ima_queue.c 2011-04-17 15:57:33.000000000 -0400 |
37336 |
@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i |
37337 |
INIT_LIST_HEAD(&qe->later); |
37338 |
list_add_tail_rcu(&qe->later, &ima_measurements); |
37339 |
@@ -59968,9 +57940,9 @@ diff -urNp linux-2.6.38.3/security/integrity/ima/ima_queue.c linux-2.6.38.3/secu |
37340 |
key = ima_hash_key(entry->digest); |
37341 |
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); |
37342 |
return 0; |
37343 |
-diff -urNp linux-2.6.38.3/security/Kconfig linux-2.6.38.3/security/Kconfig |
37344 |
---- linux-2.6.38.3/security/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
37345 |
-+++ linux-2.6.38.3/security/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
37346 |
+diff -urNp linux-2.6.38.4/security/Kconfig linux-2.6.38.4/security/Kconfig |
37347 |
+--- linux-2.6.38.4/security/Kconfig 2011-03-14 21:20:32.000000000 -0400 |
37348 |
++++ linux-2.6.38.4/security/Kconfig 2011-04-17 15:57:33.000000000 -0400 |
37349 |
@@ -4,6 +4,527 @@ |
37350 |
|
37351 |
menu "Security options" |
37352 |
@@ -60508,9 +58480,9 @@ diff -urNp linux-2.6.38.3/security/Kconfig linux-2.6.38.3/security/Kconfig |
37353 |
help |
37354 |
This is the portion of low virtual memory which should be protected |
37355 |
from userspace allocation. Keeping a user from writing to low pages |
37356 |
-diff -urNp linux-2.6.38.3/security/keys/keyring.c linux-2.6.38.3/security/keys/keyring.c |
37357 |
---- linux-2.6.38.3/security/keys/keyring.c 2011-03-14 21:20:32.000000000 -0400 |
37358 |
-+++ linux-2.6.38.3/security/keys/keyring.c 2011-04-18 22:03:12.000000000 -0400 |
37359 |
+diff -urNp linux-2.6.38.4/security/keys/keyring.c linux-2.6.38.4/security/keys/keyring.c |
37360 |
+--- linux-2.6.38.4/security/keys/keyring.c 2011-03-14 21:20:32.000000000 -0400 |
37361 |
++++ linux-2.6.38.4/security/keys/keyring.c 2011-04-18 22:03:12.000000000 -0400 |
37362 |
@@ -213,15 +213,15 @@ static long keyring_read(const struct ke |
37363 |
ret = -EFAULT; |
37364 |
|
37365 |
@@ -60530,9 +58502,9 @@ diff -urNp linux-2.6.38.3/security/keys/keyring.c linux-2.6.38.3/security/keys/k |
37366 |
goto error; |
37367 |
|
37368 |
buflen -= tmp; |
37369 |
-diff -urNp linux-2.6.38.3/security/min_addr.c linux-2.6.38.3/security/min_addr.c |
37370 |
---- linux-2.6.38.3/security/min_addr.c 2011-03-14 21:20:32.000000000 -0400 |
37371 |
-+++ linux-2.6.38.3/security/min_addr.c 2011-04-17 15:57:33.000000000 -0400 |
37372 |
+diff -urNp linux-2.6.38.4/security/min_addr.c linux-2.6.38.4/security/min_addr.c |
37373 |
+--- linux-2.6.38.4/security/min_addr.c 2011-03-14 21:20:32.000000000 -0400 |
37374 |
++++ linux-2.6.38.4/security/min_addr.c 2011-04-17 15:57:33.000000000 -0400 |
37375 |
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG |
37376 |
*/ |
37377 |
static void update_mmap_min_addr(void) |
37378 |
@@ -60549,9 +58521,9 @@ diff -urNp linux-2.6.38.3/security/min_addr.c linux-2.6.38.3/security/min_addr.c |
37379 |
} |
37380 |
|
37381 |
/* |
37382 |
-diff -urNp linux-2.6.38.3/security/security.c linux-2.6.38.3/security/security.c |
37383 |
---- linux-2.6.38.3/security/security.c 2011-03-14 21:20:32.000000000 -0400 |
37384 |
-+++ linux-2.6.38.3/security/security.c 2011-04-17 15:57:33.000000000 -0400 |
37385 |
+diff -urNp linux-2.6.38.4/security/security.c linux-2.6.38.4/security/security.c |
37386 |
+--- linux-2.6.38.4/security/security.c 2011-03-14 21:20:32.000000000 -0400 |
37387 |
++++ linux-2.6.38.4/security/security.c 2011-04-17 15:57:33.000000000 -0400 |
37388 |
@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI |
37389 |
/* things that live in capability.c */ |
37390 |
extern void __init security_fixup_ops(struct security_operations *ops); |
37391 |
@@ -60573,9 +58545,9 @@ diff -urNp linux-2.6.38.3/security/security.c linux-2.6.38.3/security/security.c |
37392 |
} |
37393 |
|
37394 |
/* Save user chosen LSM */ |
37395 |
-diff -urNp linux-2.6.38.3/security/selinux/hooks.c linux-2.6.38.3/security/selinux/hooks.c |
37396 |
---- linux-2.6.38.3/security/selinux/hooks.c 2011-03-14 21:20:32.000000000 -0400 |
37397 |
-+++ linux-2.6.38.3/security/selinux/hooks.c 2011-04-17 15:57:33.000000000 -0400 |
37398 |
+diff -urNp linux-2.6.38.4/security/selinux/hooks.c linux-2.6.38.4/security/selinux/hooks.c |
37399 |
+--- linux-2.6.38.4/security/selinux/hooks.c 2011-03-14 21:20:32.000000000 -0400 |
37400 |
++++ linux-2.6.38.4/security/selinux/hooks.c 2011-04-17 15:57:33.000000000 -0400 |
37401 |
@@ -90,7 +90,6 @@ |
37402 |
#define NUM_SEL_MNT_OPTS 5 |
37403 |
|
37404 |
@@ -60593,9 +58565,9 @@ diff -urNp linux-2.6.38.3/security/selinux/hooks.c linux-2.6.38.3/security/selin |
37405 |
.name = "selinux", |
37406 |
|
37407 |
.ptrace_access_check = selinux_ptrace_access_check, |
37408 |
-diff -urNp linux-2.6.38.3/security/smack/smack_lsm.c linux-2.6.38.3/security/smack/smack_lsm.c |
37409 |
---- linux-2.6.38.3/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000000 -0400 |
37410 |
-+++ linux-2.6.38.3/security/smack/smack_lsm.c 2011-04-17 15:57:33.000000000 -0400 |
37411 |
+diff -urNp linux-2.6.38.4/security/smack/smack_lsm.c linux-2.6.38.4/security/smack/smack_lsm.c |
37412 |
+--- linux-2.6.38.4/security/smack/smack_lsm.c 2011-03-14 21:20:32.000000000 -0400 |
37413 |
++++ linux-2.6.38.4/security/smack/smack_lsm.c 2011-04-17 15:57:33.000000000 -0400 |
37414 |
@@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct |
37415 |
return 0; |
37416 |
} |
37417 |
@@ -60605,9 +58577,9 @@ diff -urNp linux-2.6.38.3/security/smack/smack_lsm.c linux-2.6.38.3/security/sma |
37418 |
.name = "smack", |
37419 |
|
37420 |
.ptrace_access_check = smack_ptrace_access_check, |
37421 |
-diff -urNp linux-2.6.38.3/security/tomoyo/tomoyo.c linux-2.6.38.3/security/tomoyo/tomoyo.c |
37422 |
---- linux-2.6.38.3/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.000000000 -0400 |
37423 |
-+++ linux-2.6.38.3/security/tomoyo/tomoyo.c 2011-04-17 15:57:33.000000000 -0400 |
37424 |
+diff -urNp linux-2.6.38.4/security/tomoyo/tomoyo.c linux-2.6.38.4/security/tomoyo/tomoyo.c |
37425 |
+--- linux-2.6.38.4/security/tomoyo/tomoyo.c 2011-03-14 21:20:32.000000000 -0400 |
37426 |
++++ linux-2.6.38.4/security/tomoyo/tomoyo.c 2011-04-17 15:57:33.000000000 -0400 |
37427 |
@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa |
37428 |
* tomoyo_security_ops is a "struct security_operations" which is used for |
37429 |
* registering TOMOYO. |
37430 |
@@ -60617,9 +58589,9 @@ diff -urNp linux-2.6.38.3/security/tomoyo/tomoyo.c linux-2.6.38.3/security/tomoy |
37431 |
.name = "tomoyo", |
37432 |
.cred_alloc_blank = tomoyo_cred_alloc_blank, |
37433 |
.cred_prepare = tomoyo_cred_prepare, |
37434 |
-diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.c linux-2.6.38.3/sound/aoa/codecs/onyx.c |
37435 |
---- linux-2.6.38.3/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000 -0400 |
37436 |
-+++ linux-2.6.38.3/sound/aoa/codecs/onyx.c 2011-04-17 15:57:33.000000000 -0400 |
37437 |
+diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.c linux-2.6.38.4/sound/aoa/codecs/onyx.c |
37438 |
+--- linux-2.6.38.4/sound/aoa/codecs/onyx.c 2011-03-14 21:20:32.000000000 -0400 |
37439 |
++++ linux-2.6.38.4/sound/aoa/codecs/onyx.c 2011-04-17 15:57:33.000000000 -0400 |
37440 |
@@ -54,7 +54,7 @@ struct onyx { |
37441 |
spdif_locked:1, |
37442 |
analog_locked:1, |
37443 |
@@ -60648,9 +58620,9 @@ diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.c linux-2.6.38.3/sound/aoa/codec |
37444 |
onyx->spdif_locked = onyx->analog_locked = 0; |
37445 |
mutex_unlock(&onyx->mutex); |
37446 |
|
37447 |
-diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.h linux-2.6.38.3/sound/aoa/codecs/onyx.h |
37448 |
---- linux-2.6.38.3/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000 -0400 |
37449 |
-+++ linux-2.6.38.3/sound/aoa/codecs/onyx.h 2011-04-17 15:57:33.000000000 -0400 |
37450 |
+diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.h linux-2.6.38.4/sound/aoa/codecs/onyx.h |
37451 |
+--- linux-2.6.38.4/sound/aoa/codecs/onyx.h 2011-03-14 21:20:32.000000000 -0400 |
37452 |
++++ linux-2.6.38.4/sound/aoa/codecs/onyx.h 2011-04-17 15:57:33.000000000 -0400 |
37453 |
@@ -11,6 +11,7 @@ |
37454 |
#include <linux/i2c.h> |
37455 |
#include <asm/pmac_low_i2c.h> |
37456 |
@@ -60659,41 +58631,9 @@ diff -urNp linux-2.6.38.3/sound/aoa/codecs/onyx.h linux-2.6.38.3/sound/aoa/codec |
37457 |
|
37458 |
/* PCM3052 register definitions */ |
37459 |
|
37460 |
-diff -urNp linux-2.6.38.3/sound/core/oss/pcm_oss.c linux-2.6.38.3/sound/core/oss/pcm_oss.c |
37461 |
---- linux-2.6.38.3/sound/core/oss/pcm_oss.c 2011-03-14 21:20:32.000000000 -0400 |
37462 |
-+++ linux-2.6.38.3/sound/core/oss/pcm_oss.c 2011-04-17 15:57:33.000000000 -0400 |
37463 |
-@@ -2971,8 +2971,8 @@ static void snd_pcm_oss_proc_done(struct |
37464 |
- } |
37465 |
- } |
37466 |
- #else /* !CONFIG_SND_VERBOSE_PROCFS */ |
37467 |
--#define snd_pcm_oss_proc_init(pcm) |
37468 |
--#define snd_pcm_oss_proc_done(pcm) |
37469 |
-+#define snd_pcm_oss_proc_init(pcm) do {} while (0) |
37470 |
-+#define snd_pcm_oss_proc_done(pcm) do {} while (0) |
37471 |
- #endif /* CONFIG_SND_VERBOSE_PROCFS */ |
37472 |
- |
37473 |
- /* |
37474 |
-diff -urNp linux-2.6.38.3/sound/core/seq/seq_lock.h linux-2.6.38.3/sound/core/seq/seq_lock.h |
37475 |
---- linux-2.6.38.3/sound/core/seq/seq_lock.h 2011-03-14 21:20:32.000000000 -0400 |
37476 |
-+++ linux-2.6.38.3/sound/core/seq/seq_lock.h 2011-04-17 15:57:33.000000000 -0400 |
37477 |
-@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo |
37478 |
- #else /* SMP || CONFIG_SND_DEBUG */ |
37479 |
- |
37480 |
- typedef spinlock_t snd_use_lock_t; /* dummy */ |
37481 |
--#define snd_use_lock_init(lockp) /**/ |
37482 |
--#define snd_use_lock_use(lockp) /**/ |
37483 |
--#define snd_use_lock_free(lockp) /**/ |
37484 |
--#define snd_use_lock_sync(lockp) /**/ |
37485 |
-+#define snd_use_lock_init(lockp) do {} while (0) |
37486 |
-+#define snd_use_lock_use(lockp) do {} while (0) |
37487 |
-+#define snd_use_lock_free(lockp) do {} while (0) |
37488 |
-+#define snd_use_lock_sync(lockp) do {} while (0) |
37489 |
- |
37490 |
- #endif /* SMP || CONFIG_SND_DEBUG */ |
37491 |
- |
37492 |
-diff -urNp linux-2.6.38.3/sound/drivers/mts64.c linux-2.6.38.3/sound/drivers/mts64.c |
37493 |
---- linux-2.6.38.3/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -0400 |
37494 |
-+++ linux-2.6.38.3/sound/drivers/mts64.c 2011-04-17 15:57:33.000000000 -0400 |
37495 |
+diff -urNp linux-2.6.38.4/sound/drivers/mts64.c linux-2.6.38.4/sound/drivers/mts64.c |
37496 |
+--- linux-2.6.38.4/sound/drivers/mts64.c 2011-03-14 21:20:32.000000000 -0400 |
37497 |
++++ linux-2.6.38.4/sound/drivers/mts64.c 2011-04-17 15:57:33.000000000 -0400 |
37498 |
@@ -28,6 +28,7 @@ |
37499 |
#include <sound/initval.h> |
37500 |
#include <sound/rawmidi.h> |
37501 |
@@ -60750,9 +58690,9 @@ diff -urNp linux-2.6.38.3/sound/drivers/mts64.c linux-2.6.38.3/sound/drivers/mts |
37502 |
|
37503 |
return 0; |
37504 |
} |
37505 |
-diff -urNp linux-2.6.38.3/sound/drivers/portman2x4.c linux-2.6.38.3/sound/drivers/portman2x4.c |
37506 |
---- linux-2.6.38.3/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000000 -0400 |
37507 |
-+++ linux-2.6.38.3/sound/drivers/portman2x4.c 2011-04-17 15:57:33.000000000 -0400 |
37508 |
+diff -urNp linux-2.6.38.4/sound/drivers/portman2x4.c linux-2.6.38.4/sound/drivers/portman2x4.c |
37509 |
+--- linux-2.6.38.4/sound/drivers/portman2x4.c 2011-03-14 21:20:32.000000000 -0400 |
37510 |
++++ linux-2.6.38.4/sound/drivers/portman2x4.c 2011-04-17 15:57:33.000000000 -0400 |
37511 |
@@ -47,6 +47,7 @@ |
37512 |
#include <sound/initval.h> |
37513 |
#include <sound/rawmidi.h> |
37514 |
@@ -60770,9 +58710,9 @@ diff -urNp linux-2.6.38.3/sound/drivers/portman2x4.c linux-2.6.38.3/sound/driver |
37515 |
int mode[PORTMAN_NUM_INPUT_PORTS]; |
37516 |
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; |
37517 |
}; |
37518 |
-diff -urNp linux-2.6.38.3/sound/oss/sb_audio.c linux-2.6.38.3/sound/oss/sb_audio.c |
37519 |
---- linux-2.6.38.3/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0400 |
37520 |
-+++ linux-2.6.38.3/sound/oss/sb_audio.c 2011-04-17 15:57:33.000000000 -0400 |
37521 |
+diff -urNp linux-2.6.38.4/sound/oss/sb_audio.c linux-2.6.38.4/sound/oss/sb_audio.c |
37522 |
+--- linux-2.6.38.4/sound/oss/sb_audio.c 2011-03-14 21:20:32.000000000 -0400 |
37523 |
++++ linux-2.6.38.4/sound/oss/sb_audio.c 2011-04-17 15:57:33.000000000 -0400 |
37524 |
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, |
37525 |
buf16 = (signed short *)(localbuf + localoffs); |
37526 |
while (c) |
37527 |
@@ -60782,9 +58722,9 @@ diff -urNp linux-2.6.38.3/sound/oss/sb_audio.c linux-2.6.38.3/sound/oss/sb_audio |
37528 |
if (copy_from_user(lbuf8, |
37529 |
userbuf+useroffs + p, |
37530 |
locallen)) |
37531 |
-diff -urNp linux-2.6.38.3/sound/oss/swarm_cs4297a.c linux-2.6.38.3/sound/oss/swarm_cs4297a.c |
37532 |
---- linux-2.6.38.3/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.000000000 -0400 |
37533 |
-+++ linux-2.6.38.3/sound/oss/swarm_cs4297a.c 2011-04-17 15:57:33.000000000 -0400 |
37534 |
+diff -urNp linux-2.6.38.4/sound/oss/swarm_cs4297a.c linux-2.6.38.4/sound/oss/swarm_cs4297a.c |
37535 |
+--- linux-2.6.38.4/sound/oss/swarm_cs4297a.c 2011-03-14 21:20:32.000000000 -0400 |
37536 |
++++ linux-2.6.38.4/sound/oss/swarm_cs4297a.c 2011-04-17 15:57:33.000000000 -0400 |
37537 |
@@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void) |
37538 |
{ |
37539 |
struct cs4297a_state *s; |
37540 |
@@ -60819,102 +58759,21 @@ diff -urNp linux-2.6.38.3/sound/oss/swarm_cs4297a.c linux-2.6.38.3/sound/oss/swa |
37541 |
|
37542 |
list_add(&s->list, &cs4297a_devs); |
37543 |
|
37544 |
-diff -urNp linux-2.6.38.3/sound/pci/ac97/ac97_patch.c linux-2.6.38.3/sound/pci/ac97/ac97_patch.c |
37545 |
---- linux-2.6.38.3/sound/pci/ac97/ac97_patch.c 2011-03-14 21:20:32.000000000 -0400 |
37546 |
-+++ linux-2.6.38.3/sound/pci/ac97/ac97_patch.c 2011-04-17 15:57:33.000000000 -0400 |
37547 |
-@@ -1486,7 +1486,7 @@ static const struct snd_ac97_res_table a |
37548 |
- { AC97_VIDEO, 0x9f1f }, |
37549 |
- { AC97_AUX, 0x9f1f }, |
37550 |
- { AC97_PCM, 0x9f1f }, |
37551 |
-- { } /* terminator */ |
37552 |
-+ { 0, 0 } /* terminator */ |
37553 |
- }; |
37554 |
- |
37555 |
- static int patch_ad1819(struct snd_ac97 * ac97) |
37556 |
-@@ -3864,7 +3864,7 @@ static struct snd_ac97_res_table lm4550_ |
37557 |
- { AC97_AUX, 0x1f1f }, |
37558 |
- { AC97_PCM, 0x1f1f }, |
37559 |
- { AC97_REC_GAIN, 0x0f0f }, |
37560 |
-- { } /* terminator */ |
37561 |
-+ { 0, 0 } /* terminator */ |
37562 |
- }; |
37563 |
- |
37564 |
- static int patch_lm4550(struct snd_ac97 *ac97) |
37565 |
-diff -urNp linux-2.6.38.3/sound/pci/ens1370.c linux-2.6.38.3/sound/pci/ens1370.c |
37566 |
---- linux-2.6.38.3/sound/pci/ens1370.c 2011-04-18 17:27:18.000000000 -0400 |
37567 |
-+++ linux-2.6.38.3/sound/pci/ens1370.c 2011-04-17 16:54:08.000000000 -0400 |
37568 |
-@@ -453,7 +453,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio |
37569 |
- { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ |
37570 |
- { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ |
37571 |
- #endif |
37572 |
-- { 0, } |
37573 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
37574 |
- }; |
37575 |
- |
37576 |
- MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); |
37577 |
-diff -urNp linux-2.6.38.3/sound/pci/hda/patch_hdmi.c linux-2.6.38.3/sound/pci/hda/patch_hdmi.c |
37578 |
---- linux-2.6.38.3/sound/pci/hda/patch_hdmi.c 2011-04-18 17:27:18.000000000 -0400 |
37579 |
-+++ linux-2.6.38.3/sound/pci/hda/patch_hdmi.c 2011-04-17 16:54:08.000000000 -0400 |
37580 |
-@@ -733,10 +733,10 @@ static void hdmi_non_intrinsic_event(str |
37581 |
- cp_ready); |
37582 |
- |
37583 |
- /* TODO */ |
37584 |
-- if (cp_state) |
37585 |
-- ; |
37586 |
-- if (cp_ready) |
37587 |
-- ; |
37588 |
-+ if (cp_state) { |
37589 |
-+ } |
37590 |
-+ if (cp_ready) { |
37591 |
-+ } |
37592 |
- } |
37593 |
- |
37594 |
- |
37595 |
-diff -urNp linux-2.6.38.3/sound/pci/intel8x0.c linux-2.6.38.3/sound/pci/intel8x0.c |
37596 |
---- linux-2.6.38.3/sound/pci/intel8x0.c 2011-03-14 21:20:32.000000000 -0400 |
37597 |
-+++ linux-2.6.38.3/sound/pci/intel8x0.c 2011-04-17 15:57:33.000000000 -0400 |
37598 |
-@@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel |
37599 |
- { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
37600 |
- { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ |
37601 |
- { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ |
37602 |
-- { 0, } |
37603 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
37604 |
- }; |
37605 |
- |
37606 |
- MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids); |
37607 |
-@@ -2141,7 +2141,7 @@ static struct ac97_quirk ac97_quirks[] _ |
37608 |
- .type = AC97_TUNE_HP_ONLY |
37609 |
- }, |
37610 |
- #endif |
37611 |
-- { } /* terminator */ |
37612 |
-+ { 0, 0, 0, 0, NULL, 0 } /* terminator */ |
37613 |
- }; |
37614 |
- |
37615 |
- static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, |
37616 |
-diff -urNp linux-2.6.38.3/sound/pci/intel8x0m.c linux-2.6.38.3/sound/pci/intel8x0m.c |
37617 |
---- linux-2.6.38.3/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -0400 |
37618 |
-+++ linux-2.6.38.3/sound/pci/intel8x0m.c 2011-04-17 15:57:33.000000000 -0400 |
37619 |
-@@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel |
37620 |
- { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ |
37621 |
- { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ |
37622 |
- #endif |
37623 |
-- { 0, } |
37624 |
-+ { 0, 0, 0, 0, 0, 0, 0 } |
37625 |
- }; |
37626 |
- |
37627 |
- MODULE_DEVICE_TABLE(pci, snd_intel8x0m_ids); |
37628 |
+diff -urNp linux-2.6.38.4/sound/pci/intel8x0m.c linux-2.6.38.4/sound/pci/intel8x0m.c |
37629 |
+--- linux-2.6.38.4/sound/pci/intel8x0m.c 2011-03-14 21:20:32.000000000 -0400 |
37630 |
++++ linux-2.6.38.4/sound/pci/intel8x0m.c 2011-04-23 12:47:28.000000000 -0400 |
37631 |
@@ -1264,7 +1264,7 @@ static struct shortname_table { |
37632 |
{ 0x5455, "ALi M5455" }, |
37633 |
{ 0x746d, "AMD AMD8111" }, |
37634 |
#endif |
37635 |
- { 0 }, |
37636 |
-+ { 0, NULL }, |
37637 |
++ { 0, }, |
37638 |
}; |
37639 |
|
37640 |
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, |
37641 |
-diff -urNp linux-2.6.38.3/usr/gen_init_cpio.c linux-2.6.38.3/usr/gen_init_cpio.c |
37642 |
---- linux-2.6.38.3/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -0400 |
37643 |
-+++ linux-2.6.38.3/usr/gen_init_cpio.c 2011-04-17 15:57:33.000000000 -0400 |
37644 |
+diff -urNp linux-2.6.38.4/usr/gen_init_cpio.c linux-2.6.38.4/usr/gen_init_cpio.c |
37645 |
+--- linux-2.6.38.4/usr/gen_init_cpio.c 2011-03-14 21:20:32.000000000 -0400 |
37646 |
++++ linux-2.6.38.4/usr/gen_init_cpio.c 2011-04-17 15:57:33.000000000 -0400 |
37647 |
@@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name, |
37648 |
int retval; |
37649 |
int rc = -1; |
37650 |
@@ -60937,9 +58796,9 @@ diff -urNp linux-2.6.38.3/usr/gen_init_cpio.c linux-2.6.38.3/usr/gen_init_cpio.c |
37651 |
} else |
37652 |
break; |
37653 |
} |
37654 |
-diff -urNp linux-2.6.38.3/virt/kvm/kvm_main.c linux-2.6.38.3/virt/kvm/kvm_main.c |
37655 |
---- linux-2.6.38.3/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -0400 |
37656 |
-+++ linux-2.6.38.3/virt/kvm/kvm_main.c 2011-04-17 15:57:33.000000000 -0400 |
37657 |
+diff -urNp linux-2.6.38.4/virt/kvm/kvm_main.c linux-2.6.38.4/virt/kvm/kvm_main.c |
37658 |
+--- linux-2.6.38.4/virt/kvm/kvm_main.c 2011-03-14 21:20:32.000000000 -0400 |
37659 |
++++ linux-2.6.38.4/virt/kvm/kvm_main.c 2011-04-23 21:40:37.000000000 -0400 |
37660 |
@@ -1521,7 +1521,7 @@ static int kvm_vcpu_release(struct inode |
37661 |
return 0; |
37662 |
} |
37663 |
@@ -60967,17 +58826,7 @@ diff -urNp linux-2.6.38.3/virt/kvm/kvm_main.c linux-2.6.38.3/virt/kvm/kvm_main.c |
37664 |
.unlocked_ioctl = kvm_dev_ioctl, |
37665 |
.compat_ioctl = kvm_dev_ioctl, |
37666 |
.llseek = noop_llseek, |
37667 |
-@@ -2098,6 +2098,9 @@ static struct miscdevice kvm_dev = { |
37668 |
- KVM_MINOR, |
37669 |
- "kvm", |
37670 |
- &kvm_chardev_ops, |
37671 |
-+ {NULL, NULL}, |
37672 |
-+ NULL, |
37673 |
-+ NULL |
37674 |
- }; |
37675 |
- |
37676 |
- static void hardware_enable_nolock(void *junk) |
37677 |
-@@ -2443,7 +2446,7 @@ static void kvm_sched_out(struct preempt |
37678 |
+@@ -2443,7 +2443,7 @@ static void kvm_sched_out(struct preempt |
37679 |
kvm_arch_vcpu_put(vcpu); |
37680 |
} |
37681 |
|
37682 |
@@ -60986,3 +58835,12 @@ diff -urNp linux-2.6.38.3/virt/kvm/kvm_main.c linux-2.6.38.3/virt/kvm/kvm_main.c |
37683 |
struct module *module) |
37684 |
{ |
37685 |
int r; |
37686 |
+@@ -2514,7 +2514,7 @@ int kvm_init(void *opaque, unsigned vcpu |
37687 |
+ if (!vcpu_align) |
37688 |
+ vcpu_align = __alignof__(struct kvm_vcpu); |
37689 |
+ kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align, |
37690 |
+- 0, NULL); |
37691 |
++ SLAB_USERCOPY, NULL); |
37692 |
+ if (!kvm_vcpu_cache) { |
37693 |
+ r = -ENOMEM; |
37694 |
+ goto out_free_5; |
37695 |
|
37696 |
diff --git a/2.6.38/4422_grsec-mute-warnings.patch b/2.6.38/4422_grsec-mute-warnings.patch |
37697 |
index c921929..e1915d9 100644 |
37698 |
--- a/2.6.38/4422_grsec-mute-warnings.patch |
37699 |
+++ b/2.6.38/4422_grsec-mute-warnings.patch |
37700 |
@@ -1,3 +1,10 @@ |
37701 |
+From: Anthony G. Basile <blueness@g.o> |
37702 |
+Updated patch for 2.6.32.39. |
37703 |
+ |
37704 |
+The credits/description from the original version of this patch remain accurate |
37705 |
+and are included below. |
37706 |
+ |
37707 |
+--- |
37708 |
From: Jory A. Pratt <anarchy@g.o> |
37709 |
Updated patch for kernel 2.6.32 |
37710 |
|
37711 |
@@ -22,14 +29,14 @@ warning flags of vanilla kernel versions. |
37712 |
Acked-by: Christian Heim <phreak@g.o> |
37713 |
--- |
37714 |
|
37715 |
---- a/Makefile 2009-07-29 05:34:01.695857499 +0100 |
37716 |
-+++ b/Makefile 2009-07-29 05:58:15.098857201 +0100 |
37717 |
-@@ -233,7 +233,7 @@ |
37718 |
+--- a/Makefile 2011-04-27 22:52:14.000000000 -0400 |
37719 |
++++ b/Makefile 2011-04-27 23:01:48.000000000 -0400 |
37720 |
+@@ -221,7 +221,7 @@ |
37721 |
|
37722 |
HOSTCC = gcc |
37723 |
HOSTCXX = g++ |
37724 |
--HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
37725 |
-+HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
37726 |
+-HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
37727 |
++HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-missing-field-initializers -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks |
37728 |
HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks |
37729 |
|
37730 |
# Decide whether to build built-in, modular, or both. |