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

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 2.6.32/, 3.1.3/, 3.1.4/
Date: Sun, 04 Dec 2011 17:05:06
Message-Id: bb0d17ef9a62962a7c1a041b2210bdef57ea52be.blueness@gentoo
1 commit: bb0d17ef9a62962a7c1a041b2210bdef57ea52be
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 4 17:04:07 2011 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 4 17:04:07 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=bb0d17ef
7
8 Grsec/PaX: 2.6.32.49-201111292107 + 2.2.2-3.1.4-201112021740
9
10 ---
11 2.6.32/0000_README | 2 +-
12 ..._grsecurity-2.2.2-2.6.32.49-201111292107.patch} | 11 +
13 {3.1.3 => 3.1.4}/0000_README | 6 +-
14 3.1.4/1003_linux-3.1.4.patch | 45 +
15 .../4420_grsecurity-2.2.2-3.1.4-201112021740.patch |10280 +++++++++++---------
16 .../4421_grsec-remove-localversion-grsec.patch | 0
17 {3.1.3 => 3.1.4}/4422_grsec-mute-warnings.patch | 0
18 .../4423_grsec-remove-protected-paths.patch | 0
19 .../4425_grsec-pax-without-grsec.patch | 0
20 .../4430_grsec-kconfig-default-gids.patch | 0
21 {3.1.3 => 3.1.4}/4435_grsec-kconfig-gentoo.patch | 0
22 .../4437-grsec-kconfig-proc-user.patch | 0
23 .../4440_selinux-avc_audit-log-curr_ip.patch | 0
24 {3.1.3 => 3.1.4}/4445_disable-compat_vdso.patch | 0
25 14 files changed, 5718 insertions(+), 4626 deletions(-)
26
27 diff --git a/2.6.32/0000_README b/2.6.32/0000_README
28 index 11a0ad4..5ce8a2a 100644
29 --- a/2.6.32/0000_README
30 +++ b/2.6.32/0000_README
31 @@ -3,7 +3,7 @@ README
32
33 Individual Patch Descriptions:
34 -----------------------------------------------------------------------------
35 -Patch: 4420_grsecurity-2.2.2-2.6.32.49-201111262001.patch
36 +Patch: 4420_grsecurity-2.2.2-2.6.32.49-201111292107.patch
37 From: http://www.grsecurity.net
38 Desc: hardened-sources base patch from upstream grsecurity
39
40
41 diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.49-201111262001.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.49-201111292107.patch
42 similarity index 99%
43 rename from 2.6.32/4420_grsecurity-2.2.2-2.6.32.49-201111262001.patch
44 rename to 2.6.32/4420_grsecurity-2.2.2-2.6.32.49-201111292107.patch
45 index b0d3795..d13b039 100644
46 --- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.49-201111262001.patch
47 +++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.49-201111292107.patch
48 @@ -4454,6 +4454,17 @@ diff -urNp linux-2.6.32.49/arch/sparc/kernel/process_64.c linux-2.6.32.49/arch/s
49 (void *) gp->tpc,
50 (void *) gp->o7,
51 (void *) gp->i7,
52 +diff -urNp linux-2.6.32.49/arch/sparc/kernel/sigutil_64.c linux-2.6.32.49/arch/sparc/kernel/sigutil_64.c
53 +--- linux-2.6.32.49/arch/sparc/kernel/sigutil_64.c 2011-11-08 19:02:43.000000000 -0500
54 ++++ linux-2.6.32.49/arch/sparc/kernel/sigutil_64.c 2011-11-29 18:13:57.000000000 -0500
55 +@@ -2,6 +2,7 @@
56 + #include <linux/types.h>
57 + #include <linux/thread_info.h>
58 + #include <linux/uaccess.h>
59 ++#include <linux/errno.h>
60 +
61 + #include <asm/sigcontext.h>
62 + #include <asm/fpumacro.h>
63 diff -urNp linux-2.6.32.49/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.49/arch/sparc/kernel/sys_sparc_32.c
64 --- linux-2.6.32.49/arch/sparc/kernel/sys_sparc_32.c 2011-11-08 19:02:43.000000000 -0500
65 +++ linux-2.6.32.49/arch/sparc/kernel/sys_sparc_32.c 2011-11-15 19:59:42.000000000 -0500
66
67 diff --git a/3.1.3/0000_README b/3.1.4/0000_README
68 similarity index 92%
69 rename from 3.1.3/0000_README
70 rename to 3.1.4/0000_README
71 index 81ef88b..8bab127 100644
72 --- a/3.1.3/0000_README
73 +++ b/3.1.4/0000_README
74 @@ -3,7 +3,11 @@ README
75
76 Individual Patch Descriptions:
77 -----------------------------------------------------------------------------
78 -Patch: 4420_grsecurity-2.2.2-3.1.3-201111262001.patch
79 +Patch: 1003_linux-3.1.4.patch
80 +From: http://www.kernel.org
81 +Desc: Linux 3.1.4
82 +
83 +Patch: 4420_grsecurity-2.2.2-3.1.4-201112021740.patch
84 From: http://www.grsecurity.net
85 Desc: hardened-sources base patch from upstream grsecurity
86
87
88 diff --git a/3.1.4/1003_linux-3.1.4.patch b/3.1.4/1003_linux-3.1.4.patch
89 new file mode 100644
90 index 0000000..f995031
91 --- /dev/null
92 +++ b/3.1.4/1003_linux-3.1.4.patch
93 @@ -0,0 +1,45 @@
94 +diff --git a/Makefile b/Makefile
95 +index d614254..7f8a93b 100644
96 +--- a/Makefile
97 ++++ b/Makefile
98 +@@ -1,6 +1,6 @@
99 + VERSION = 3
100 + PATCHLEVEL = 1
101 +-SUBLEVEL = 3
102 ++SUBLEVEL = 4
103 + EXTRAVERSION =
104 + NAME = "Divemaster Edition"
105 +
106 +diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
107 +index afef3df..29bec34 100644
108 +--- a/drivers/usb/host/ehci-sched.c
109 ++++ b/drivers/usb/host/ehci-sched.c
110 +@@ -1480,15 +1480,10 @@ iso_stream_schedule (
111 +
112 + /* NOTE: assumes URB_ISO_ASAP, to limit complexity/bugs */
113 +
114 +- /* find a uframe slot with enough bandwidth.
115 +- * Early uframes are more precious because full-speed
116 +- * iso IN transfers can't use late uframes,
117 +- * and therefore they should be allocated last.
118 +- */
119 +- next = start;
120 +- start += period;
121 +- do {
122 +- start--;
123 ++ /* find a uframe slot with enough bandwidth */
124 ++ next = start + period;
125 ++ for (; start < next; start++) {
126 ++
127 + /* check schedule: enough space? */
128 + if (stream->highspeed) {
129 + if (itd_slot_ok(ehci, mod, start,
130 +@@ -1501,7 +1496,7 @@ iso_stream_schedule (
131 + start, sched, period))
132 + break;
133 + }
134 +- } while (start > next);
135 ++ }
136 +
137 + /* no room in the schedule */
138 + if (start == next) {
139
140 diff --git a/3.1.3/4420_grsecurity-2.2.2-3.1.3-201111262001.patch b/3.1.4/4420_grsecurity-2.2.2-3.1.4-201112021740.patch
141 similarity index 87%
142 rename from 3.1.3/4420_grsecurity-2.2.2-3.1.3-201111262001.patch
143 rename to 3.1.4/4420_grsecurity-2.2.2-3.1.4-201112021740.patch
144 index 2cd8ff1..511b7bc 100644
145 --- a/3.1.3/4420_grsecurity-2.2.2-3.1.3-201111262001.patch
146 +++ b/3.1.4/4420_grsecurity-2.2.2-3.1.4-201112021740.patch
147 @@ -1,6 +1,6 @@
148 -diff -urNp linux-3.1.3/arch/alpha/include/asm/elf.h linux-3.1.3/arch/alpha/include/asm/elf.h
149 ---- linux-3.1.3/arch/alpha/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
150 -+++ linux-3.1.3/arch/alpha/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
151 +diff -urNp linux-3.1.4/arch/alpha/include/asm/elf.h linux-3.1.4/arch/alpha/include/asm/elf.h
152 +--- linux-3.1.4/arch/alpha/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
153 ++++ linux-3.1.4/arch/alpha/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
154 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
155
156 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
157 @@ -15,9 +15,9 @@ diff -urNp linux-3.1.3/arch/alpha/include/asm/elf.h linux-3.1.3/arch/alpha/inclu
158 /* $0 is set by ld.so to a pointer to a function which might be
159 registered using atexit. This provides a mean for the dynamic
160 linker to call DT_FINI functions for shared libraries that have
161 -diff -urNp linux-3.1.3/arch/alpha/include/asm/pgtable.h linux-3.1.3/arch/alpha/include/asm/pgtable.h
162 ---- linux-3.1.3/arch/alpha/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
163 -+++ linux-3.1.3/arch/alpha/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
164 +diff -urNp linux-3.1.4/arch/alpha/include/asm/pgtable.h linux-3.1.4/arch/alpha/include/asm/pgtable.h
165 +--- linux-3.1.4/arch/alpha/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
166 ++++ linux-3.1.4/arch/alpha/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
167 @@ -101,6 +101,17 @@ struct vm_area_struct;
168 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
169 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
170 @@ -36,9 +36,9 @@ diff -urNp linux-3.1.3/arch/alpha/include/asm/pgtable.h linux-3.1.3/arch/alpha/i
171 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
172
173 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
174 -diff -urNp linux-3.1.3/arch/alpha/kernel/module.c linux-3.1.3/arch/alpha/kernel/module.c
175 ---- linux-3.1.3/arch/alpha/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
176 -+++ linux-3.1.3/arch/alpha/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
177 +diff -urNp linux-3.1.4/arch/alpha/kernel/module.c linux-3.1.4/arch/alpha/kernel/module.c
178 +--- linux-3.1.4/arch/alpha/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
179 ++++ linux-3.1.4/arch/alpha/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
180 @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
181
182 /* The small sections were sorted to the end of the segment.
183 @@ -48,9 +48,9 @@ diff -urNp linux-3.1.3/arch/alpha/kernel/module.c linux-3.1.3/arch/alpha/kernel/
184 got = sechdrs[me->arch.gotsecindex].sh_addr;
185
186 for (i = 0; i < n; i++) {
187 -diff -urNp linux-3.1.3/arch/alpha/kernel/osf_sys.c linux-3.1.3/arch/alpha/kernel/osf_sys.c
188 ---- linux-3.1.3/arch/alpha/kernel/osf_sys.c 2011-11-11 15:19:27.000000000 -0500
189 -+++ linux-3.1.3/arch/alpha/kernel/osf_sys.c 2011-11-16 18:39:07.000000000 -0500
190 +diff -urNp linux-3.1.4/arch/alpha/kernel/osf_sys.c linux-3.1.4/arch/alpha/kernel/osf_sys.c
191 +--- linux-3.1.4/arch/alpha/kernel/osf_sys.c 2011-11-11 15:19:27.000000000 -0500
192 ++++ linux-3.1.4/arch/alpha/kernel/osf_sys.c 2011-11-16 18:39:07.000000000 -0500
193 @@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long a
194 /* At this point: (!vma || addr < vma->vm_end). */
195 if (limit - len < addr)
196 @@ -82,9 +82,9 @@ diff -urNp linux-3.1.3/arch/alpha/kernel/osf_sys.c linux-3.1.3/arch/alpha/kernel
197 if (addr != (unsigned long) -ENOMEM)
198 return addr;
199
200 -diff -urNp linux-3.1.3/arch/alpha/mm/fault.c linux-3.1.3/arch/alpha/mm/fault.c
201 ---- linux-3.1.3/arch/alpha/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
202 -+++ linux-3.1.3/arch/alpha/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
203 +diff -urNp linux-3.1.4/arch/alpha/mm/fault.c linux-3.1.4/arch/alpha/mm/fault.c
204 +--- linux-3.1.4/arch/alpha/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
205 ++++ linux-3.1.4/arch/alpha/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
206 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
207 __reload_thread(pcb);
208 }
209 @@ -241,9 +241,9 @@ diff -urNp linux-3.1.3/arch/alpha/mm/fault.c linux-3.1.3/arch/alpha/mm/fault.c
210 } else if (!cause) {
211 /* Allow reads even for write-only mappings */
212 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
213 -diff -urNp linux-3.1.3/arch/arm/include/asm/elf.h linux-3.1.3/arch/arm/include/asm/elf.h
214 ---- linux-3.1.3/arch/arm/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
215 -+++ linux-3.1.3/arch/arm/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
216 +diff -urNp linux-3.1.4/arch/arm/include/asm/elf.h linux-3.1.4/arch/arm/include/asm/elf.h
217 +--- linux-3.1.4/arch/arm/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
218 ++++ linux-3.1.4/arch/arm/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
219 @@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
220 the loader. We need to make sure that it is out of the way of the program
221 that it will "exec", and that there is sufficient room for the brk. */
222 @@ -271,9 +271,9 @@ diff -urNp linux-3.1.3/arch/arm/include/asm/elf.h linux-3.1.3/arch/arm/include/a
223 extern int vectors_user_mapping(void);
224 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
225 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
226 -diff -urNp linux-3.1.3/arch/arm/include/asm/kmap_types.h linux-3.1.3/arch/arm/include/asm/kmap_types.h
227 ---- linux-3.1.3/arch/arm/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
228 -+++ linux-3.1.3/arch/arm/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
229 +diff -urNp linux-3.1.4/arch/arm/include/asm/kmap_types.h linux-3.1.4/arch/arm/include/asm/kmap_types.h
230 +--- linux-3.1.4/arch/arm/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
231 ++++ linux-3.1.4/arch/arm/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
232 @@ -21,6 +21,7 @@ enum km_type {
233 KM_L1_CACHE,
234 KM_L2_CACHE,
235 @@ -282,9 +282,9 @@ diff -urNp linux-3.1.3/arch/arm/include/asm/kmap_types.h linux-3.1.3/arch/arm/in
236 KM_TYPE_NR
237 };
238
239 -diff -urNp linux-3.1.3/arch/arm/include/asm/uaccess.h linux-3.1.3/arch/arm/include/asm/uaccess.h
240 ---- linux-3.1.3/arch/arm/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
241 -+++ linux-3.1.3/arch/arm/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
242 +diff -urNp linux-3.1.4/arch/arm/include/asm/uaccess.h linux-3.1.4/arch/arm/include/asm/uaccess.h
243 +--- linux-3.1.4/arch/arm/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
244 ++++ linux-3.1.4/arch/arm/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
245 @@ -22,6 +22,8 @@
246 #define VERIFY_READ 0
247 #define VERIFY_WRITE 1
248 @@ -340,9 +340,9 @@ diff -urNp linux-3.1.3/arch/arm/include/asm/uaccess.h linux-3.1.3/arch/arm/inclu
249 if (access_ok(VERIFY_WRITE, to, n))
250 n = __copy_to_user(to, from, n);
251 return n;
252 -diff -urNp linux-3.1.3/arch/arm/kernel/armksyms.c linux-3.1.3/arch/arm/kernel/armksyms.c
253 ---- linux-3.1.3/arch/arm/kernel/armksyms.c 2011-11-11 15:19:27.000000000 -0500
254 -+++ linux-3.1.3/arch/arm/kernel/armksyms.c 2011-11-16 18:39:07.000000000 -0500
255 +diff -urNp linux-3.1.4/arch/arm/kernel/armksyms.c linux-3.1.4/arch/arm/kernel/armksyms.c
256 +--- linux-3.1.4/arch/arm/kernel/armksyms.c 2011-11-11 15:19:27.000000000 -0500
257 ++++ linux-3.1.4/arch/arm/kernel/armksyms.c 2011-11-16 18:39:07.000000000 -0500
258 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
259 #ifdef CONFIG_MMU
260 EXPORT_SYMBOL(copy_page);
261 @@ -354,9 +354,9 @@ diff -urNp linux-3.1.3/arch/arm/kernel/armksyms.c linux-3.1.3/arch/arm/kernel/ar
262 EXPORT_SYMBOL(__clear_user);
263
264 EXPORT_SYMBOL(__get_user_1);
265 -diff -urNp linux-3.1.3/arch/arm/kernel/process.c linux-3.1.3/arch/arm/kernel/process.c
266 ---- linux-3.1.3/arch/arm/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
267 -+++ linux-3.1.3/arch/arm/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
268 +diff -urNp linux-3.1.4/arch/arm/kernel/process.c linux-3.1.4/arch/arm/kernel/process.c
269 +--- linux-3.1.4/arch/arm/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
270 ++++ linux-3.1.4/arch/arm/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
271 @@ -28,7 +28,6 @@
272 #include <linux/tick.h>
273 #include <linux/utsname.h>
274 @@ -378,9 +378,9 @@ diff -urNp linux-3.1.3/arch/arm/kernel/process.c linux-3.1.3/arch/arm/kernel/pro
275 #ifdef CONFIG_MMU
276 /*
277 * The vectors page is always readable from user space for the
278 -diff -urNp linux-3.1.3/arch/arm/kernel/traps.c linux-3.1.3/arch/arm/kernel/traps.c
279 ---- linux-3.1.3/arch/arm/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
280 -+++ linux-3.1.3/arch/arm/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
281 +diff -urNp linux-3.1.4/arch/arm/kernel/traps.c linux-3.1.4/arch/arm/kernel/traps.c
282 +--- linux-3.1.4/arch/arm/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
283 ++++ linux-3.1.4/arch/arm/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
284 @@ -257,6 +257,8 @@ static int __die(const char *str, int er
285
286 static DEFINE_SPINLOCK(die_lock);
287 @@ -400,9 +400,9 @@ diff -urNp linux-3.1.3/arch/arm/kernel/traps.c linux-3.1.3/arch/arm/kernel/traps
288 if (ret != NOTIFY_STOP)
289 do_exit(SIGSEGV);
290 }
291 -diff -urNp linux-3.1.3/arch/arm/lib/copy_from_user.S linux-3.1.3/arch/arm/lib/copy_from_user.S
292 ---- linux-3.1.3/arch/arm/lib/copy_from_user.S 2011-11-11 15:19:27.000000000 -0500
293 -+++ linux-3.1.3/arch/arm/lib/copy_from_user.S 2011-11-16 18:39:07.000000000 -0500
294 +diff -urNp linux-3.1.4/arch/arm/lib/copy_from_user.S linux-3.1.4/arch/arm/lib/copy_from_user.S
295 +--- linux-3.1.4/arch/arm/lib/copy_from_user.S 2011-11-11 15:19:27.000000000 -0500
296 ++++ linux-3.1.4/arch/arm/lib/copy_from_user.S 2011-11-16 18:39:07.000000000 -0500
297 @@ -16,7 +16,7 @@
298 /*
299 * Prototype:
300 @@ -426,9 +426,9 @@ diff -urNp linux-3.1.3/arch/arm/lib/copy_from_user.S linux-3.1.3/arch/arm/lib/co
301
302 .pushsection .fixup,"ax"
303 .align 0
304 -diff -urNp linux-3.1.3/arch/arm/lib/copy_to_user.S linux-3.1.3/arch/arm/lib/copy_to_user.S
305 ---- linux-3.1.3/arch/arm/lib/copy_to_user.S 2011-11-11 15:19:27.000000000 -0500
306 -+++ linux-3.1.3/arch/arm/lib/copy_to_user.S 2011-11-16 18:39:07.000000000 -0500
307 +diff -urNp linux-3.1.4/arch/arm/lib/copy_to_user.S linux-3.1.4/arch/arm/lib/copy_to_user.S
308 +--- linux-3.1.4/arch/arm/lib/copy_to_user.S 2011-11-11 15:19:27.000000000 -0500
309 ++++ linux-3.1.4/arch/arm/lib/copy_to_user.S 2011-11-16 18:39:07.000000000 -0500
310 @@ -16,7 +16,7 @@
311 /*
312 * Prototype:
313 @@ -452,9 +452,9 @@ diff -urNp linux-3.1.3/arch/arm/lib/copy_to_user.S linux-3.1.3/arch/arm/lib/copy
314 ENDPROC(__copy_to_user_std)
315
316 .pushsection .fixup,"ax"
317 -diff -urNp linux-3.1.3/arch/arm/lib/uaccess.S linux-3.1.3/arch/arm/lib/uaccess.S
318 ---- linux-3.1.3/arch/arm/lib/uaccess.S 2011-11-11 15:19:27.000000000 -0500
319 -+++ linux-3.1.3/arch/arm/lib/uaccess.S 2011-11-16 18:39:07.000000000 -0500
320 +diff -urNp linux-3.1.4/arch/arm/lib/uaccess.S linux-3.1.4/arch/arm/lib/uaccess.S
321 +--- linux-3.1.4/arch/arm/lib/uaccess.S 2011-11-11 15:19:27.000000000 -0500
322 ++++ linux-3.1.4/arch/arm/lib/uaccess.S 2011-11-16 18:39:07.000000000 -0500
323 @@ -20,7 +20,7 @@
324
325 #define PAGE_SHIFT 12
326 @@ -508,9 +508,9 @@ diff -urNp linux-3.1.3/arch/arm/lib/uaccess.S linux-3.1.3/arch/arm/lib/uaccess.S
327
328 .pushsection .fixup,"ax"
329 .align 0
330 -diff -urNp linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c
331 ---- linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c 2011-11-11 15:19:27.000000000 -0500
332 -+++ linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c 2011-11-16 18:39:07.000000000 -0500
333 +diff -urNp linux-3.1.4/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.4/arch/arm/lib/uaccess_with_memcpy.c
334 +--- linux-3.1.4/arch/arm/lib/uaccess_with_memcpy.c 2011-11-11 15:19:27.000000000 -0500
335 ++++ linux-3.1.4/arch/arm/lib/uaccess_with_memcpy.c 2011-11-16 18:39:07.000000000 -0500
336 @@ -103,7 +103,7 @@ out:
337 }
338
339 @@ -520,9 +520,9 @@ diff -urNp linux-3.1.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.3/arch/arm/l
340 {
341 /*
342 * This test is stubbed out of the main function above to keep
343 -diff -urNp linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c
344 ---- linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c 2011-11-11 15:19:27.000000000 -0500
345 -+++ linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c 2011-11-16 18:40:08.000000000 -0500
346 +diff -urNp linux-3.1.4/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.4/arch/arm/mach-ux500/mbox-db5500.c
347 +--- linux-3.1.4/arch/arm/mach-ux500/mbox-db5500.c 2011-11-11 15:19:27.000000000 -0500
348 ++++ linux-3.1.4/arch/arm/mach-ux500/mbox-db5500.c 2011-11-16 18:40:08.000000000 -0500
349 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
350 return sprintf(buf, "0x%X\n", mbox_value);
351 }
352 @@ -532,9 +532,9 @@ diff -urNp linux-3.1.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.3/arch/arm/ma
353
354 static int mbox_show(struct seq_file *s, void *data)
355 {
356 -diff -urNp linux-3.1.3/arch/arm/mm/fault.c linux-3.1.3/arch/arm/mm/fault.c
357 ---- linux-3.1.3/arch/arm/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
358 -+++ linux-3.1.3/arch/arm/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
359 +diff -urNp linux-3.1.4/arch/arm/mm/fault.c linux-3.1.4/arch/arm/mm/fault.c
360 +--- linux-3.1.4/arch/arm/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
361 ++++ linux-3.1.4/arch/arm/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
362 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
363 }
364 #endif
365 @@ -583,9 +583,9 @@ diff -urNp linux-3.1.3/arch/arm/mm/fault.c linux-3.1.3/arch/arm/mm/fault.c
366 /*
367 * First Level Translation Fault Handler
368 *
369 -diff -urNp linux-3.1.3/arch/arm/mm/mmap.c linux-3.1.3/arch/arm/mm/mmap.c
370 ---- linux-3.1.3/arch/arm/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
371 -+++ linux-3.1.3/arch/arm/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
372 +diff -urNp linux-3.1.4/arch/arm/mm/mmap.c linux-3.1.4/arch/arm/mm/mmap.c
373 +--- linux-3.1.4/arch/arm/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
374 ++++ linux-3.1.4/arch/arm/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
375 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
376 if (len > TASK_SIZE)
377 return -ENOMEM;
378 @@ -635,9 +635,9 @@ diff -urNp linux-3.1.3/arch/arm/mm/mmap.c linux-3.1.3/arch/arm/mm/mmap.c
379 /*
380 * Remember the place where we stopped the search:
381 */
382 -diff -urNp linux-3.1.3/arch/avr32/include/asm/elf.h linux-3.1.3/arch/avr32/include/asm/elf.h
383 ---- linux-3.1.3/arch/avr32/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
384 -+++ linux-3.1.3/arch/avr32/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
385 +diff -urNp linux-3.1.4/arch/avr32/include/asm/elf.h linux-3.1.4/arch/avr32/include/asm/elf.h
386 +--- linux-3.1.4/arch/avr32/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
387 ++++ linux-3.1.4/arch/avr32/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
388 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
389 the loader. We need to make sure that it is out of the way of the program
390 that it will "exec", and that there is sufficient room for the brk. */
391 @@ -654,9 +654,9 @@ diff -urNp linux-3.1.3/arch/avr32/include/asm/elf.h linux-3.1.3/arch/avr32/inclu
392
393 /* This yields a mask that user programs can use to figure out what
394 instruction set this CPU supports. This could be done in user space,
395 -diff -urNp linux-3.1.3/arch/avr32/include/asm/kmap_types.h linux-3.1.3/arch/avr32/include/asm/kmap_types.h
396 ---- linux-3.1.3/arch/avr32/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
397 -+++ linux-3.1.3/arch/avr32/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
398 +diff -urNp linux-3.1.4/arch/avr32/include/asm/kmap_types.h linux-3.1.4/arch/avr32/include/asm/kmap_types.h
399 +--- linux-3.1.4/arch/avr32/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
400 ++++ linux-3.1.4/arch/avr32/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
401 @@ -22,7 +22,8 @@ D(10) KM_IRQ0,
402 D(11) KM_IRQ1,
403 D(12) KM_SOFTIRQ0,
404 @@ -667,9 +667,9 @@ diff -urNp linux-3.1.3/arch/avr32/include/asm/kmap_types.h linux-3.1.3/arch/avr3
405 };
406
407 #undef D
408 -diff -urNp linux-3.1.3/arch/avr32/mm/fault.c linux-3.1.3/arch/avr32/mm/fault.c
409 ---- linux-3.1.3/arch/avr32/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
410 -+++ linux-3.1.3/arch/avr32/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
411 +diff -urNp linux-3.1.4/arch/avr32/mm/fault.c linux-3.1.4/arch/avr32/mm/fault.c
412 +--- linux-3.1.4/arch/avr32/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
413 ++++ linux-3.1.4/arch/avr32/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
414 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
415
416 int exception_trace = 1;
417 @@ -711,9 +711,9 @@ diff -urNp linux-3.1.3/arch/avr32/mm/fault.c linux-3.1.3/arch/avr32/mm/fault.c
418 if (exception_trace && printk_ratelimit())
419 printk("%s%s[%d]: segfault at %08lx pc %08lx "
420 "sp %08lx ecr %lu\n",
421 -diff -urNp linux-3.1.3/arch/frv/include/asm/kmap_types.h linux-3.1.3/arch/frv/include/asm/kmap_types.h
422 ---- linux-3.1.3/arch/frv/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
423 -+++ linux-3.1.3/arch/frv/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
424 +diff -urNp linux-3.1.4/arch/frv/include/asm/kmap_types.h linux-3.1.4/arch/frv/include/asm/kmap_types.h
425 +--- linux-3.1.4/arch/frv/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
426 ++++ linux-3.1.4/arch/frv/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
427 @@ -23,6 +23,7 @@ enum km_type {
428 KM_IRQ1,
429 KM_SOFTIRQ0,
430 @@ -722,9 +722,9 @@ diff -urNp linux-3.1.3/arch/frv/include/asm/kmap_types.h linux-3.1.3/arch/frv/in
431 KM_TYPE_NR
432 };
433
434 -diff -urNp linux-3.1.3/arch/frv/mm/elf-fdpic.c linux-3.1.3/arch/frv/mm/elf-fdpic.c
435 ---- linux-3.1.3/arch/frv/mm/elf-fdpic.c 2011-11-11 15:19:27.000000000 -0500
436 -+++ linux-3.1.3/arch/frv/mm/elf-fdpic.c 2011-11-16 18:39:07.000000000 -0500
437 +diff -urNp linux-3.1.4/arch/frv/mm/elf-fdpic.c linux-3.1.4/arch/frv/mm/elf-fdpic.c
438 +--- linux-3.1.4/arch/frv/mm/elf-fdpic.c 2011-11-11 15:19:27.000000000 -0500
439 ++++ linux-3.1.4/arch/frv/mm/elf-fdpic.c 2011-11-16 18:39:07.000000000 -0500
440 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
441 if (addr) {
442 addr = PAGE_ALIGN(addr);
443 @@ -753,9 +753,9 @@ diff -urNp linux-3.1.3/arch/frv/mm/elf-fdpic.c linux-3.1.3/arch/frv/mm/elf-fdpic
444 goto success;
445 addr = vma->vm_end;
446 }
447 -diff -urNp linux-3.1.3/arch/ia64/include/asm/elf.h linux-3.1.3/arch/ia64/include/asm/elf.h
448 ---- linux-3.1.3/arch/ia64/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
449 -+++ linux-3.1.3/arch/ia64/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
450 +diff -urNp linux-3.1.4/arch/ia64/include/asm/elf.h linux-3.1.4/arch/ia64/include/asm/elf.h
451 +--- linux-3.1.4/arch/ia64/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
452 ++++ linux-3.1.4/arch/ia64/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
453 @@ -42,6 +42,13 @@
454 */
455 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
456 @@ -770,9 +770,9 @@ diff -urNp linux-3.1.3/arch/ia64/include/asm/elf.h linux-3.1.3/arch/ia64/include
457 #define PT_IA_64_UNWIND 0x70000001
458
459 /* IA-64 relocations: */
460 -diff -urNp linux-3.1.3/arch/ia64/include/asm/pgtable.h linux-3.1.3/arch/ia64/include/asm/pgtable.h
461 ---- linux-3.1.3/arch/ia64/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
462 -+++ linux-3.1.3/arch/ia64/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
463 +diff -urNp linux-3.1.4/arch/ia64/include/asm/pgtable.h linux-3.1.4/arch/ia64/include/asm/pgtable.h
464 +--- linux-3.1.4/arch/ia64/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
465 ++++ linux-3.1.4/arch/ia64/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
466 @@ -12,7 +12,7 @@
467 * David Mosberger-Tang <davidm@××××××.com>
468 */
469 @@ -800,9 +800,9 @@ diff -urNp linux-3.1.3/arch/ia64/include/asm/pgtable.h linux-3.1.3/arch/ia64/inc
470 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
471 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
472 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
473 -diff -urNp linux-3.1.3/arch/ia64/include/asm/spinlock.h linux-3.1.3/arch/ia64/include/asm/spinlock.h
474 ---- linux-3.1.3/arch/ia64/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
475 -+++ linux-3.1.3/arch/ia64/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
476 +diff -urNp linux-3.1.4/arch/ia64/include/asm/spinlock.h linux-3.1.4/arch/ia64/include/asm/spinlock.h
477 +--- linux-3.1.4/arch/ia64/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
478 ++++ linux-3.1.4/arch/ia64/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
479 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
480 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
481
482 @@ -812,9 +812,9 @@ diff -urNp linux-3.1.3/arch/ia64/include/asm/spinlock.h linux-3.1.3/arch/ia64/in
483 }
484
485 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
486 -diff -urNp linux-3.1.3/arch/ia64/include/asm/uaccess.h linux-3.1.3/arch/ia64/include/asm/uaccess.h
487 ---- linux-3.1.3/arch/ia64/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
488 -+++ linux-3.1.3/arch/ia64/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
489 +diff -urNp linux-3.1.4/arch/ia64/include/asm/uaccess.h linux-3.1.4/arch/ia64/include/asm/uaccess.h
490 +--- linux-3.1.4/arch/ia64/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
491 ++++ linux-3.1.4/arch/ia64/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
492 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
493 const void *__cu_from = (from); \
494 long __cu_len = (n); \
495 @@ -833,9 +833,9 @@ diff -urNp linux-3.1.3/arch/ia64/include/asm/uaccess.h linux-3.1.3/arch/ia64/inc
496 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
497 __cu_len; \
498 })
499 -diff -urNp linux-3.1.3/arch/ia64/kernel/module.c linux-3.1.3/arch/ia64/kernel/module.c
500 ---- linux-3.1.3/arch/ia64/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
501 -+++ linux-3.1.3/arch/ia64/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
502 +diff -urNp linux-3.1.4/arch/ia64/kernel/module.c linux-3.1.4/arch/ia64/kernel/module.c
503 +--- linux-3.1.4/arch/ia64/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
504 ++++ linux-3.1.4/arch/ia64/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
505 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
506 void
507 module_free (struct module *mod, void *module_region)
508 @@ -924,9 +924,9 @@ diff -urNp linux-3.1.3/arch/ia64/kernel/module.c linux-3.1.3/arch/ia64/kernel/mo
509 mod->arch.gp = gp;
510 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
511 }
512 -diff -urNp linux-3.1.3/arch/ia64/kernel/sys_ia64.c linux-3.1.3/arch/ia64/kernel/sys_ia64.c
513 ---- linux-3.1.3/arch/ia64/kernel/sys_ia64.c 2011-11-11 15:19:27.000000000 -0500
514 -+++ linux-3.1.3/arch/ia64/kernel/sys_ia64.c 2011-11-16 18:39:07.000000000 -0500
515 +diff -urNp linux-3.1.4/arch/ia64/kernel/sys_ia64.c linux-3.1.4/arch/ia64/kernel/sys_ia64.c
516 +--- linux-3.1.4/arch/ia64/kernel/sys_ia64.c 2011-11-11 15:19:27.000000000 -0500
517 ++++ linux-3.1.4/arch/ia64/kernel/sys_ia64.c 2011-11-16 18:39:07.000000000 -0500
518 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
519 if (REGION_NUMBER(addr) == RGN_HPAGE)
520 addr = 0;
521 @@ -959,9 +959,9 @@ diff -urNp linux-3.1.3/arch/ia64/kernel/sys_ia64.c linux-3.1.3/arch/ia64/kernel/
522 /* Remember the address where we stopped this search: */
523 mm->free_area_cache = addr + len;
524 return addr;
525 -diff -urNp linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S
526 ---- linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
527 -+++ linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
528 +diff -urNp linux-3.1.4/arch/ia64/kernel/vmlinux.lds.S linux-3.1.4/arch/ia64/kernel/vmlinux.lds.S
529 +--- linux-3.1.4/arch/ia64/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
530 ++++ linux-3.1.4/arch/ia64/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
531 @@ -199,7 +199,7 @@ SECTIONS {
532 /* Per-cpu data: */
533 . = ALIGN(PERCPU_PAGE_SIZE);
534 @@ -971,9 +971,9 @@ diff -urNp linux-3.1.3/arch/ia64/kernel/vmlinux.lds.S linux-3.1.3/arch/ia64/kern
535 /*
536 * ensure percpu data fits
537 * into percpu page size
538 -diff -urNp linux-3.1.3/arch/ia64/mm/fault.c linux-3.1.3/arch/ia64/mm/fault.c
539 ---- linux-3.1.3/arch/ia64/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
540 -+++ linux-3.1.3/arch/ia64/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
541 +diff -urNp linux-3.1.4/arch/ia64/mm/fault.c linux-3.1.4/arch/ia64/mm/fault.c
542 +--- linux-3.1.4/arch/ia64/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
543 ++++ linux-3.1.4/arch/ia64/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
544 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned
545 return pte_present(pte);
546 }
547 @@ -1023,9 +1023,9 @@ diff -urNp linux-3.1.3/arch/ia64/mm/fault.c linux-3.1.3/arch/ia64/mm/fault.c
548 /*
549 * If for any reason at all we couldn't handle the fault, make
550 * sure we exit gracefully rather than endlessly redo the
551 -diff -urNp linux-3.1.3/arch/ia64/mm/hugetlbpage.c linux-3.1.3/arch/ia64/mm/hugetlbpage.c
552 ---- linux-3.1.3/arch/ia64/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
553 -+++ linux-3.1.3/arch/ia64/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
554 +diff -urNp linux-3.1.4/arch/ia64/mm/hugetlbpage.c linux-3.1.4/arch/ia64/mm/hugetlbpage.c
555 +--- linux-3.1.4/arch/ia64/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
556 ++++ linux-3.1.4/arch/ia64/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
557 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
558 /* At this point: (!vmm || addr < vmm->vm_end). */
559 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
560 @@ -1035,9 +1035,9 @@ diff -urNp linux-3.1.3/arch/ia64/mm/hugetlbpage.c linux-3.1.3/arch/ia64/mm/huget
561 return addr;
562 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
563 }
564 -diff -urNp linux-3.1.3/arch/ia64/mm/init.c linux-3.1.3/arch/ia64/mm/init.c
565 ---- linux-3.1.3/arch/ia64/mm/init.c 2011-11-11 15:19:27.000000000 -0500
566 -+++ linux-3.1.3/arch/ia64/mm/init.c 2011-11-16 18:39:07.000000000 -0500
567 +diff -urNp linux-3.1.4/arch/ia64/mm/init.c linux-3.1.4/arch/ia64/mm/init.c
568 +--- linux-3.1.4/arch/ia64/mm/init.c 2011-11-11 15:19:27.000000000 -0500
569 ++++ linux-3.1.4/arch/ia64/mm/init.c 2011-11-16 18:39:07.000000000 -0500
570 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
571 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
572 vma->vm_end = vma->vm_start + PAGE_SIZE;
573 @@ -1058,9 +1058,9 @@ diff -urNp linux-3.1.3/arch/ia64/mm/init.c linux-3.1.3/arch/ia64/mm/init.c
574 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
575 down_write(&current->mm->mmap_sem);
576 if (insert_vm_struct(current->mm, vma)) {
577 -diff -urNp linux-3.1.3/arch/m32r/lib/usercopy.c linux-3.1.3/arch/m32r/lib/usercopy.c
578 ---- linux-3.1.3/arch/m32r/lib/usercopy.c 2011-11-11 15:19:27.000000000 -0500
579 -+++ linux-3.1.3/arch/m32r/lib/usercopy.c 2011-11-16 18:39:07.000000000 -0500
580 +diff -urNp linux-3.1.4/arch/m32r/lib/usercopy.c linux-3.1.4/arch/m32r/lib/usercopy.c
581 +--- linux-3.1.4/arch/m32r/lib/usercopy.c 2011-11-11 15:19:27.000000000 -0500
582 ++++ linux-3.1.4/arch/m32r/lib/usercopy.c 2011-11-16 18:39:07.000000000 -0500
583 @@ -14,6 +14,9 @@
584 unsigned long
585 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
586 @@ -1081,9 +1081,9 @@ diff -urNp linux-3.1.3/arch/m32r/lib/usercopy.c linux-3.1.3/arch/m32r/lib/userco
587 prefetchw(to);
588 if (access_ok(VERIFY_READ, from, n))
589 __copy_user_zeroing(to,from,n);
590 -diff -urNp linux-3.1.3/arch/mips/include/asm/elf.h linux-3.1.3/arch/mips/include/asm/elf.h
591 ---- linux-3.1.3/arch/mips/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
592 -+++ linux-3.1.3/arch/mips/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
593 +diff -urNp linux-3.1.4/arch/mips/include/asm/elf.h linux-3.1.4/arch/mips/include/asm/elf.h
594 +--- linux-3.1.4/arch/mips/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
595 ++++ linux-3.1.4/arch/mips/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
596 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
597 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
598 #endif
599 @@ -1105,9 +1105,9 @@ diff -urNp linux-3.1.3/arch/mips/include/asm/elf.h linux-3.1.3/arch/mips/include
600 -#define arch_randomize_brk arch_randomize_brk
601 -
602 #endif /* _ASM_ELF_H */
603 -diff -urNp linux-3.1.3/arch/mips/include/asm/page.h linux-3.1.3/arch/mips/include/asm/page.h
604 ---- linux-3.1.3/arch/mips/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
605 -+++ linux-3.1.3/arch/mips/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
606 +diff -urNp linux-3.1.4/arch/mips/include/asm/page.h linux-3.1.4/arch/mips/include/asm/page.h
607 +--- linux-3.1.4/arch/mips/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
608 ++++ linux-3.1.4/arch/mips/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
609 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
610 #ifdef CONFIG_CPU_MIPS32
611 typedef struct { unsigned long pte_low, pte_high; } pte_t;
612 @@ -1117,9 +1117,9 @@ diff -urNp linux-3.1.3/arch/mips/include/asm/page.h linux-3.1.3/arch/mips/includ
613 #else
614 typedef struct { unsigned long long pte; } pte_t;
615 #define pte_val(x) ((x).pte)
616 -diff -urNp linux-3.1.3/arch/mips/include/asm/system.h linux-3.1.3/arch/mips/include/asm/system.h
617 ---- linux-3.1.3/arch/mips/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
618 -+++ linux-3.1.3/arch/mips/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
619 +diff -urNp linux-3.1.4/arch/mips/include/asm/system.h linux-3.1.4/arch/mips/include/asm/system.h
620 +--- linux-3.1.4/arch/mips/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
621 ++++ linux-3.1.4/arch/mips/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
622 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
623 */
624 #define __ARCH_WANT_UNLOCKED_CTXSW
625 @@ -1128,9 +1128,9 @@ diff -urNp linux-3.1.3/arch/mips/include/asm/system.h linux-3.1.3/arch/mips/incl
626 +#define arch_align_stack(x) ((x) & ~0xfUL)
627
628 #endif /* _ASM_SYSTEM_H */
629 -diff -urNp linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c
630 ---- linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c 2011-11-11 15:19:27.000000000 -0500
631 -+++ linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c 2011-11-16 18:39:07.000000000 -0500
632 +diff -urNp linux-3.1.4/arch/mips/kernel/binfmt_elfn32.c linux-3.1.4/arch/mips/kernel/binfmt_elfn32.c
633 +--- linux-3.1.4/arch/mips/kernel/binfmt_elfn32.c 2011-11-11 15:19:27.000000000 -0500
634 ++++ linux-3.1.4/arch/mips/kernel/binfmt_elfn32.c 2011-11-16 18:39:07.000000000 -0500
635 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
636 #undef ELF_ET_DYN_BASE
637 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
638 @@ -1145,9 +1145,9 @@ diff -urNp linux-3.1.3/arch/mips/kernel/binfmt_elfn32.c linux-3.1.3/arch/mips/ke
639 #include <asm/processor.h>
640 #include <linux/module.h>
641 #include <linux/elfcore.h>
642 -diff -urNp linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c
643 ---- linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c 2011-11-11 15:19:27.000000000 -0500
644 -+++ linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c 2011-11-16 18:39:07.000000000 -0500
645 +diff -urNp linux-3.1.4/arch/mips/kernel/binfmt_elfo32.c linux-3.1.4/arch/mips/kernel/binfmt_elfo32.c
646 +--- linux-3.1.4/arch/mips/kernel/binfmt_elfo32.c 2011-11-11 15:19:27.000000000 -0500
647 ++++ linux-3.1.4/arch/mips/kernel/binfmt_elfo32.c 2011-11-16 18:39:07.000000000 -0500
648 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
649 #undef ELF_ET_DYN_BASE
650 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
651 @@ -1162,9 +1162,9 @@ diff -urNp linux-3.1.3/arch/mips/kernel/binfmt_elfo32.c linux-3.1.3/arch/mips/ke
652 #include <asm/processor.h>
653
654 /*
655 -diff -urNp linux-3.1.3/arch/mips/kernel/process.c linux-3.1.3/arch/mips/kernel/process.c
656 ---- linux-3.1.3/arch/mips/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
657 -+++ linux-3.1.3/arch/mips/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
658 +diff -urNp linux-3.1.4/arch/mips/kernel/process.c linux-3.1.4/arch/mips/kernel/process.c
659 +--- linux-3.1.4/arch/mips/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
660 ++++ linux-3.1.4/arch/mips/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
661 @@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_stru
662 out:
663 return pc;
664 @@ -1181,9 +1181,9 @@ diff -urNp linux-3.1.3/arch/mips/kernel/process.c linux-3.1.3/arch/mips/kernel/p
665 -
666 - return sp & ALMASK;
667 -}
668 -diff -urNp linux-3.1.3/arch/mips/mm/fault.c linux-3.1.3/arch/mips/mm/fault.c
669 ---- linux-3.1.3/arch/mips/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
670 -+++ linux-3.1.3/arch/mips/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
671 +diff -urNp linux-3.1.4/arch/mips/mm/fault.c linux-3.1.4/arch/mips/mm/fault.c
672 +--- linux-3.1.4/arch/mips/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
673 ++++ linux-3.1.4/arch/mips/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
674 @@ -28,6 +28,23 @@
675 #include <asm/highmem.h> /* For VMALLOC_END */
676 #include <linux/kdebug.h>
677 @@ -1208,9 +1208,9 @@ diff -urNp linux-3.1.3/arch/mips/mm/fault.c linux-3.1.3/arch/mips/mm/fault.c
678 /*
679 * This routine handles page faults. It determines the address,
680 * and the problem, and then passes it off to one of the appropriate
681 -diff -urNp linux-3.1.3/arch/mips/mm/mmap.c linux-3.1.3/arch/mips/mm/mmap.c
682 ---- linux-3.1.3/arch/mips/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
683 -+++ linux-3.1.3/arch/mips/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
684 +diff -urNp linux-3.1.4/arch/mips/mm/mmap.c linux-3.1.4/arch/mips/mm/mmap.c
685 +--- linux-3.1.4/arch/mips/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
686 ++++ linux-3.1.4/arch/mips/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
687 @@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_a
688 do_color_align = 1;
689
690 @@ -1291,9 +1291,9 @@ diff -urNp linux-3.1.3/arch/mips/mm/mmap.c linux-3.1.3/arch/mips/mm/mmap.c
691 -
692 - return ret;
693 -}
694 -diff -urNp linux-3.1.3/arch/parisc/include/asm/elf.h linux-3.1.3/arch/parisc/include/asm/elf.h
695 ---- linux-3.1.3/arch/parisc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
696 -+++ linux-3.1.3/arch/parisc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
697 +diff -urNp linux-3.1.4/arch/parisc/include/asm/elf.h linux-3.1.4/arch/parisc/include/asm/elf.h
698 +--- linux-3.1.4/arch/parisc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
699 ++++ linux-3.1.4/arch/parisc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
700 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
701
702 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
703 @@ -1308,9 +1308,9 @@ diff -urNp linux-3.1.3/arch/parisc/include/asm/elf.h linux-3.1.3/arch/parisc/inc
704 /* This yields a mask that user programs can use to figure out what
705 instruction set this CPU supports. This could be done in user space,
706 but it's not easy, and we've already done it here. */
707 -diff -urNp linux-3.1.3/arch/parisc/include/asm/pgtable.h linux-3.1.3/arch/parisc/include/asm/pgtable.h
708 ---- linux-3.1.3/arch/parisc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
709 -+++ linux-3.1.3/arch/parisc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
710 +diff -urNp linux-3.1.4/arch/parisc/include/asm/pgtable.h linux-3.1.4/arch/parisc/include/asm/pgtable.h
711 +--- linux-3.1.4/arch/parisc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
712 ++++ linux-3.1.4/arch/parisc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
713 @@ -210,6 +210,17 @@ struct vm_area_struct;
714 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
715 #define PAGE_COPY PAGE_EXECREAD
716 @@ -1329,9 +1329,9 @@ diff -urNp linux-3.1.3/arch/parisc/include/asm/pgtable.h linux-3.1.3/arch/parisc
717 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
718 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
719 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
720 -diff -urNp linux-3.1.3/arch/parisc/kernel/module.c linux-3.1.3/arch/parisc/kernel/module.c
721 ---- linux-3.1.3/arch/parisc/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
722 -+++ linux-3.1.3/arch/parisc/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
723 +diff -urNp linux-3.1.4/arch/parisc/kernel/module.c linux-3.1.4/arch/parisc/kernel/module.c
724 +--- linux-3.1.4/arch/parisc/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
725 ++++ linux-3.1.4/arch/parisc/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
726 @@ -98,16 +98,38 @@
727
728 /* three functions to determine where in the module core
729 @@ -1432,9 +1432,9 @@ diff -urNp linux-3.1.3/arch/parisc/kernel/module.c linux-3.1.3/arch/parisc/kerne
730
731 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
732 me->arch.unwind_section, table, end, gp);
733 -diff -urNp linux-3.1.3/arch/parisc/kernel/sys_parisc.c linux-3.1.3/arch/parisc/kernel/sys_parisc.c
734 ---- linux-3.1.3/arch/parisc/kernel/sys_parisc.c 2011-11-11 15:19:27.000000000 -0500
735 -+++ linux-3.1.3/arch/parisc/kernel/sys_parisc.c 2011-11-16 18:39:07.000000000 -0500
736 +diff -urNp linux-3.1.4/arch/parisc/kernel/sys_parisc.c linux-3.1.4/arch/parisc/kernel/sys_parisc.c
737 +--- linux-3.1.4/arch/parisc/kernel/sys_parisc.c 2011-11-11 15:19:27.000000000 -0500
738 ++++ linux-3.1.4/arch/parisc/kernel/sys_parisc.c 2011-11-16 18:39:07.000000000 -0500
739 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
740 /* At this point: (!vma || addr < vma->vm_end). */
741 if (TASK_SIZE - len < addr)
742 @@ -1462,9 +1462,9 @@ diff -urNp linux-3.1.3/arch/parisc/kernel/sys_parisc.c linux-3.1.3/arch/parisc/k
743
744 if (filp) {
745 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
746 -diff -urNp linux-3.1.3/arch/parisc/kernel/traps.c linux-3.1.3/arch/parisc/kernel/traps.c
747 ---- linux-3.1.3/arch/parisc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
748 -+++ linux-3.1.3/arch/parisc/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
749 +diff -urNp linux-3.1.4/arch/parisc/kernel/traps.c linux-3.1.4/arch/parisc/kernel/traps.c
750 +--- linux-3.1.4/arch/parisc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
751 ++++ linux-3.1.4/arch/parisc/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
752 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
753
754 down_read(&current->mm->mmap_sem);
755 @@ -1476,9 +1476,9 @@ diff -urNp linux-3.1.3/arch/parisc/kernel/traps.c linux-3.1.3/arch/parisc/kernel
756 fault_address = regs->iaoq[0];
757 fault_space = regs->iasq[0];
758
759 -diff -urNp linux-3.1.3/arch/parisc/mm/fault.c linux-3.1.3/arch/parisc/mm/fault.c
760 ---- linux-3.1.3/arch/parisc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
761 -+++ linux-3.1.3/arch/parisc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
762 +diff -urNp linux-3.1.4/arch/parisc/mm/fault.c linux-3.1.4/arch/parisc/mm/fault.c
763 +--- linux-3.1.4/arch/parisc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
764 ++++ linux-3.1.4/arch/parisc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
765 @@ -15,6 +15,7 @@
766 #include <linux/sched.h>
767 #include <linux/interrupt.h>
768 @@ -1648,9 +1648,9 @@ diff -urNp linux-3.1.3/arch/parisc/mm/fault.c linux-3.1.3/arch/parisc/mm/fault.c
769
770 /*
771 * If for any reason at all we couldn't handle the fault, make
772 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/elf.h linux-3.1.3/arch/powerpc/include/asm/elf.h
773 ---- linux-3.1.3/arch/powerpc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
774 -+++ linux-3.1.3/arch/powerpc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
775 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/elf.h linux-3.1.4/arch/powerpc/include/asm/elf.h
776 +--- linux-3.1.4/arch/powerpc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
777 ++++ linux-3.1.4/arch/powerpc/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
778 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
779 the loader. We need to make sure that it is out of the way of the program
780 that it will "exec", and that there is sufficient room for the brk. */
781 @@ -1683,9 +1683,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/elf.h linux-3.1.3/arch/powerpc/i
782 #endif /* __KERNEL__ */
783
784 /*
785 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/kmap_types.h linux-3.1.3/arch/powerpc/include/asm/kmap_types.h
786 ---- linux-3.1.3/arch/powerpc/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
787 -+++ linux-3.1.3/arch/powerpc/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
788 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/kmap_types.h linux-3.1.4/arch/powerpc/include/asm/kmap_types.h
789 +--- linux-3.1.4/arch/powerpc/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
790 ++++ linux-3.1.4/arch/powerpc/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
791 @@ -27,6 +27,7 @@ enum km_type {
792 KM_PPC_SYNC_PAGE,
793 KM_PPC_SYNC_ICACHE,
794 @@ -1694,9 +1694,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/kmap_types.h linux-3.1.3/arch/po
795 KM_TYPE_NR
796 };
797
798 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/mman.h linux-3.1.3/arch/powerpc/include/asm/mman.h
799 ---- linux-3.1.3/arch/powerpc/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
800 -+++ linux-3.1.3/arch/powerpc/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
801 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/mman.h linux-3.1.4/arch/powerpc/include/asm/mman.h
802 +--- linux-3.1.4/arch/powerpc/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
803 ++++ linux-3.1.4/arch/powerpc/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
804 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm
805 }
806 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
807 @@ -1706,9 +1706,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/mman.h linux-3.1.3/arch/powerpc/
808 {
809 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
810 }
811 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/page_64.h linux-3.1.3/arch/powerpc/include/asm/page_64.h
812 ---- linux-3.1.3/arch/powerpc/include/asm/page_64.h 2011-11-11 15:19:27.000000000 -0500
813 -+++ linux-3.1.3/arch/powerpc/include/asm/page_64.h 2011-11-16 18:39:07.000000000 -0500
814 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/page_64.h linux-3.1.4/arch/powerpc/include/asm/page_64.h
815 +--- linux-3.1.4/arch/powerpc/include/asm/page_64.h 2011-11-11 15:19:27.000000000 -0500
816 ++++ linux-3.1.4/arch/powerpc/include/asm/page_64.h 2011-11-16 18:39:07.000000000 -0500
817 @@ -155,15 +155,18 @@ do { \
818 * stack by default, so in the absence of a PT_GNU_STACK program header
819 * we turn execute permission off.
820 @@ -1730,9 +1730,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/page_64.h linux-3.1.3/arch/power
821
822 #include <asm-generic/getorder.h>
823
824 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/page.h linux-3.1.3/arch/powerpc/include/asm/page.h
825 ---- linux-3.1.3/arch/powerpc/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
826 -+++ linux-3.1.3/arch/powerpc/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
827 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/page.h linux-3.1.4/arch/powerpc/include/asm/page.h
828 +--- linux-3.1.4/arch/powerpc/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
829 ++++ linux-3.1.4/arch/powerpc/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
830 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
831 * and needs to be executable. This means the whole heap ends
832 * up being executable.
833 @@ -1755,9 +1755,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/page.h linux-3.1.3/arch/powerpc/
834 #ifndef __ASSEMBLY__
835
836 #undef STRICT_MM_TYPECHECKS
837 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/pgtable.h linux-3.1.3/arch/powerpc/include/asm/pgtable.h
838 ---- linux-3.1.3/arch/powerpc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
839 -+++ linux-3.1.3/arch/powerpc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
840 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/pgtable.h linux-3.1.4/arch/powerpc/include/asm/pgtable.h
841 +--- linux-3.1.4/arch/powerpc/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
842 ++++ linux-3.1.4/arch/powerpc/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
843 @@ -2,6 +2,7 @@
844 #define _ASM_POWERPC_PGTABLE_H
845 #ifdef __KERNEL__
846 @@ -1766,9 +1766,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/pgtable.h linux-3.1.3/arch/power
847 #ifndef __ASSEMBLY__
848 #include <asm/processor.h> /* For TASK_SIZE */
849 #include <asm/mmu.h>
850 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h
851 ---- linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h 2011-11-11 15:19:27.000000000 -0500
852 -+++ linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h 2011-11-16 18:39:07.000000000 -0500
853 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/pte-hash32.h linux-3.1.4/arch/powerpc/include/asm/pte-hash32.h
854 +--- linux-3.1.4/arch/powerpc/include/asm/pte-hash32.h 2011-11-11 15:19:27.000000000 -0500
855 ++++ linux-3.1.4/arch/powerpc/include/asm/pte-hash32.h 2011-11-16 18:39:07.000000000 -0500
856 @@ -21,6 +21,7 @@
857 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
858 #define _PAGE_USER 0x004 /* usermode access allowed */
859 @@ -1777,9 +1777,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/pte-hash32.h linux-3.1.3/arch/po
860 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
861 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
862 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
863 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/reg.h linux-3.1.3/arch/powerpc/include/asm/reg.h
864 ---- linux-3.1.3/arch/powerpc/include/asm/reg.h 2011-11-11 15:19:27.000000000 -0500
865 -+++ linux-3.1.3/arch/powerpc/include/asm/reg.h 2011-11-16 18:39:07.000000000 -0500
866 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/reg.h linux-3.1.4/arch/powerpc/include/asm/reg.h
867 +--- linux-3.1.4/arch/powerpc/include/asm/reg.h 2011-11-11 15:19:27.000000000 -0500
868 ++++ linux-3.1.4/arch/powerpc/include/asm/reg.h 2011-11-16 18:39:07.000000000 -0500
869 @@ -212,6 +212,7 @@
870 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
871 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
872 @@ -1788,9 +1788,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/reg.h linux-3.1.3/arch/powerpc/i
873 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
874 #define DSISR_ISSTORE 0x02000000 /* access was a store */
875 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
876 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/system.h linux-3.1.3/arch/powerpc/include/asm/system.h
877 ---- linux-3.1.3/arch/powerpc/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
878 -+++ linux-3.1.3/arch/powerpc/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
879 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/system.h linux-3.1.4/arch/powerpc/include/asm/system.h
880 +--- linux-3.1.4/arch/powerpc/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
881 ++++ linux-3.1.4/arch/powerpc/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
882 @@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsi
883 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
884 #endif
885 @@ -1800,9 +1800,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/system.h linux-3.1.3/arch/powerp
886
887 /* Used in very early kernel initialization. */
888 extern unsigned long reloc_offset(void);
889 -diff -urNp linux-3.1.3/arch/powerpc/include/asm/uaccess.h linux-3.1.3/arch/powerpc/include/asm/uaccess.h
890 ---- linux-3.1.3/arch/powerpc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
891 -+++ linux-3.1.3/arch/powerpc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
892 +diff -urNp linux-3.1.4/arch/powerpc/include/asm/uaccess.h linux-3.1.4/arch/powerpc/include/asm/uaccess.h
893 +--- linux-3.1.4/arch/powerpc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
894 ++++ linux-3.1.4/arch/powerpc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
895 @@ -13,6 +13,8 @@
896 #define VERIFY_READ 0
897 #define VERIFY_WRITE 1
898 @@ -1980,9 +1980,9 @@ diff -urNp linux-3.1.3/arch/powerpc/include/asm/uaccess.h linux-3.1.3/arch/power
899 extern unsigned long __clear_user(void __user *addr, unsigned long size);
900
901 static inline unsigned long clear_user(void __user *addr, unsigned long size)
902 -diff -urNp linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S
903 ---- linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S 2011-11-11 15:19:27.000000000 -0500
904 -+++ linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S 2011-11-16 18:39:07.000000000 -0500
905 +diff -urNp linux-3.1.4/arch/powerpc/kernel/exceptions-64e.S linux-3.1.4/arch/powerpc/kernel/exceptions-64e.S
906 +--- linux-3.1.4/arch/powerpc/kernel/exceptions-64e.S 2011-11-11 15:19:27.000000000 -0500
907 ++++ linux-3.1.4/arch/powerpc/kernel/exceptions-64e.S 2011-11-16 18:39:07.000000000 -0500
908 @@ -587,6 +587,7 @@ storage_fault_common:
909 std r14,_DAR(r1)
910 std r15,_DSISR(r1)
911 @@ -2001,9 +2001,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/exceptions-64e.S linux-3.1.3/arch/pow
912 addi r3,r1,STACK_FRAME_OVERHEAD
913 ld r4,_DAR(r1)
914 bl .bad_page_fault
915 -diff -urNp linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S
916 ---- linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S 2011-11-11 15:19:27.000000000 -0500
917 -+++ linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S 2011-11-16 18:39:07.000000000 -0500
918 +diff -urNp linux-3.1.4/arch/powerpc/kernel/exceptions-64s.S linux-3.1.4/arch/powerpc/kernel/exceptions-64s.S
919 +--- linux-3.1.4/arch/powerpc/kernel/exceptions-64s.S 2011-11-11 15:19:27.000000000 -0500
920 ++++ linux-3.1.4/arch/powerpc/kernel/exceptions-64s.S 2011-11-16 18:39:07.000000000 -0500
921 @@ -1014,10 +1014,10 @@ handle_page_fault:
922 11: ld r4,_DAR(r1)
923 ld r5,_DSISR(r1)
924 @@ -2016,9 +2016,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/exceptions-64s.S linux-3.1.3/arch/pow
925 mr r5,r3
926 addi r3,r1,STACK_FRAME_OVERHEAD
927 lwz r4,_DAR(r1)
928 -diff -urNp linux-3.1.3/arch/powerpc/kernel/module_32.c linux-3.1.3/arch/powerpc/kernel/module_32.c
929 ---- linux-3.1.3/arch/powerpc/kernel/module_32.c 2011-11-11 15:19:27.000000000 -0500
930 -+++ linux-3.1.3/arch/powerpc/kernel/module_32.c 2011-11-16 18:39:07.000000000 -0500
931 +diff -urNp linux-3.1.4/arch/powerpc/kernel/module_32.c linux-3.1.4/arch/powerpc/kernel/module_32.c
932 +--- linux-3.1.4/arch/powerpc/kernel/module_32.c 2011-11-11 15:19:27.000000000 -0500
933 ++++ linux-3.1.4/arch/powerpc/kernel/module_32.c 2011-11-16 18:39:07.000000000 -0500
934 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
935 me->arch.core_plt_section = i;
936 }
937 @@ -2048,9 +2048,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/module_32.c linux-3.1.3/arch/powerpc/
938
939 /* Find this entry, or if that fails, the next avail. entry */
940 while (entry->jump[0]) {
941 -diff -urNp linux-3.1.3/arch/powerpc/kernel/process.c linux-3.1.3/arch/powerpc/kernel/process.c
942 ---- linux-3.1.3/arch/powerpc/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
943 -+++ linux-3.1.3/arch/powerpc/kernel/process.c 2011-11-16 18:40:08.000000000 -0500
944 +diff -urNp linux-3.1.4/arch/powerpc/kernel/process.c linux-3.1.4/arch/powerpc/kernel/process.c
945 +--- linux-3.1.4/arch/powerpc/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
946 ++++ linux-3.1.4/arch/powerpc/kernel/process.c 2011-11-16 18:40:08.000000000 -0500
947 @@ -682,8 +682,8 @@ void show_regs(struct pt_regs * regs)
948 * Lookup NIP late so we have the best change of getting the
949 * above info out without failing
950 @@ -2143,9 +2143,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/process.c linux-3.1.3/arch/powerpc/ke
951 -
952 - return ret;
953 -}
954 -diff -urNp linux-3.1.3/arch/powerpc/kernel/signal_32.c linux-3.1.3/arch/powerpc/kernel/signal_32.c
955 ---- linux-3.1.3/arch/powerpc/kernel/signal_32.c 2011-11-11 15:19:27.000000000 -0500
956 -+++ linux-3.1.3/arch/powerpc/kernel/signal_32.c 2011-11-16 18:39:07.000000000 -0500
957 +diff -urNp linux-3.1.4/arch/powerpc/kernel/signal_32.c linux-3.1.4/arch/powerpc/kernel/signal_32.c
958 +--- linux-3.1.4/arch/powerpc/kernel/signal_32.c 2011-11-11 15:19:27.000000000 -0500
959 ++++ linux-3.1.4/arch/powerpc/kernel/signal_32.c 2011-11-16 18:39:07.000000000 -0500
960 @@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig
961 /* Save user registers on the stack */
962 frame = &rt_sf->uc.uc_mcontext;
963 @@ -2155,9 +2155,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/signal_32.c linux-3.1.3/arch/powerpc/
964 if (save_user_regs(regs, frame, 0, 1))
965 goto badframe;
966 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
967 -diff -urNp linux-3.1.3/arch/powerpc/kernel/signal_64.c linux-3.1.3/arch/powerpc/kernel/signal_64.c
968 ---- linux-3.1.3/arch/powerpc/kernel/signal_64.c 2011-11-11 15:19:27.000000000 -0500
969 -+++ linux-3.1.3/arch/powerpc/kernel/signal_64.c 2011-11-16 18:39:07.000000000 -0500
970 +diff -urNp linux-3.1.4/arch/powerpc/kernel/signal_64.c linux-3.1.4/arch/powerpc/kernel/signal_64.c
971 +--- linux-3.1.4/arch/powerpc/kernel/signal_64.c 2011-11-11 15:19:27.000000000 -0500
972 ++++ linux-3.1.4/arch/powerpc/kernel/signal_64.c 2011-11-16 18:39:07.000000000 -0500
973 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
974 current->thread.fpscr.val = 0;
975
976 @@ -2167,9 +2167,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/signal_64.c linux-3.1.3/arch/powerpc/
977 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
978 } else {
979 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
980 -diff -urNp linux-3.1.3/arch/powerpc/kernel/traps.c linux-3.1.3/arch/powerpc/kernel/traps.c
981 ---- linux-3.1.3/arch/powerpc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
982 -+++ linux-3.1.3/arch/powerpc/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
983 +diff -urNp linux-3.1.4/arch/powerpc/kernel/traps.c linux-3.1.4/arch/powerpc/kernel/traps.c
984 +--- linux-3.1.4/arch/powerpc/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
985 ++++ linux-3.1.4/arch/powerpc/kernel/traps.c 2011-11-16 18:40:08.000000000 -0500
986 @@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
987 static inline void pmac_backlight_unblank(void) { }
988 #endif
989 @@ -2188,9 +2188,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/traps.c linux-3.1.3/arch/powerpc/kern
990 oops_exit();
991 do_exit(err);
992
993 -diff -urNp linux-3.1.3/arch/powerpc/kernel/vdso.c linux-3.1.3/arch/powerpc/kernel/vdso.c
994 ---- linux-3.1.3/arch/powerpc/kernel/vdso.c 2011-11-11 15:19:27.000000000 -0500
995 -+++ linux-3.1.3/arch/powerpc/kernel/vdso.c 2011-11-16 18:39:07.000000000 -0500
996 +diff -urNp linux-3.1.4/arch/powerpc/kernel/vdso.c linux-3.1.4/arch/powerpc/kernel/vdso.c
997 +--- linux-3.1.4/arch/powerpc/kernel/vdso.c 2011-11-11 15:19:27.000000000 -0500
998 ++++ linux-3.1.4/arch/powerpc/kernel/vdso.c 2011-11-16 18:39:07.000000000 -0500
999 @@ -36,6 +36,7 @@
1000 #include <asm/firmware.h>
1001 #include <asm/vdso.h>
1002 @@ -2217,9 +2217,9 @@ diff -urNp linux-3.1.3/arch/powerpc/kernel/vdso.c linux-3.1.3/arch/powerpc/kerne
1003 if (IS_ERR_VALUE(vdso_base)) {
1004 rc = vdso_base;
1005 goto fail_mmapsem;
1006 -diff -urNp linux-3.1.3/arch/powerpc/lib/usercopy_64.c linux-3.1.3/arch/powerpc/lib/usercopy_64.c
1007 ---- linux-3.1.3/arch/powerpc/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
1008 -+++ linux-3.1.3/arch/powerpc/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
1009 +diff -urNp linux-3.1.4/arch/powerpc/lib/usercopy_64.c linux-3.1.4/arch/powerpc/lib/usercopy_64.c
1010 +--- linux-3.1.4/arch/powerpc/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
1011 ++++ linux-3.1.4/arch/powerpc/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
1012 @@ -9,22 +9,6 @@
1013 #include <linux/module.h>
1014 #include <asm/uaccess.h>
1015 @@ -2251,9 +2251,9 @@ diff -urNp linux-3.1.3/arch/powerpc/lib/usercopy_64.c linux-3.1.3/arch/powerpc/l
1016 -EXPORT_SYMBOL(copy_to_user);
1017 EXPORT_SYMBOL(copy_in_user);
1018
1019 -diff -urNp linux-3.1.3/arch/powerpc/mm/fault.c linux-3.1.3/arch/powerpc/mm/fault.c
1020 ---- linux-3.1.3/arch/powerpc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
1021 -+++ linux-3.1.3/arch/powerpc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
1022 +diff -urNp linux-3.1.4/arch/powerpc/mm/fault.c linux-3.1.4/arch/powerpc/mm/fault.c
1023 +--- linux-3.1.4/arch/powerpc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
1024 ++++ linux-3.1.4/arch/powerpc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
1025 @@ -32,6 +32,10 @@
1026 #include <linux/perf_event.h>
1027 #include <linux/magic.h>
1028 @@ -2358,9 +2358,9 @@ diff -urNp linux-3.1.3/arch/powerpc/mm/fault.c linux-3.1.3/arch/powerpc/mm/fault
1029 _exception(SIGSEGV, regs, code, address);
1030 return 0;
1031 }
1032 -diff -urNp linux-3.1.3/arch/powerpc/mm/mmap_64.c linux-3.1.3/arch/powerpc/mm/mmap_64.c
1033 ---- linux-3.1.3/arch/powerpc/mm/mmap_64.c 2011-11-11 15:19:27.000000000 -0500
1034 -+++ linux-3.1.3/arch/powerpc/mm/mmap_64.c 2011-11-16 18:39:07.000000000 -0500
1035 +diff -urNp linux-3.1.4/arch/powerpc/mm/mmap_64.c linux-3.1.4/arch/powerpc/mm/mmap_64.c
1036 +--- linux-3.1.4/arch/powerpc/mm/mmap_64.c 2011-11-11 15:19:27.000000000 -0500
1037 ++++ linux-3.1.4/arch/powerpc/mm/mmap_64.c 2011-11-16 18:39:07.000000000 -0500
1038 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
1039 */
1040 if (mmap_is_legacy()) {
1041 @@ -2384,9 +2384,9 @@ diff -urNp linux-3.1.3/arch/powerpc/mm/mmap_64.c linux-3.1.3/arch/powerpc/mm/mma
1042 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
1043 mm->unmap_area = arch_unmap_area_topdown;
1044 }
1045 -diff -urNp linux-3.1.3/arch/powerpc/mm/slice.c linux-3.1.3/arch/powerpc/mm/slice.c
1046 ---- linux-3.1.3/arch/powerpc/mm/slice.c 2011-11-11 15:19:27.000000000 -0500
1047 -+++ linux-3.1.3/arch/powerpc/mm/slice.c 2011-11-16 18:39:07.000000000 -0500
1048 +diff -urNp linux-3.1.4/arch/powerpc/mm/slice.c linux-3.1.4/arch/powerpc/mm/slice.c
1049 +--- linux-3.1.4/arch/powerpc/mm/slice.c 2011-11-11 15:19:27.000000000 -0500
1050 ++++ linux-3.1.4/arch/powerpc/mm/slice.c 2011-11-16 18:39:07.000000000 -0500
1051 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
1052 if ((mm->task_size - len) < addr)
1053 return 0;
1054 @@ -2453,9 +2453,9 @@ diff -urNp linux-3.1.3/arch/powerpc/mm/slice.c linux-3.1.3/arch/powerpc/mm/slice
1055 /* If hint, make sure it matches our alignment restrictions */
1056 if (!fixed && addr) {
1057 addr = _ALIGN_UP(addr, 1ul << pshift);
1058 -diff -urNp linux-3.1.3/arch/s390/include/asm/elf.h linux-3.1.3/arch/s390/include/asm/elf.h
1059 ---- linux-3.1.3/arch/s390/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
1060 -+++ linux-3.1.3/arch/s390/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
1061 +diff -urNp linux-3.1.4/arch/s390/include/asm/elf.h linux-3.1.4/arch/s390/include/asm/elf.h
1062 +--- linux-3.1.4/arch/s390/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
1063 ++++ linux-3.1.4/arch/s390/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
1064 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
1065 the loader. We need to make sure that it is out of the way of the program
1066 that it will "exec", and that there is sufficient room for the brk. */
1067 @@ -2481,9 +2481,9 @@ diff -urNp linux-3.1.3/arch/s390/include/asm/elf.h linux-3.1.3/arch/s390/include
1068 -#define arch_randomize_brk arch_randomize_brk
1069 -
1070 #endif
1071 -diff -urNp linux-3.1.3/arch/s390/include/asm/system.h linux-3.1.3/arch/s390/include/asm/system.h
1072 ---- linux-3.1.3/arch/s390/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
1073 -+++ linux-3.1.3/arch/s390/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
1074 +diff -urNp linux-3.1.4/arch/s390/include/asm/system.h linux-3.1.4/arch/s390/include/asm/system.h
1075 +--- linux-3.1.4/arch/s390/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
1076 ++++ linux-3.1.4/arch/s390/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
1077 @@ -256,7 +256,7 @@ extern void (*_machine_restart)(char *co
1078 extern void (*_machine_halt)(void);
1079 extern void (*_machine_power_off)(void);
1080 @@ -2493,9 +2493,9 @@ diff -urNp linux-3.1.3/arch/s390/include/asm/system.h linux-3.1.3/arch/s390/incl
1081
1082 static inline int tprot(unsigned long addr)
1083 {
1084 -diff -urNp linux-3.1.3/arch/s390/include/asm/uaccess.h linux-3.1.3/arch/s390/include/asm/uaccess.h
1085 ---- linux-3.1.3/arch/s390/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
1086 -+++ linux-3.1.3/arch/s390/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
1087 +diff -urNp linux-3.1.4/arch/s390/include/asm/uaccess.h linux-3.1.4/arch/s390/include/asm/uaccess.h
1088 +--- linux-3.1.4/arch/s390/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
1089 ++++ linux-3.1.4/arch/s390/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
1090 @@ -235,6 +235,10 @@ static inline unsigned long __must_check
1091 copy_to_user(void __user *to, const void *from, unsigned long n)
1092 {
1093 @@ -2528,9 +2528,9 @@ diff -urNp linux-3.1.3/arch/s390/include/asm/uaccess.h linux-3.1.3/arch/s390/inc
1094 if (unlikely(sz != -1 && sz < n)) {
1095 copy_from_user_overflow();
1096 return n;
1097 -diff -urNp linux-3.1.3/arch/s390/kernel/module.c linux-3.1.3/arch/s390/kernel/module.c
1098 ---- linux-3.1.3/arch/s390/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
1099 -+++ linux-3.1.3/arch/s390/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
1100 +diff -urNp linux-3.1.4/arch/s390/kernel/module.c linux-3.1.4/arch/s390/kernel/module.c
1101 +--- linux-3.1.4/arch/s390/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
1102 ++++ linux-3.1.4/arch/s390/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
1103 @@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
1104
1105 /* Increase core size by size of got & plt and set start
1106 @@ -2602,9 +2602,9 @@ diff -urNp linux-3.1.3/arch/s390/kernel/module.c linux-3.1.3/arch/s390/kernel/mo
1107 rela->r_addend - loc;
1108 if (r_type == R_390_GOTPC)
1109 *(unsigned int *) loc = val;
1110 -diff -urNp linux-3.1.3/arch/s390/kernel/process.c linux-3.1.3/arch/s390/kernel/process.c
1111 ---- linux-3.1.3/arch/s390/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
1112 -+++ linux-3.1.3/arch/s390/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
1113 +diff -urNp linux-3.1.4/arch/s390/kernel/process.c linux-3.1.4/arch/s390/kernel/process.c
1114 +--- linux-3.1.4/arch/s390/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
1115 ++++ linux-3.1.4/arch/s390/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
1116 @@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
1117 }
1118 return 0;
1119 @@ -2645,9 +2645,9 @@ diff -urNp linux-3.1.3/arch/s390/kernel/process.c linux-3.1.3/arch/s390/kernel/p
1120 - return base;
1121 - return ret;
1122 -}
1123 -diff -urNp linux-3.1.3/arch/s390/kernel/setup.c linux-3.1.3/arch/s390/kernel/setup.c
1124 ---- linux-3.1.3/arch/s390/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
1125 -+++ linux-3.1.3/arch/s390/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
1126 +diff -urNp linux-3.1.4/arch/s390/kernel/setup.c linux-3.1.4/arch/s390/kernel/setup.c
1127 +--- linux-3.1.4/arch/s390/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
1128 ++++ linux-3.1.4/arch/s390/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
1129 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
1130 }
1131 early_param("mem", early_parse_mem);
1132 @@ -2657,9 +2657,9 @@ diff -urNp linux-3.1.3/arch/s390/kernel/setup.c linux-3.1.3/arch/s390/kernel/set
1133 EXPORT_SYMBOL_GPL(user_mode);
1134
1135 static int set_amode_and_uaccess(unsigned long user_amode,
1136 -diff -urNp linux-3.1.3/arch/s390/mm/mmap.c linux-3.1.3/arch/s390/mm/mmap.c
1137 ---- linux-3.1.3/arch/s390/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
1138 -+++ linux-3.1.3/arch/s390/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
1139 +diff -urNp linux-3.1.4/arch/s390/mm/mmap.c linux-3.1.4/arch/s390/mm/mmap.c
1140 +--- linux-3.1.4/arch/s390/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
1141 ++++ linux-3.1.4/arch/s390/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
1142 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
1143 */
1144 if (mmap_is_legacy()) {
1145 @@ -2706,9 +2706,9 @@ diff -urNp linux-3.1.3/arch/s390/mm/mmap.c linux-3.1.3/arch/s390/mm/mmap.c
1146 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
1147 mm->unmap_area = arch_unmap_area_topdown;
1148 }
1149 -diff -urNp linux-3.1.3/arch/score/include/asm/system.h linux-3.1.3/arch/score/include/asm/system.h
1150 ---- linux-3.1.3/arch/score/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
1151 -+++ linux-3.1.3/arch/score/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
1152 +diff -urNp linux-3.1.4/arch/score/include/asm/system.h linux-3.1.4/arch/score/include/asm/system.h
1153 +--- linux-3.1.4/arch/score/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
1154 ++++ linux-3.1.4/arch/score/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
1155 @@ -17,7 +17,7 @@ do { \
1156 #define finish_arch_switch(prev) do {} while (0)
1157
1158 @@ -2718,9 +2718,9 @@ diff -urNp linux-3.1.3/arch/score/include/asm/system.h linux-3.1.3/arch/score/in
1159
1160 #define mb() barrier()
1161 #define rmb() barrier()
1162 -diff -urNp linux-3.1.3/arch/score/kernel/process.c linux-3.1.3/arch/score/kernel/process.c
1163 ---- linux-3.1.3/arch/score/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
1164 -+++ linux-3.1.3/arch/score/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
1165 +diff -urNp linux-3.1.4/arch/score/kernel/process.c linux-3.1.4/arch/score/kernel/process.c
1166 +--- linux-3.1.4/arch/score/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
1167 ++++ linux-3.1.4/arch/score/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
1168 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
1169
1170 return task_pt_regs(task)->cp0_epc;
1171 @@ -2730,9 +2730,9 @@ diff -urNp linux-3.1.3/arch/score/kernel/process.c linux-3.1.3/arch/score/kernel
1172 -{
1173 - return sp;
1174 -}
1175 -diff -urNp linux-3.1.3/arch/sh/mm/mmap.c linux-3.1.3/arch/sh/mm/mmap.c
1176 ---- linux-3.1.3/arch/sh/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
1177 -+++ linux-3.1.3/arch/sh/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
1178 +diff -urNp linux-3.1.4/arch/sh/mm/mmap.c linux-3.1.4/arch/sh/mm/mmap.c
1179 +--- linux-3.1.4/arch/sh/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
1180 ++++ linux-3.1.4/arch/sh/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
1181 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
1182 addr = PAGE_ALIGN(addr);
1183
1184 @@ -2807,9 +2807,9 @@ diff -urNp linux-3.1.3/arch/sh/mm/mmap.c linux-3.1.3/arch/sh/mm/mmap.c
1185
1186 bottomup:
1187 /*
1188 -diff -urNp linux-3.1.3/arch/sparc/include/asm/atomic_64.h linux-3.1.3/arch/sparc/include/asm/atomic_64.h
1189 ---- linux-3.1.3/arch/sparc/include/asm/atomic_64.h 2011-11-11 15:19:27.000000000 -0500
1190 -+++ linux-3.1.3/arch/sparc/include/asm/atomic_64.h 2011-11-16 18:39:07.000000000 -0500
1191 +diff -urNp linux-3.1.4/arch/sparc/include/asm/atomic_64.h linux-3.1.4/arch/sparc/include/asm/atomic_64.h
1192 +--- linux-3.1.4/arch/sparc/include/asm/atomic_64.h 2011-11-11 15:19:27.000000000 -0500
1193 ++++ linux-3.1.4/arch/sparc/include/asm/atomic_64.h 2011-11-16 18:39:07.000000000 -0500
1194 @@ -14,18 +14,40 @@
1195 #define ATOMIC64_INIT(i) { (i) }
1196
1197 @@ -2996,9 +2996,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/atomic_64.h linux-3.1.3/arch/sparc
1198 }
1199
1200 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
1201 -diff -urNp linux-3.1.3/arch/sparc/include/asm/cache.h linux-3.1.3/arch/sparc/include/asm/cache.h
1202 ---- linux-3.1.3/arch/sparc/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
1203 -+++ linux-3.1.3/arch/sparc/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
1204 +diff -urNp linux-3.1.4/arch/sparc/include/asm/cache.h linux-3.1.4/arch/sparc/include/asm/cache.h
1205 +--- linux-3.1.4/arch/sparc/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
1206 ++++ linux-3.1.4/arch/sparc/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
1207 @@ -10,7 +10,7 @@
1208 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
1209
1210 @@ -3008,9 +3008,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/cache.h linux-3.1.3/arch/sparc/inc
1211
1212 #ifdef CONFIG_SPARC32
1213 #define SMP_CACHE_BYTES_SHIFT 5
1214 -diff -urNp linux-3.1.3/arch/sparc/include/asm/elf_32.h linux-3.1.3/arch/sparc/include/asm/elf_32.h
1215 ---- linux-3.1.3/arch/sparc/include/asm/elf_32.h 2011-11-11 15:19:27.000000000 -0500
1216 -+++ linux-3.1.3/arch/sparc/include/asm/elf_32.h 2011-11-16 18:39:07.000000000 -0500
1217 +diff -urNp linux-3.1.4/arch/sparc/include/asm/elf_32.h linux-3.1.4/arch/sparc/include/asm/elf_32.h
1218 +--- linux-3.1.4/arch/sparc/include/asm/elf_32.h 2011-11-11 15:19:27.000000000 -0500
1219 ++++ linux-3.1.4/arch/sparc/include/asm/elf_32.h 2011-11-16 18:39:07.000000000 -0500
1220 @@ -114,6 +114,13 @@ typedef struct {
1221
1222 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
1223 @@ -3025,9 +3025,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/elf_32.h linux-3.1.3/arch/sparc/in
1224 /* This yields a mask that user programs can use to figure out what
1225 instruction set this cpu supports. This can NOT be done in userspace
1226 on Sparc. */
1227 -diff -urNp linux-3.1.3/arch/sparc/include/asm/elf_64.h linux-3.1.3/arch/sparc/include/asm/elf_64.h
1228 ---- linux-3.1.3/arch/sparc/include/asm/elf_64.h 2011-11-11 15:19:27.000000000 -0500
1229 -+++ linux-3.1.3/arch/sparc/include/asm/elf_64.h 2011-11-16 18:39:07.000000000 -0500
1230 +diff -urNp linux-3.1.4/arch/sparc/include/asm/elf_64.h linux-3.1.4/arch/sparc/include/asm/elf_64.h
1231 +--- linux-3.1.4/arch/sparc/include/asm/elf_64.h 2011-11-11 15:19:27.000000000 -0500
1232 ++++ linux-3.1.4/arch/sparc/include/asm/elf_64.h 2011-11-16 18:39:07.000000000 -0500
1233 @@ -180,6 +180,13 @@ typedef struct {
1234 #define ELF_ET_DYN_BASE 0x0000010000000000UL
1235 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
1236 @@ -3042,9 +3042,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/elf_64.h linux-3.1.3/arch/sparc/in
1237 extern unsigned long sparc64_elf_hwcap;
1238 #define ELF_HWCAP sparc64_elf_hwcap
1239
1240 -diff -urNp linux-3.1.3/arch/sparc/include/asm/pgtable_32.h linux-3.1.3/arch/sparc/include/asm/pgtable_32.h
1241 ---- linux-3.1.3/arch/sparc/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
1242 -+++ linux-3.1.3/arch/sparc/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
1243 +diff -urNp linux-3.1.4/arch/sparc/include/asm/pgtable_32.h linux-3.1.4/arch/sparc/include/asm/pgtable_32.h
1244 +--- linux-3.1.4/arch/sparc/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
1245 ++++ linux-3.1.4/arch/sparc/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
1246 @@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
1247 BTFIXUPDEF_INT(page_none)
1248 BTFIXUPDEF_INT(page_copy)
1249 @@ -3076,9 +3076,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/pgtable_32.h linux-3.1.3/arch/spar
1250 extern unsigned long page_kernel;
1251
1252 #ifdef MODULE
1253 -diff -urNp linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h
1254 ---- linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h 2011-11-11 15:19:27.000000000 -0500
1255 -+++ linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h 2011-11-16 18:39:07.000000000 -0500
1256 +diff -urNp linux-3.1.4/arch/sparc/include/asm/pgtsrmmu.h linux-3.1.4/arch/sparc/include/asm/pgtsrmmu.h
1257 +--- linux-3.1.4/arch/sparc/include/asm/pgtsrmmu.h 2011-11-11 15:19:27.000000000 -0500
1258 ++++ linux-3.1.4/arch/sparc/include/asm/pgtsrmmu.h 2011-11-16 18:39:07.000000000 -0500
1259 @@ -115,6 +115,13 @@
1260 SRMMU_EXEC | SRMMU_REF)
1261 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
1262 @@ -3093,9 +3093,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.1.3/arch/sparc/
1263 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
1264 SRMMU_DIRTY | SRMMU_REF)
1265
1266 -diff -urNp linux-3.1.3/arch/sparc/include/asm/spinlock_64.h linux-3.1.3/arch/sparc/include/asm/spinlock_64.h
1267 ---- linux-3.1.3/arch/sparc/include/asm/spinlock_64.h 2011-11-11 15:19:27.000000000 -0500
1268 -+++ linux-3.1.3/arch/sparc/include/asm/spinlock_64.h 2011-11-16 18:39:07.000000000 -0500
1269 +diff -urNp linux-3.1.4/arch/sparc/include/asm/spinlock_64.h linux-3.1.4/arch/sparc/include/asm/spinlock_64.h
1270 +--- linux-3.1.4/arch/sparc/include/asm/spinlock_64.h 2011-11-11 15:19:27.000000000 -0500
1271 ++++ linux-3.1.4/arch/sparc/include/asm/spinlock_64.h 2011-11-16 18:39:07.000000000 -0500
1272 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
1273
1274 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
1275 @@ -3193,9 +3193,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/spinlock_64.h linux-3.1.3/arch/spa
1276 {
1277 unsigned long mask, tmp1, tmp2, result;
1278
1279 -diff -urNp linux-3.1.3/arch/sparc/include/asm/thread_info_32.h linux-3.1.3/arch/sparc/include/asm/thread_info_32.h
1280 ---- linux-3.1.3/arch/sparc/include/asm/thread_info_32.h 2011-11-11 15:19:27.000000000 -0500
1281 -+++ linux-3.1.3/arch/sparc/include/asm/thread_info_32.h 2011-11-16 18:39:07.000000000 -0500
1282 +diff -urNp linux-3.1.4/arch/sparc/include/asm/thread_info_32.h linux-3.1.4/arch/sparc/include/asm/thread_info_32.h
1283 +--- linux-3.1.4/arch/sparc/include/asm/thread_info_32.h 2011-11-11 15:19:27.000000000 -0500
1284 ++++ linux-3.1.4/arch/sparc/include/asm/thread_info_32.h 2011-11-16 18:39:07.000000000 -0500
1285 @@ -50,6 +50,8 @@ struct thread_info {
1286 unsigned long w_saved;
1287
1288 @@ -3205,9 +3205,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/thread_info_32.h linux-3.1.3/arch/
1289 };
1290
1291 /*
1292 -diff -urNp linux-3.1.3/arch/sparc/include/asm/thread_info_64.h linux-3.1.3/arch/sparc/include/asm/thread_info_64.h
1293 ---- linux-3.1.3/arch/sparc/include/asm/thread_info_64.h 2011-11-11 15:19:27.000000000 -0500
1294 -+++ linux-3.1.3/arch/sparc/include/asm/thread_info_64.h 2011-11-16 18:39:07.000000000 -0500
1295 +diff -urNp linux-3.1.4/arch/sparc/include/asm/thread_info_64.h linux-3.1.4/arch/sparc/include/asm/thread_info_64.h
1296 +--- linux-3.1.4/arch/sparc/include/asm/thread_info_64.h 2011-11-11 15:19:27.000000000 -0500
1297 ++++ linux-3.1.4/arch/sparc/include/asm/thread_info_64.h 2011-11-16 18:39:07.000000000 -0500
1298 @@ -63,6 +63,8 @@ struct thread_info {
1299 struct pt_regs *kern_una_regs;
1300 unsigned int kern_una_insn;
1301 @@ -3217,9 +3217,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/thread_info_64.h linux-3.1.3/arch/
1302 unsigned long fpregs[0] __attribute__ ((aligned(64)));
1303 };
1304
1305 -diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess_32.h linux-3.1.3/arch/sparc/include/asm/uaccess_32.h
1306 ---- linux-3.1.3/arch/sparc/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
1307 -+++ linux-3.1.3/arch/sparc/include/asm/uaccess_32.h 2011-11-16 18:39:07.000000000 -0500
1308 +diff -urNp linux-3.1.4/arch/sparc/include/asm/uaccess_32.h linux-3.1.4/arch/sparc/include/asm/uaccess_32.h
1309 +--- linux-3.1.4/arch/sparc/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
1310 ++++ linux-3.1.4/arch/sparc/include/asm/uaccess_32.h 2011-11-16 18:39:07.000000000 -0500
1311 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
1312
1313 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
1314 @@ -3271,9 +3271,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess_32.h linux-3.1.3/arch/spar
1315 return __copy_user((__force void __user *) to, from, n);
1316 }
1317
1318 -diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess_64.h linux-3.1.3/arch/sparc/include/asm/uaccess_64.h
1319 ---- linux-3.1.3/arch/sparc/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
1320 -+++ linux-3.1.3/arch/sparc/include/asm/uaccess_64.h 2011-11-16 18:39:07.000000000 -0500
1321 +diff -urNp linux-3.1.4/arch/sparc/include/asm/uaccess_64.h linux-3.1.4/arch/sparc/include/asm/uaccess_64.h
1322 +--- linux-3.1.4/arch/sparc/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
1323 ++++ linux-3.1.4/arch/sparc/include/asm/uaccess_64.h 2011-11-16 18:39:07.000000000 -0500
1324 @@ -10,6 +10,7 @@
1325 #include <linux/compiler.h>
1326 #include <linux/string.h>
1327 @@ -3316,9 +3316,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess_64.h linux-3.1.3/arch/spar
1328 if (unlikely(ret))
1329 ret = copy_to_user_fixup(to, from, size);
1330 return ret;
1331 -diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess.h linux-3.1.3/arch/sparc/include/asm/uaccess.h
1332 ---- linux-3.1.3/arch/sparc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
1333 -+++ linux-3.1.3/arch/sparc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
1334 +diff -urNp linux-3.1.4/arch/sparc/include/asm/uaccess.h linux-3.1.4/arch/sparc/include/asm/uaccess.h
1335 +--- linux-3.1.4/arch/sparc/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
1336 ++++ linux-3.1.4/arch/sparc/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
1337 @@ -1,5 +1,13 @@
1338 #ifndef ___ASM_SPARC_UACCESS_H
1339 #define ___ASM_SPARC_UACCESS_H
1340 @@ -3333,9 +3333,9 @@ diff -urNp linux-3.1.3/arch/sparc/include/asm/uaccess.h linux-3.1.3/arch/sparc/i
1341 #if defined(__sparc__) && defined(__arch64__)
1342 #include <asm/uaccess_64.h>
1343 #else
1344 -diff -urNp linux-3.1.3/arch/sparc/kernel/Makefile linux-3.1.3/arch/sparc/kernel/Makefile
1345 ---- linux-3.1.3/arch/sparc/kernel/Makefile 2011-11-11 15:19:27.000000000 -0500
1346 -+++ linux-3.1.3/arch/sparc/kernel/Makefile 2011-11-16 18:39:07.000000000 -0500
1347 +diff -urNp linux-3.1.4/arch/sparc/kernel/Makefile linux-3.1.4/arch/sparc/kernel/Makefile
1348 +--- linux-3.1.4/arch/sparc/kernel/Makefile 2011-11-11 15:19:27.000000000 -0500
1349 ++++ linux-3.1.4/arch/sparc/kernel/Makefile 2011-11-16 18:39:07.000000000 -0500
1350 @@ -3,7 +3,7 @@
1351 #
1352
1353 @@ -3345,9 +3345,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/Makefile linux-3.1.3/arch/sparc/kernel/
1354
1355 extra-y := head_$(BITS).o
1356 extra-y += init_task.o
1357 -diff -urNp linux-3.1.3/arch/sparc/kernel/process_32.c linux-3.1.3/arch/sparc/kernel/process_32.c
1358 ---- linux-3.1.3/arch/sparc/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
1359 -+++ linux-3.1.3/arch/sparc/kernel/process_32.c 2011-11-16 18:40:08.000000000 -0500
1360 +diff -urNp linux-3.1.4/arch/sparc/kernel/process_32.c linux-3.1.4/arch/sparc/kernel/process_32.c
1361 +--- linux-3.1.4/arch/sparc/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
1362 ++++ linux-3.1.4/arch/sparc/kernel/process_32.c 2011-11-16 18:40:08.000000000 -0500
1363 @@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
1364 rw->ins[4], rw->ins[5],
1365 rw->ins[6],
1366 @@ -3383,9 +3383,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/process_32.c linux-3.1.3/arch/sparc/ker
1367 fp = rw->ins[6];
1368 } while (++count < 16);
1369 printk("\n");
1370 -diff -urNp linux-3.1.3/arch/sparc/kernel/process_64.c linux-3.1.3/arch/sparc/kernel/process_64.c
1371 ---- linux-3.1.3/arch/sparc/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
1372 -+++ linux-3.1.3/arch/sparc/kernel/process_64.c 2011-11-16 18:40:08.000000000 -0500
1373 +diff -urNp linux-3.1.4/arch/sparc/kernel/process_64.c linux-3.1.4/arch/sparc/kernel/process_64.c
1374 +--- linux-3.1.4/arch/sparc/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
1375 ++++ linux-3.1.4/arch/sparc/kernel/process_64.c 2011-11-16 18:40:08.000000000 -0500
1376 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
1377 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
1378 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
1379 @@ -3421,9 +3421,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/process_64.c linux-3.1.3/arch/sparc/ker
1380 (void *) gp->tpc,
1381 (void *) gp->o7,
1382 (void *) gp->i7,
1383 -diff -urNp linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c
1384 ---- linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c 2011-11-11 15:19:27.000000000 -0500
1385 -+++ linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c 2011-11-16 18:39:07.000000000 -0500
1386 +diff -urNp linux-3.1.4/arch/sparc/kernel/sys_sparc_32.c linux-3.1.4/arch/sparc/kernel/sys_sparc_32.c
1387 +--- linux-3.1.4/arch/sparc/kernel/sys_sparc_32.c 2011-11-11 15:19:27.000000000 -0500
1388 ++++ linux-3.1.4/arch/sparc/kernel/sys_sparc_32.c 2011-11-16 18:39:07.000000000 -0500
1389 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
1390 if (ARCH_SUN4C && len > 0x20000000)
1391 return -ENOMEM;
1392 @@ -3442,9 +3442,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/sys_sparc_32.c linux-3.1.3/arch/sparc/k
1393 return addr;
1394 addr = vmm->vm_end;
1395 if (flags & MAP_SHARED)
1396 -diff -urNp linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c
1397 ---- linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c 2011-11-11 15:19:27.000000000 -0500
1398 -+++ linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c 2011-11-16 18:39:07.000000000 -0500
1399 +diff -urNp linux-3.1.4/arch/sparc/kernel/sys_sparc_64.c linux-3.1.4/arch/sparc/kernel/sys_sparc_64.c
1400 +--- linux-3.1.4/arch/sparc/kernel/sys_sparc_64.c 2011-11-11 15:19:27.000000000 -0500
1401 ++++ linux-3.1.4/arch/sparc/kernel/sys_sparc_64.c 2011-11-16 18:39:07.000000000 -0500
1402 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
1403 /* We do not accept a shared mapping if it would violate
1404 * cache aliasing constraints.
1405 @@ -3592,9 +3592,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/sys_sparc_64.c linux-3.1.3/arch/sparc/k
1406 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
1407 mm->unmap_area = arch_unmap_area_topdown;
1408 }
1409 -diff -urNp linux-3.1.3/arch/sparc/kernel/traps_32.c linux-3.1.3/arch/sparc/kernel/traps_32.c
1410 ---- linux-3.1.3/arch/sparc/kernel/traps_32.c 2011-11-11 15:19:27.000000000 -0500
1411 -+++ linux-3.1.3/arch/sparc/kernel/traps_32.c 2011-11-16 18:40:08.000000000 -0500
1412 +diff -urNp linux-3.1.4/arch/sparc/kernel/traps_32.c linux-3.1.4/arch/sparc/kernel/traps_32.c
1413 +--- linux-3.1.4/arch/sparc/kernel/traps_32.c 2011-11-11 15:19:27.000000000 -0500
1414 ++++ linux-3.1.4/arch/sparc/kernel/traps_32.c 2011-11-16 18:40:08.000000000 -0500
1415 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
1416 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
1417 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
1418 @@ -3624,9 +3624,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/traps_32.c linux-3.1.3/arch/sparc/kerne
1419 do_exit(SIGSEGV);
1420 }
1421
1422 -diff -urNp linux-3.1.3/arch/sparc/kernel/traps_64.c linux-3.1.3/arch/sparc/kernel/traps_64.c
1423 ---- linux-3.1.3/arch/sparc/kernel/traps_64.c 2011-11-11 15:19:27.000000000 -0500
1424 -+++ linux-3.1.3/arch/sparc/kernel/traps_64.c 2011-11-16 18:40:08.000000000 -0500
1425 +diff -urNp linux-3.1.4/arch/sparc/kernel/traps_64.c linux-3.1.4/arch/sparc/kernel/traps_64.c
1426 +--- linux-3.1.4/arch/sparc/kernel/traps_64.c 2011-11-11 15:19:27.000000000 -0500
1427 ++++ linux-3.1.4/arch/sparc/kernel/traps_64.c 2011-11-16 18:40:08.000000000 -0500
1428 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
1429 i + 1,
1430 p->trapstack[i].tstate, p->trapstack[i].tpc,
1431 @@ -3764,9 +3764,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/traps_64.c linux-3.1.3/arch/sparc/kerne
1432 do_exit(SIGSEGV);
1433 }
1434 EXPORT_SYMBOL(die_if_kernel);
1435 -diff -urNp linux-3.1.3/arch/sparc/kernel/unaligned_64.c linux-3.1.3/arch/sparc/kernel/unaligned_64.c
1436 ---- linux-3.1.3/arch/sparc/kernel/unaligned_64.c 2011-11-11 15:19:27.000000000 -0500
1437 -+++ linux-3.1.3/arch/sparc/kernel/unaligned_64.c 2011-11-16 18:40:08.000000000 -0500
1438 +diff -urNp linux-3.1.4/arch/sparc/kernel/unaligned_64.c linux-3.1.4/arch/sparc/kernel/unaligned_64.c
1439 +--- linux-3.1.4/arch/sparc/kernel/unaligned_64.c 2011-11-11 15:19:27.000000000 -0500
1440 ++++ linux-3.1.4/arch/sparc/kernel/unaligned_64.c 2011-11-16 18:40:08.000000000 -0500
1441 @@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
1442 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
1443
1444 @@ -3776,9 +3776,9 @@ diff -urNp linux-3.1.3/arch/sparc/kernel/unaligned_64.c linux-3.1.3/arch/sparc/k
1445 regs->tpc, (void *) regs->tpc);
1446 }
1447 }
1448 -diff -urNp linux-3.1.3/arch/sparc/lib/atomic_64.S linux-3.1.3/arch/sparc/lib/atomic_64.S
1449 ---- linux-3.1.3/arch/sparc/lib/atomic_64.S 2011-11-11 15:19:27.000000000 -0500
1450 -+++ linux-3.1.3/arch/sparc/lib/atomic_64.S 2011-11-16 18:39:07.000000000 -0500
1451 +diff -urNp linux-3.1.4/arch/sparc/lib/atomic_64.S linux-3.1.4/arch/sparc/lib/atomic_64.S
1452 +--- linux-3.1.4/arch/sparc/lib/atomic_64.S 2011-11-11 15:19:27.000000000 -0500
1453 ++++ linux-3.1.4/arch/sparc/lib/atomic_64.S 2011-11-16 18:39:07.000000000 -0500
1454 @@ -18,7 +18,12 @@
1455 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
1456 BACKOFF_SETUP(%o2)
1457 @@ -4013,9 +4013,9 @@ diff -urNp linux-3.1.3/arch/sparc/lib/atomic_64.S linux-3.1.3/arch/sparc/lib/ato
1458 casx [%o1], %g1, %g7
1459 cmp %g1, %g7
1460 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
1461 -diff -urNp linux-3.1.3/arch/sparc/lib/ksyms.c linux-3.1.3/arch/sparc/lib/ksyms.c
1462 ---- linux-3.1.3/arch/sparc/lib/ksyms.c 2011-11-11 15:19:27.000000000 -0500
1463 -+++ linux-3.1.3/arch/sparc/lib/ksyms.c 2011-11-16 18:39:07.000000000 -0500
1464 +diff -urNp linux-3.1.4/arch/sparc/lib/ksyms.c linux-3.1.4/arch/sparc/lib/ksyms.c
1465 +--- linux-3.1.4/arch/sparc/lib/ksyms.c 2011-11-11 15:19:27.000000000 -0500
1466 ++++ linux-3.1.4/arch/sparc/lib/ksyms.c 2011-11-16 18:39:07.000000000 -0500
1467 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
1468
1469 /* Atomic counter implementation. */
1470 @@ -4035,9 +4035,9 @@ diff -urNp linux-3.1.3/arch/sparc/lib/ksyms.c linux-3.1.3/arch/sparc/lib/ksyms.c
1471 EXPORT_SYMBOL(atomic64_sub_ret);
1472
1473 /* Atomic bit operations. */
1474 -diff -urNp linux-3.1.3/arch/sparc/lib/Makefile linux-3.1.3/arch/sparc/lib/Makefile
1475 ---- linux-3.1.3/arch/sparc/lib/Makefile 2011-11-11 15:19:27.000000000 -0500
1476 -+++ linux-3.1.3/arch/sparc/lib/Makefile 2011-11-16 18:39:07.000000000 -0500
1477 +diff -urNp linux-3.1.4/arch/sparc/lib/Makefile linux-3.1.4/arch/sparc/lib/Makefile
1478 +--- linux-3.1.4/arch/sparc/lib/Makefile 2011-11-11 15:19:27.000000000 -0500
1479 ++++ linux-3.1.4/arch/sparc/lib/Makefile 2011-11-16 18:39:07.000000000 -0500
1480 @@ -2,7 +2,7 @@
1481 #
1482
1483 @@ -4047,9 +4047,9 @@ diff -urNp linux-3.1.3/arch/sparc/lib/Makefile linux-3.1.3/arch/sparc/lib/Makefi
1484
1485 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
1486 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
1487 -diff -urNp linux-3.1.3/arch/sparc/Makefile linux-3.1.3/arch/sparc/Makefile
1488 ---- linux-3.1.3/arch/sparc/Makefile 2011-11-11 15:19:27.000000000 -0500
1489 -+++ linux-3.1.3/arch/sparc/Makefile 2011-11-16 18:40:08.000000000 -0500
1490 +diff -urNp linux-3.1.4/arch/sparc/Makefile linux-3.1.4/arch/sparc/Makefile
1491 +--- linux-3.1.4/arch/sparc/Makefile 2011-11-11 15:19:27.000000000 -0500
1492 ++++ linux-3.1.4/arch/sparc/Makefile 2011-11-16 18:40:08.000000000 -0500
1493 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
1494 # Export what is needed by arch/sparc/boot/Makefile
1495 export VMLINUX_INIT VMLINUX_MAIN
1496 @@ -4059,9 +4059,9 @@ diff -urNp linux-3.1.3/arch/sparc/Makefile linux-3.1.3/arch/sparc/Makefile
1497 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
1498 VMLINUX_MAIN += $(drivers-y) $(net-y)
1499
1500 -diff -urNp linux-3.1.3/arch/sparc/mm/fault_32.c linux-3.1.3/arch/sparc/mm/fault_32.c
1501 ---- linux-3.1.3/arch/sparc/mm/fault_32.c 2011-11-11 15:19:27.000000000 -0500
1502 -+++ linux-3.1.3/arch/sparc/mm/fault_32.c 2011-11-16 18:39:07.000000000 -0500
1503 +diff -urNp linux-3.1.4/arch/sparc/mm/fault_32.c linux-3.1.4/arch/sparc/mm/fault_32.c
1504 +--- linux-3.1.4/arch/sparc/mm/fault_32.c 2011-11-11 15:19:27.000000000 -0500
1505 ++++ linux-3.1.4/arch/sparc/mm/fault_32.c 2011-11-16 18:39:07.000000000 -0500
1506 @@ -22,6 +22,9 @@
1507 #include <linux/interrupt.h>
1508 #include <linux/module.h>
1509 @@ -4366,9 +4366,9 @@ diff -urNp linux-3.1.3/arch/sparc/mm/fault_32.c linux-3.1.3/arch/sparc/mm/fault_
1510 /* Allow reads even for write-only mappings */
1511 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
1512 goto bad_area;
1513 -diff -urNp linux-3.1.3/arch/sparc/mm/fault_64.c linux-3.1.3/arch/sparc/mm/fault_64.c
1514 ---- linux-3.1.3/arch/sparc/mm/fault_64.c 2011-11-11 15:19:27.000000000 -0500
1515 -+++ linux-3.1.3/arch/sparc/mm/fault_64.c 2011-11-16 18:40:08.000000000 -0500
1516 +diff -urNp linux-3.1.4/arch/sparc/mm/fault_64.c linux-3.1.4/arch/sparc/mm/fault_64.c
1517 +--- linux-3.1.4/arch/sparc/mm/fault_64.c 2011-11-11 15:19:27.000000000 -0500
1518 ++++ linux-3.1.4/arch/sparc/mm/fault_64.c 2011-11-16 18:40:08.000000000 -0500
1519 @@ -21,6 +21,9 @@
1520 #include <linux/kprobes.h>
1521 #include <linux/kdebug.h>
1522 @@ -4876,9 +4876,9 @@ diff -urNp linux-3.1.3/arch/sparc/mm/fault_64.c linux-3.1.3/arch/sparc/mm/fault_
1523 /* Pure DTLB misses do not tell us whether the fault causing
1524 * load/store/atomic was a write or not, it only says that there
1525 * was no match. So in such a case we (carefully) read the
1526 -diff -urNp linux-3.1.3/arch/sparc/mm/hugetlbpage.c linux-3.1.3/arch/sparc/mm/hugetlbpage.c
1527 ---- linux-3.1.3/arch/sparc/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
1528 -+++ linux-3.1.3/arch/sparc/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
1529 +diff -urNp linux-3.1.4/arch/sparc/mm/hugetlbpage.c linux-3.1.4/arch/sparc/mm/hugetlbpage.c
1530 +--- linux-3.1.4/arch/sparc/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
1531 ++++ linux-3.1.4/arch/sparc/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
1532 @@ -68,7 +68,7 @@ full_search:
1533 }
1534 return -ENOMEM;
1535 @@ -4938,9 +4938,9 @@ diff -urNp linux-3.1.3/arch/sparc/mm/hugetlbpage.c linux-3.1.3/arch/sparc/mm/hug
1536 return addr;
1537 }
1538 if (mm->get_unmapped_area == arch_get_unmapped_area)
1539 -diff -urNp linux-3.1.3/arch/sparc/mm/init_32.c linux-3.1.3/arch/sparc/mm/init_32.c
1540 ---- linux-3.1.3/arch/sparc/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
1541 -+++ linux-3.1.3/arch/sparc/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
1542 +diff -urNp linux-3.1.4/arch/sparc/mm/init_32.c linux-3.1.4/arch/sparc/mm/init_32.c
1543 +--- linux-3.1.4/arch/sparc/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
1544 ++++ linux-3.1.4/arch/sparc/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
1545 @@ -316,6 +316,9 @@ extern void device_scan(void);
1546 pgprot_t PAGE_SHARED __read_mostly;
1547 EXPORT_SYMBOL(PAGE_SHARED);
1548 @@ -4975,9 +4975,9 @@ diff -urNp linux-3.1.3/arch/sparc/mm/init_32.c linux-3.1.3/arch/sparc/mm/init_32
1549 protection_map[12] = PAGE_READONLY;
1550 protection_map[13] = PAGE_READONLY;
1551 protection_map[14] = PAGE_SHARED;
1552 -diff -urNp linux-3.1.3/arch/sparc/mm/Makefile linux-3.1.3/arch/sparc/mm/Makefile
1553 ---- linux-3.1.3/arch/sparc/mm/Makefile 2011-11-11 15:19:27.000000000 -0500
1554 -+++ linux-3.1.3/arch/sparc/mm/Makefile 2011-11-16 18:39:07.000000000 -0500
1555 +diff -urNp linux-3.1.4/arch/sparc/mm/Makefile linux-3.1.4/arch/sparc/mm/Makefile
1556 +--- linux-3.1.4/arch/sparc/mm/Makefile 2011-11-11 15:19:27.000000000 -0500
1557 ++++ linux-3.1.4/arch/sparc/mm/Makefile 2011-11-16 18:39:07.000000000 -0500
1558 @@ -2,7 +2,7 @@
1559 #
1560
1561 @@ -4987,9 +4987,9 @@ diff -urNp linux-3.1.3/arch/sparc/mm/Makefile linux-3.1.3/arch/sparc/mm/Makefile
1562
1563 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
1564 obj-y += fault_$(BITS).o
1565 -diff -urNp linux-3.1.3/arch/sparc/mm/srmmu.c linux-3.1.3/arch/sparc/mm/srmmu.c
1566 ---- linux-3.1.3/arch/sparc/mm/srmmu.c 2011-11-11 15:19:27.000000000 -0500
1567 -+++ linux-3.1.3/arch/sparc/mm/srmmu.c 2011-11-16 18:39:07.000000000 -0500
1568 +diff -urNp linux-3.1.4/arch/sparc/mm/srmmu.c linux-3.1.4/arch/sparc/mm/srmmu.c
1569 +--- linux-3.1.4/arch/sparc/mm/srmmu.c 2011-11-11 15:19:27.000000000 -0500
1570 ++++ linux-3.1.4/arch/sparc/mm/srmmu.c 2011-11-16 18:39:07.000000000 -0500
1571 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
1572 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
1573 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
1574 @@ -5004,9 +5004,9 @@ diff -urNp linux-3.1.3/arch/sparc/mm/srmmu.c linux-3.1.3/arch/sparc/mm/srmmu.c
1575 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
1576 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
1577
1578 -diff -urNp linux-3.1.3/arch/um/include/asm/kmap_types.h linux-3.1.3/arch/um/include/asm/kmap_types.h
1579 ---- linux-3.1.3/arch/um/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
1580 -+++ linux-3.1.3/arch/um/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
1581 +diff -urNp linux-3.1.4/arch/um/include/asm/kmap_types.h linux-3.1.4/arch/um/include/asm/kmap_types.h
1582 +--- linux-3.1.4/arch/um/include/asm/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
1583 ++++ linux-3.1.4/arch/um/include/asm/kmap_types.h 2011-11-16 18:39:07.000000000 -0500
1584 @@ -23,6 +23,7 @@ enum km_type {
1585 KM_IRQ1,
1586 KM_SOFTIRQ0,
1587 @@ -5015,9 +5015,9 @@ diff -urNp linux-3.1.3/arch/um/include/asm/kmap_types.h linux-3.1.3/arch/um/incl
1588 KM_TYPE_NR
1589 };
1590
1591 -diff -urNp linux-3.1.3/arch/um/include/asm/page.h linux-3.1.3/arch/um/include/asm/page.h
1592 ---- linux-3.1.3/arch/um/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
1593 -+++ linux-3.1.3/arch/um/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
1594 +diff -urNp linux-3.1.4/arch/um/include/asm/page.h linux-3.1.4/arch/um/include/asm/page.h
1595 +--- linux-3.1.4/arch/um/include/asm/page.h 2011-11-11 15:19:27.000000000 -0500
1596 ++++ linux-3.1.4/arch/um/include/asm/page.h 2011-11-16 18:39:07.000000000 -0500
1597 @@ -14,6 +14,9 @@
1598 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
1599 #define PAGE_MASK (~(PAGE_SIZE-1))
1600 @@ -5028,9 +5028,9 @@ diff -urNp linux-3.1.3/arch/um/include/asm/page.h linux-3.1.3/arch/um/include/as
1601 #ifndef __ASSEMBLY__
1602
1603 struct page;
1604 -diff -urNp linux-3.1.3/arch/um/kernel/process.c linux-3.1.3/arch/um/kernel/process.c
1605 ---- linux-3.1.3/arch/um/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
1606 -+++ linux-3.1.3/arch/um/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
1607 +diff -urNp linux-3.1.4/arch/um/kernel/process.c linux-3.1.4/arch/um/kernel/process.c
1608 +--- linux-3.1.4/arch/um/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
1609 ++++ linux-3.1.4/arch/um/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
1610 @@ -404,22 +404,6 @@ int singlestepping(void * t)
1611 return 2;
1612 }
1613 @@ -5054,9 +5054,9 @@ diff -urNp linux-3.1.3/arch/um/kernel/process.c linux-3.1.3/arch/um/kernel/proce
1614 unsigned long get_wchan(struct task_struct *p)
1615 {
1616 unsigned long stack_page, sp, ip;
1617 -diff -urNp linux-3.1.3/arch/um/Makefile linux-3.1.3/arch/um/Makefile
1618 ---- linux-3.1.3/arch/um/Makefile 2011-11-11 15:19:27.000000000 -0500
1619 -+++ linux-3.1.3/arch/um/Makefile 2011-11-16 18:39:07.000000000 -0500
1620 +diff -urNp linux-3.1.4/arch/um/Makefile linux-3.1.4/arch/um/Makefile
1621 +--- linux-3.1.4/arch/um/Makefile 2011-11-11 15:19:27.000000000 -0500
1622 ++++ linux-3.1.4/arch/um/Makefile 2011-11-16 18:39:07.000000000 -0500
1623 @@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINE
1624 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
1625 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
1626 @@ -5068,9 +5068,9 @@ diff -urNp linux-3.1.3/arch/um/Makefile linux-3.1.3/arch/um/Makefile
1627 include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
1628
1629 #This will adjust *FLAGS accordingly to the platform.
1630 -diff -urNp linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h
1631 ---- linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
1632 -+++ linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
1633 +diff -urNp linux-3.1.4/arch/um/sys-i386/shared/sysdep/system.h linux-3.1.4/arch/um/sys-i386/shared/sysdep/system.h
1634 +--- linux-3.1.4/arch/um/sys-i386/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
1635 ++++ linux-3.1.4/arch/um/sys-i386/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
1636 @@ -17,7 +17,7 @@
1637 # define AT_VECTOR_SIZE_ARCH 1
1638 #endif
1639 @@ -5080,9 +5080,9 @@ diff -urNp linux-3.1.3/arch/um/sys-i386/shared/sysdep/system.h linux-3.1.3/arch/
1640
1641 void default_idle(void);
1642
1643 -diff -urNp linux-3.1.3/arch/um/sys-i386/syscalls.c linux-3.1.3/arch/um/sys-i386/syscalls.c
1644 ---- linux-3.1.3/arch/um/sys-i386/syscalls.c 2011-11-11 15:19:27.000000000 -0500
1645 -+++ linux-3.1.3/arch/um/sys-i386/syscalls.c 2011-11-16 18:39:07.000000000 -0500
1646 +diff -urNp linux-3.1.4/arch/um/sys-i386/syscalls.c linux-3.1.4/arch/um/sys-i386/syscalls.c
1647 +--- linux-3.1.4/arch/um/sys-i386/syscalls.c 2011-11-11 15:19:27.000000000 -0500
1648 ++++ linux-3.1.4/arch/um/sys-i386/syscalls.c 2011-11-16 18:39:07.000000000 -0500
1649 @@ -11,6 +11,21 @@
1650 #include "asm/uaccess.h"
1651 #include "asm/unistd.h"
1652 @@ -5105,9 +5105,9 @@ diff -urNp linux-3.1.3/arch/um/sys-i386/syscalls.c linux-3.1.3/arch/um/sys-i386/
1653 /*
1654 * The prototype on i386 is:
1655 *
1656 -diff -urNp linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h
1657 ---- linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
1658 -+++ linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
1659 +diff -urNp linux-3.1.4/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.1.4/arch/um/sys-x86_64/shared/sysdep/system.h
1660 +--- linux-3.1.4/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-11 15:19:27.000000000 -0500
1661 ++++ linux-3.1.4/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-16 18:39:07.000000000 -0500
1662 @@ -17,7 +17,7 @@
1663 # define AT_VECTOR_SIZE_ARCH 1
1664 #endif
1665 @@ -5117,9 +5117,9 @@ diff -urNp linux-3.1.3/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.1.3/arc
1666
1667 void default_idle(void);
1668
1669 -diff -urNp linux-3.1.3/arch/x86/boot/bitops.h linux-3.1.3/arch/x86/boot/bitops.h
1670 ---- linux-3.1.3/arch/x86/boot/bitops.h 2011-11-11 15:19:27.000000000 -0500
1671 -+++ linux-3.1.3/arch/x86/boot/bitops.h 2011-11-16 18:39:07.000000000 -0500
1672 +diff -urNp linux-3.1.4/arch/x86/boot/bitops.h linux-3.1.4/arch/x86/boot/bitops.h
1673 +--- linux-3.1.4/arch/x86/boot/bitops.h 2011-11-11 15:19:27.000000000 -0500
1674 ++++ linux-3.1.4/arch/x86/boot/bitops.h 2011-11-16 18:39:07.000000000 -0500
1675 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int
1676 u8 v;
1677 const u32 *p = (const u32 *)addr;
1678 @@ -5138,9 +5138,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/bitops.h linux-3.1.3/arch/x86/boot/bitops.h
1679 }
1680
1681 #endif /* BOOT_BITOPS_H */
1682 -diff -urNp linux-3.1.3/arch/x86/boot/boot.h linux-3.1.3/arch/x86/boot/boot.h
1683 ---- linux-3.1.3/arch/x86/boot/boot.h 2011-11-11 15:19:27.000000000 -0500
1684 -+++ linux-3.1.3/arch/x86/boot/boot.h 2011-11-16 18:39:07.000000000 -0500
1685 +diff -urNp linux-3.1.4/arch/x86/boot/boot.h linux-3.1.4/arch/x86/boot/boot.h
1686 +--- linux-3.1.4/arch/x86/boot/boot.h 2011-11-11 15:19:27.000000000 -0500
1687 ++++ linux-3.1.4/arch/x86/boot/boot.h 2011-11-16 18:39:07.000000000 -0500
1688 @@ -85,7 +85,7 @@ static inline void io_delay(void)
1689 static inline u16 ds(void)
1690 {
1691 @@ -5159,9 +5159,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/boot.h linux-3.1.3/arch/x86/boot/boot.h
1692 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
1693 return diff;
1694 }
1695 -diff -urNp linux-3.1.3/arch/x86/boot/compressed/head_32.S linux-3.1.3/arch/x86/boot/compressed/head_32.S
1696 ---- linux-3.1.3/arch/x86/boot/compressed/head_32.S 2011-11-11 15:19:27.000000000 -0500
1697 -+++ linux-3.1.3/arch/x86/boot/compressed/head_32.S 2011-11-16 18:39:07.000000000 -0500
1698 +diff -urNp linux-3.1.4/arch/x86/boot/compressed/head_32.S linux-3.1.4/arch/x86/boot/compressed/head_32.S
1699 +--- linux-3.1.4/arch/x86/boot/compressed/head_32.S 2011-11-11 15:19:27.000000000 -0500
1700 ++++ linux-3.1.4/arch/x86/boot/compressed/head_32.S 2011-11-16 18:39:07.000000000 -0500
1701 @@ -76,7 +76,7 @@ ENTRY(startup_32)
1702 notl %eax
1703 andl %eax, %ebx
1704 @@ -5190,9 +5190,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/compressed/head_32.S linux-3.1.3/arch/x86/b
1705 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
1706 jmp 1b
1707 2:
1708 -diff -urNp linux-3.1.3/arch/x86/boot/compressed/head_64.S linux-3.1.3/arch/x86/boot/compressed/head_64.S
1709 ---- linux-3.1.3/arch/x86/boot/compressed/head_64.S 2011-11-11 15:19:27.000000000 -0500
1710 -+++ linux-3.1.3/arch/x86/boot/compressed/head_64.S 2011-11-16 18:39:07.000000000 -0500
1711 +diff -urNp linux-3.1.4/arch/x86/boot/compressed/head_64.S linux-3.1.4/arch/x86/boot/compressed/head_64.S
1712 +--- linux-3.1.4/arch/x86/boot/compressed/head_64.S 2011-11-11 15:19:27.000000000 -0500
1713 ++++ linux-3.1.4/arch/x86/boot/compressed/head_64.S 2011-11-16 18:39:07.000000000 -0500
1714 @@ -91,7 +91,7 @@ ENTRY(startup_32)
1715 notl %eax
1716 andl %eax, %ebx
1717 @@ -5211,9 +5211,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/compressed/head_64.S linux-3.1.3/arch/x86/b
1718 #endif
1719
1720 /* Target address to relocate to for decompression */
1721 -diff -urNp linux-3.1.3/arch/x86/boot/compressed/Makefile linux-3.1.3/arch/x86/boot/compressed/Makefile
1722 ---- linux-3.1.3/arch/x86/boot/compressed/Makefile 2011-11-11 15:19:27.000000000 -0500
1723 -+++ linux-3.1.3/arch/x86/boot/compressed/Makefile 2011-11-16 18:39:07.000000000 -0500
1724 +diff -urNp linux-3.1.4/arch/x86/boot/compressed/Makefile linux-3.1.4/arch/x86/boot/compressed/Makefile
1725 +--- linux-3.1.4/arch/x86/boot/compressed/Makefile 2011-11-11 15:19:27.000000000 -0500
1726 ++++ linux-3.1.4/arch/x86/boot/compressed/Makefile 2011-11-16 18:39:07.000000000 -0500
1727 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
1728 KBUILD_CFLAGS += $(cflags-y)
1729 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
1730 @@ -5224,9 +5224,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/compressed/Makefile linux-3.1.3/arch/x86/bo
1731
1732 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
1733 GCOV_PROFILE := n
1734 -diff -urNp linux-3.1.3/arch/x86/boot/compressed/misc.c linux-3.1.3/arch/x86/boot/compressed/misc.c
1735 ---- linux-3.1.3/arch/x86/boot/compressed/misc.c 2011-11-11 15:19:27.000000000 -0500
1736 -+++ linux-3.1.3/arch/x86/boot/compressed/misc.c 2011-11-16 18:39:07.000000000 -0500
1737 +diff -urNp linux-3.1.4/arch/x86/boot/compressed/misc.c linux-3.1.4/arch/x86/boot/compressed/misc.c
1738 +--- linux-3.1.4/arch/x86/boot/compressed/misc.c 2011-11-11 15:19:27.000000000 -0500
1739 ++++ linux-3.1.4/arch/x86/boot/compressed/misc.c 2011-11-16 18:39:07.000000000 -0500
1740 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
1741 case PT_LOAD:
1742 #ifdef CONFIG_RELOCATABLE
1743 @@ -5245,9 +5245,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/compressed/misc.c linux-3.1.3/arch/x86/boot
1744 error("Wrong destination address");
1745 #endif
1746
1747 -diff -urNp linux-3.1.3/arch/x86/boot/compressed/relocs.c linux-3.1.3/arch/x86/boot/compressed/relocs.c
1748 ---- linux-3.1.3/arch/x86/boot/compressed/relocs.c 2011-11-11 15:19:27.000000000 -0500
1749 -+++ linux-3.1.3/arch/x86/boot/compressed/relocs.c 2011-11-16 18:39:07.000000000 -0500
1750 +diff -urNp linux-3.1.4/arch/x86/boot/compressed/relocs.c linux-3.1.4/arch/x86/boot/compressed/relocs.c
1751 +--- linux-3.1.4/arch/x86/boot/compressed/relocs.c 2011-11-11 15:19:27.000000000 -0500
1752 ++++ linux-3.1.4/arch/x86/boot/compressed/relocs.c 2011-11-16 18:39:07.000000000 -0500
1753 @@ -13,8 +13,11 @@
1754
1755 static void die(char *fmt, ...);
1756 @@ -5440,9 +5440,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/compressed/relocs.c linux-3.1.3/arch/x86/bo
1757 read_shdrs(fp);
1758 read_strtabs(fp);
1759 read_symtabs(fp);
1760 -diff -urNp linux-3.1.3/arch/x86/boot/cpucheck.c linux-3.1.3/arch/x86/boot/cpucheck.c
1761 ---- linux-3.1.3/arch/x86/boot/cpucheck.c 2011-11-11 15:19:27.000000000 -0500
1762 -+++ linux-3.1.3/arch/x86/boot/cpucheck.c 2011-11-16 18:39:07.000000000 -0500
1763 +diff -urNp linux-3.1.4/arch/x86/boot/cpucheck.c linux-3.1.4/arch/x86/boot/cpucheck.c
1764 +--- linux-3.1.4/arch/x86/boot/cpucheck.c 2011-11-11 15:19:27.000000000 -0500
1765 ++++ linux-3.1.4/arch/x86/boot/cpucheck.c 2011-11-16 18:39:07.000000000 -0500
1766 @@ -74,7 +74,7 @@ static int has_fpu(void)
1767 u16 fcw = -1, fsw = -1;
1768 u32 cr0;
1769 @@ -5538,9 +5538,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/cpucheck.c linux-3.1.3/arch/x86/boot/cpuche
1770
1771 err = check_flags();
1772 }
1773 -diff -urNp linux-3.1.3/arch/x86/boot/header.S linux-3.1.3/arch/x86/boot/header.S
1774 ---- linux-3.1.3/arch/x86/boot/header.S 2011-11-11 15:19:27.000000000 -0500
1775 -+++ linux-3.1.3/arch/x86/boot/header.S 2011-11-16 18:39:07.000000000 -0500
1776 +diff -urNp linux-3.1.4/arch/x86/boot/header.S linux-3.1.4/arch/x86/boot/header.S
1777 +--- linux-3.1.4/arch/x86/boot/header.S 2011-11-11 15:19:27.000000000 -0500
1778 ++++ linux-3.1.4/arch/x86/boot/header.S 2011-11-16 18:39:07.000000000 -0500
1779 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
1780 # single linked list of
1781 # struct setup_data
1782 @@ -5550,9 +5550,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/header.S linux-3.1.3/arch/x86/boot/header.S
1783
1784 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
1785 #define VO_INIT_SIZE (VO__end - VO__text)
1786 -diff -urNp linux-3.1.3/arch/x86/boot/Makefile linux-3.1.3/arch/x86/boot/Makefile
1787 ---- linux-3.1.3/arch/x86/boot/Makefile 2011-11-11 15:19:27.000000000 -0500
1788 -+++ linux-3.1.3/arch/x86/boot/Makefile 2011-11-16 18:39:07.000000000 -0500
1789 +diff -urNp linux-3.1.4/arch/x86/boot/Makefile linux-3.1.4/arch/x86/boot/Makefile
1790 +--- linux-3.1.4/arch/x86/boot/Makefile 2011-11-11 15:19:27.000000000 -0500
1791 ++++ linux-3.1.4/arch/x86/boot/Makefile 2011-11-16 18:39:07.000000000 -0500
1792 @@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
1793 $(call cc-option, -fno-stack-protector) \
1794 $(call cc-option, -mpreferred-stack-boundary=2)
1795 @@ -5563,9 +5563,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/Makefile linux-3.1.3/arch/x86/boot/Makefile
1796 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
1797 GCOV_PROFILE := n
1798
1799 -diff -urNp linux-3.1.3/arch/x86/boot/memory.c linux-3.1.3/arch/x86/boot/memory.c
1800 ---- linux-3.1.3/arch/x86/boot/memory.c 2011-11-11 15:19:27.000000000 -0500
1801 -+++ linux-3.1.3/arch/x86/boot/memory.c 2011-11-16 18:39:07.000000000 -0500
1802 +diff -urNp linux-3.1.4/arch/x86/boot/memory.c linux-3.1.4/arch/x86/boot/memory.c
1803 +--- linux-3.1.4/arch/x86/boot/memory.c 2011-11-11 15:19:27.000000000 -0500
1804 ++++ linux-3.1.4/arch/x86/boot/memory.c 2011-11-16 18:39:07.000000000 -0500
1805 @@ -19,7 +19,7 @@
1806
1807 static int detect_memory_e820(void)
1808 @@ -5575,9 +5575,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/memory.c linux-3.1.3/arch/x86/boot/memory.c
1809 struct biosregs ireg, oreg;
1810 struct e820entry *desc = boot_params.e820_map;
1811 static struct e820entry buf; /* static so it is zeroed */
1812 -diff -urNp linux-3.1.3/arch/x86/boot/video.c linux-3.1.3/arch/x86/boot/video.c
1813 ---- linux-3.1.3/arch/x86/boot/video.c 2011-11-11 15:19:27.000000000 -0500
1814 -+++ linux-3.1.3/arch/x86/boot/video.c 2011-11-16 18:39:07.000000000 -0500
1815 +diff -urNp linux-3.1.4/arch/x86/boot/video.c linux-3.1.4/arch/x86/boot/video.c
1816 +--- linux-3.1.4/arch/x86/boot/video.c 2011-11-11 15:19:27.000000000 -0500
1817 ++++ linux-3.1.4/arch/x86/boot/video.c 2011-11-16 18:39:07.000000000 -0500
1818 @@ -96,7 +96,7 @@ static void store_mode_params(void)
1819 static unsigned int get_entry(void)
1820 {
1821 @@ -5587,9 +5587,9 @@ diff -urNp linux-3.1.3/arch/x86/boot/video.c linux-3.1.3/arch/x86/boot/video.c
1822 int key;
1823 unsigned int v;
1824
1825 -diff -urNp linux-3.1.3/arch/x86/boot/video-vesa.c linux-3.1.3/arch/x86/boot/video-vesa.c
1826 ---- linux-3.1.3/arch/x86/boot/video-vesa.c 2011-11-11 15:19:27.000000000 -0500
1827 -+++ linux-3.1.3/arch/x86/boot/video-vesa.c 2011-11-16 18:39:07.000000000 -0500
1828 +diff -urNp linux-3.1.4/arch/x86/boot/video-vesa.c linux-3.1.4/arch/x86/boot/video-vesa.c
1829 +--- linux-3.1.4/arch/x86/boot/video-vesa.c 2011-11-11 15:19:27.000000000 -0500
1830 ++++ linux-3.1.4/arch/x86/boot/video-vesa.c 2011-11-16 18:39:07.000000000 -0500
1831 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
1832
1833 boot_params.screen_info.vesapm_seg = oreg.es;
1834 @@ -5598,9 +5598,198 @@ diff -urNp linux-3.1.3/arch/x86/boot/video-vesa.c linux-3.1.3/arch/x86/boot/vide
1835 }
1836
1837 /*
1838 -diff -urNp linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S
1839 ---- linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
1840 -+++ linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
1841 +diff -urNp linux-3.1.4/arch/x86/crypto/aesni-intel_asm.S linux-3.1.4/arch/x86/crypto/aesni-intel_asm.S
1842 +--- linux-3.1.4/arch/x86/crypto/aesni-intel_asm.S 2011-11-11 15:19:27.000000000 -0500
1843 ++++ linux-3.1.4/arch/x86/crypto/aesni-intel_asm.S 2011-12-02 17:38:47.000000000 -0500
1844 +@@ -31,6 +31,7 @@
1845 +
1846 + #include <linux/linkage.h>
1847 + #include <asm/inst.h>
1848 ++#include <asm/alternative-asm.h>
1849 +
1850 + #ifdef __x86_64__
1851 + .data
1852 +@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
1853 + pop %r14
1854 + pop %r13
1855 + pop %r12
1856 ++ pax_force_retaddr 0, 1
1857 + ret
1858 ++ENDPROC(aesni_gcm_dec)
1859 +
1860 +
1861 + /*****************************************************************************
1862 +@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
1863 + pop %r14
1864 + pop %r13
1865 + pop %r12
1866 ++ pax_force_retaddr 0, 1
1867 + ret
1868 ++ENDPROC(aesni_gcm_enc)
1869 +
1870 + #endif
1871 +
1872 +@@ -1714,6 +1719,7 @@ _key_expansion_256a:
1873 + pxor %xmm1, %xmm0
1874 + movaps %xmm0, (TKEYP)
1875 + add $0x10, TKEYP
1876 ++ pax_force_retaddr_bts
1877 + ret
1878 +
1879 + .align 4
1880 +@@ -1738,6 +1744,7 @@ _key_expansion_192a:
1881 + shufps $0b01001110, %xmm2, %xmm1
1882 + movaps %xmm1, 0x10(TKEYP)
1883 + add $0x20, TKEYP
1884 ++ pax_force_retaddr_bts
1885 + ret
1886 +
1887 + .align 4
1888 +@@ -1757,6 +1764,7 @@ _key_expansion_192b:
1889 +
1890 + movaps %xmm0, (TKEYP)
1891 + add $0x10, TKEYP
1892 ++ pax_force_retaddr_bts
1893 + ret
1894 +
1895 + .align 4
1896 +@@ -1769,6 +1777,7 @@ _key_expansion_256b:
1897 + pxor %xmm1, %xmm2
1898 + movaps %xmm2, (TKEYP)
1899 + add $0x10, TKEYP
1900 ++ pax_force_retaddr_bts
1901 + ret
1902 +
1903 + /*
1904 +@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
1905 + #ifndef __x86_64__
1906 + popl KEYP
1907 + #endif
1908 ++ pax_force_retaddr 0, 1
1909 + ret
1910 ++ENDPROC(aesni_set_key)
1911 +
1912 + /*
1913 + * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
1914 +@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
1915 + popl KLEN
1916 + popl KEYP
1917 + #endif
1918 ++ pax_force_retaddr 0, 1
1919 + ret
1920 ++ENDPROC(aesni_enc)
1921 +
1922 + /*
1923 + * _aesni_enc1: internal ABI
1924 +@@ -1959,6 +1972,7 @@ _aesni_enc1:
1925 + AESENC KEY STATE
1926 + movaps 0x70(TKEYP), KEY
1927 + AESENCLAST KEY STATE
1928 ++ pax_force_retaddr_bts
1929 + ret
1930 +
1931 + /*
1932 +@@ -2067,6 +2081,7 @@ _aesni_enc4:
1933 + AESENCLAST KEY STATE2
1934 + AESENCLAST KEY STATE3
1935 + AESENCLAST KEY STATE4
1936 ++ pax_force_retaddr_bts
1937 + ret
1938 +
1939 + /*
1940 +@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
1941 + popl KLEN
1942 + popl KEYP
1943 + #endif
1944 ++ pax_force_retaddr 0, 1
1945 + ret
1946 ++ENDPROC(aesni_dec)
1947 +
1948 + /*
1949 + * _aesni_dec1: internal ABI
1950 +@@ -2146,6 +2163,7 @@ _aesni_dec1:
1951 + AESDEC KEY STATE
1952 + movaps 0x70(TKEYP), KEY
1953 + AESDECLAST KEY STATE
1954 ++ pax_force_retaddr_bts
1955 + ret
1956 +
1957 + /*
1958 +@@ -2254,6 +2272,7 @@ _aesni_dec4:
1959 + AESDECLAST KEY STATE2
1960 + AESDECLAST KEY STATE3
1961 + AESDECLAST KEY STATE4
1962 ++ pax_force_retaddr_bts
1963 + ret
1964 +
1965 + /*
1966 +@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
1967 + popl KEYP
1968 + popl LEN
1969 + #endif
1970 ++ pax_force_retaddr 0, 1
1971 + ret
1972 ++ENDPROC(aesni_ecb_enc)
1973 +
1974 + /*
1975 + * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
1976 +@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
1977 + popl KEYP
1978 + popl LEN
1979 + #endif
1980 ++ pax_force_retaddr 0, 1
1981 + ret
1982 ++ENDPROC(aesni_ecb_dec)
1983 +
1984 + /*
1985 + * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
1986 +@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
1987 + popl LEN
1988 + popl IVP
1989 + #endif
1990 ++ pax_force_retaddr 0, 1
1991 + ret
1992 ++ENDPROC(aesni_cbc_enc)
1993 +
1994 + /*
1995 + * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
1996 +@@ -2498,7 +2523,9 @@ ENTRY(aesni_cbc_dec)
1997 + popl LEN
1998 + popl IVP
1999 + #endif
2000 ++ pax_force_retaddr 0, 1
2001 + ret
2002 ++ENDPROC(aesni_cbc_dec)
2003 +
2004 + #ifdef __x86_64__
2005 + .align 16
2006 +@@ -2524,6 +2551,7 @@ _aesni_inc_init:
2007 + mov $1, TCTR_LOW
2008 + MOVQ_R64_XMM TCTR_LOW INC
2009 + MOVQ_R64_XMM CTR TCTR_LOW
2010 ++ pax_force_retaddr_bts
2011 + ret
2012 +
2013 + /*
2014 +@@ -2552,6 +2580,7 @@ _aesni_inc:
2015 + .Linc_low:
2016 + movaps CTR, IV
2017 + PSHUFB_XMM BSWAP_MASK IV
2018 ++ pax_force_retaddr_bts
2019 + ret
2020 +
2021 + /*
2022 +@@ -2612,5 +2641,7 @@ ENTRY(aesni_ctr_enc)
2023 + .Lctr_enc_ret:
2024 + movups IV, (IVP)
2025 + .Lctr_enc_just_ret:
2026 ++ pax_force_retaddr 0, 1
2027 + ret
2028 ++ENDPROC(aesni_ctr_enc)
2029 + #endif
2030 +diff -urNp linux-3.1.4/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.1.4/arch/x86/crypto/aes-x86_64-asm_64.S
2031 +--- linux-3.1.4/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
2032 ++++ linux-3.1.4/arch/x86/crypto/aes-x86_64-asm_64.S 2011-12-02 17:38:47.000000000 -0500
2033 @@ -8,6 +8,8 @@
2034 * including this sentence is retained in full.
2035 */
2036 @@ -5614,14 +5803,14 @@ diff -urNp linux-3.1.3/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.1.3/arch/x86/
2037 je B192; \
2038 leaq 32(r9),r9;
2039
2040 -+#define ret pax_force_retaddr; ret
2041 ++#define ret pax_force_retaddr 0, 1; ret
2042 +
2043 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
2044 movq r1,r2; \
2045 movq r3,r4; \
2046 -diff -urNp linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S
2047 ---- linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
2048 -+++ linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
2049 +diff -urNp linux-3.1.4/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.4/arch/x86/crypto/salsa20-x86_64-asm_64.S
2050 +--- linux-3.1.4/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
2051 ++++ linux-3.1.4/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-12-02 17:38:47.000000000 -0500
2052 @@ -1,3 +1,5 @@
2053 +#include <asm/alternative-asm.h>
2054 +
2055 @@ -5632,7 +5821,7 @@ diff -urNp linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.3/arch/
2056 add %r11,%rsp
2057 mov %rdi,%rax
2058 mov %rsi,%rdx
2059 -+ pax_force_retaddr
2060 ++ pax_force_retaddr 0, 1
2061 ret
2062 # bytesatleast65:
2063 ._bytesatleast65:
2064 @@ -5650,9 +5839,9 @@ diff -urNp linux-3.1.3/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.3/arch/
2065 mov %rsi,%rdx
2066 + pax_force_retaddr
2067 ret
2068 -diff -urNp linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S
2069 ---- linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
2070 -+++ linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-16 18:39:07.000000000 -0500
2071 +diff -urNp linux-3.1.4/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.4/arch/x86/crypto/twofish-x86_64-asm_64.S
2072 +--- linux-3.1.4/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-11 15:19:27.000000000 -0500
2073 ++++ linux-3.1.4/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-12-02 17:38:47.000000000 -0500
2074 @@ -21,6 +21,7 @@
2075 .text
2076
2077 @@ -5665,7 +5854,7 @@ diff -urNp linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.3/arch/
2078
2079 popq R1
2080 movq $1,%rax
2081 -+ pax_force_retaddr
2082 ++ pax_force_retaddr 0, 1
2083 ret
2084
2085 twofish_dec_blk:
2086 @@ -5673,11 +5862,11 @@ diff -urNp linux-3.1.3/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.3/arch/
2087
2088 popq R1
2089 movq $1,%rax
2090 -+ pax_force_retaddr
2091 ++ pax_force_retaddr 0, 1
2092 ret
2093 -diff -urNp linux-3.1.3/arch/x86/ia32/ia32_aout.c linux-3.1.3/arch/x86/ia32/ia32_aout.c
2094 ---- linux-3.1.3/arch/x86/ia32/ia32_aout.c 2011-11-11 15:19:27.000000000 -0500
2095 -+++ linux-3.1.3/arch/x86/ia32/ia32_aout.c 2011-11-16 18:40:08.000000000 -0500
2096 +diff -urNp linux-3.1.4/arch/x86/ia32/ia32_aout.c linux-3.1.4/arch/x86/ia32/ia32_aout.c
2097 +--- linux-3.1.4/arch/x86/ia32/ia32_aout.c 2011-11-11 15:19:27.000000000 -0500
2098 ++++ linux-3.1.4/arch/x86/ia32/ia32_aout.c 2011-11-16 18:40:08.000000000 -0500
2099 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
2100 unsigned long dump_start, dump_size;
2101 struct user32 dump;
2102 @@ -5687,9 +5876,9 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32_aout.c linux-3.1.3/arch/x86/ia32/ia32_
2103 fs = get_fs();
2104 set_fs(KERNEL_DS);
2105 has_dumped = 1;
2106 -diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32entry.S
2107 ---- linux-3.1.3/arch/x86/ia32/ia32entry.S 2011-11-11 15:19:27.000000000 -0500
2108 -+++ linux-3.1.3/arch/x86/ia32/ia32entry.S 2011-11-17 18:27:57.000000000 -0500
2109 +diff -urNp linux-3.1.4/arch/x86/ia32/ia32entry.S linux-3.1.4/arch/x86/ia32/ia32entry.S
2110 +--- linux-3.1.4/arch/x86/ia32/ia32entry.S 2011-11-11 15:19:27.000000000 -0500
2111 ++++ linux-3.1.4/arch/x86/ia32/ia32entry.S 2011-12-02 17:38:47.000000000 -0500
2112 @@ -13,7 +13,9 @@
2113 #include <asm/thread_info.h>
2114 #include <asm/segment.h>
2115 @@ -5700,11 +5889,12 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2116
2117 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
2118 #include <linux/elf-em.h>
2119 -@@ -95,6 +97,29 @@ ENTRY(native_irq_enable_sysexit)
2120 +@@ -95,6 +97,30 @@ ENTRY(native_irq_enable_sysexit)
2121 ENDPROC(native_irq_enable_sysexit)
2122 #endif
2123
2124 + .macro pax_enter_kernel_user
2125 ++ pax_set_fptr_mask
2126 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2127 + call pax_enter_kernel_user
2128 +#endif
2129 @@ -5730,48 +5920,84 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2130 /*
2131 * 32bit SYSENTER instruction entry.
2132 *
2133 -@@ -121,7 +146,7 @@ ENTRY(ia32_sysenter_target)
2134 +@@ -121,12 +147,6 @@ ENTRY(ia32_sysenter_target)
2135 CFI_REGISTER rsp,rbp
2136 SWAPGS_UNSAFE_STACK
2137 movq PER_CPU_VAR(kernel_stack), %rsp
2138 - addq $(KERNEL_STACK_OFFSET),%rsp
2139 -+ pax_enter_kernel_user
2140 - /*
2141 - * No need to follow this irqs on/off section: the syscall
2142 - * disabled irqs, here we enable it straight after entry:
2143 -@@ -134,7 +159,8 @@ ENTRY(ia32_sysenter_target)
2144 +- /*
2145 +- * No need to follow this irqs on/off section: the syscall
2146 +- * disabled irqs, here we enable it straight after entry:
2147 +- */
2148 +- ENABLE_INTERRUPTS(CLBR_NONE)
2149 + movl %ebp,%ebp /* zero extension */
2150 + pushq_cfi $__USER32_DS
2151 + /*CFI_REL_OFFSET ss,0*/
2152 +@@ -134,25 +154,38 @@ ENTRY(ia32_sysenter_target)
2153 CFI_REL_OFFSET rsp,0
2154 pushfq_cfi
2155 /*CFI_REL_OFFSET rflags,0*/
2156 - movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
2157 -+ GET_THREAD_INFO(%r10)
2158 -+ movl TI_sysenter_return(%r10), %r10d
2159 - CFI_REGISTER rip,r10
2160 +- CFI_REGISTER rip,r10
2161 ++ GET_THREAD_INFO(%r11)
2162 ++ movl TI_sysenter_return(%r11), %r11d
2163 ++ CFI_REGISTER rip,r11
2164 pushq_cfi $__USER32_CS
2165 /*CFI_REL_OFFSET cs,0*/
2166 -@@ -146,6 +172,12 @@ ENTRY(ia32_sysenter_target)
2167 + movl %eax, %eax
2168 +- pushq_cfi %r10
2169 ++ pushq_cfi %r11
2170 + CFI_REL_OFFSET rip,0
2171 + pushq_cfi %rax
2172 + cld
2173 SAVE_ARGS 0,1,0
2174 ++ pax_enter_kernel_user
2175 ++ /*
2176 ++ * No need to follow this irqs on/off section: the syscall
2177 ++ * disabled irqs, here we enable it straight after entry:
2178 ++ */
2179 ++ ENABLE_INTERRUPTS(CLBR_NONE)
2180 /* no need to do an access_ok check here because rbp has been
2181 32bit zero extended */
2182 +
2183 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2184 -+ mov $PAX_USER_SHADOW_BASE,%r10
2185 -+ add %r10,%rbp
2186 ++ mov $PAX_USER_SHADOW_BASE,%r11
2187 ++ add %r11,%rbp
2188 +#endif
2189 +
2190 1: movl (%rbp),%ebp
2191 .section __ex_table,"a"
2192 .quad 1b,ia32_badarg
2193 -@@ -168,6 +200,8 @@ sysenter_dispatch:
2194 - testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
2195 + .previous
2196 +- GET_THREAD_INFO(%r10)
2197 +- orl $TS_COMPAT,TI_status(%r10)
2198 +- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
2199 ++ GET_THREAD_INFO(%r11)
2200 ++ orl $TS_COMPAT,TI_status(%r11)
2201 ++ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
2202 + CFI_REMEMBER_STATE
2203 + jnz sysenter_tracesys
2204 + cmpq $(IA32_NR_syscalls-1),%rax
2205 +@@ -162,13 +195,15 @@ sysenter_do_call:
2206 + sysenter_dispatch:
2207 + call *ia32_sys_call_table(,%rax,8)
2208 + movq %rax,RAX-ARGOFFSET(%rsp)
2209 +- GET_THREAD_INFO(%r10)
2210 ++ GET_THREAD_INFO(%r11)
2211 + DISABLE_INTERRUPTS(CLBR_NONE)
2212 + TRACE_IRQS_OFF
2213 +- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
2214 ++ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
2215 jnz sysexit_audit
2216 sysexit_from_sys_call:
2217 +- andl $~TS_COMPAT,TI_status(%r10)
2218 + pax_exit_kernel_user
2219 + pax_erase_kstack
2220 - andl $~TS_COMPAT,TI_status(%r10)
2221 ++ andl $~TS_COMPAT,TI_status(%r11)
2222 /* clear IF, that popfq doesn't enable interrupts early */
2223 andl $~0x200,EFLAGS-R11(%rsp)
2224 -@@ -194,6 +228,9 @@ sysexit_from_sys_call:
2225 + movl RIP-R11(%rsp),%edx /* User %eip */
2226 +@@ -194,6 +229,9 @@ sysexit_from_sys_call:
2227 movl %eax,%esi /* 2nd arg: syscall number */
2228 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
2229 call audit_syscall_entry
2230 @@ -5781,7 +6007,40 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2231 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
2232 cmpq $(IA32_NR_syscalls-1),%rax
2233 ja ia32_badsys
2234 -@@ -246,6 +283,9 @@ sysenter_tracesys:
2235 +@@ -205,7 +243,7 @@ sysexit_from_sys_call:
2236 + .endm
2237 +
2238 + .macro auditsys_exit exit
2239 +- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
2240 ++ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
2241 + jnz ia32_ret_from_sys_call
2242 + TRACE_IRQS_ON
2243 + sti
2244 +@@ -215,12 +253,12 @@ sysexit_from_sys_call:
2245 + movzbl %al,%edi /* zero-extend that into %edi */
2246 + inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
2247 + call audit_syscall_exit
2248 +- GET_THREAD_INFO(%r10)
2249 ++ GET_THREAD_INFO(%r11)
2250 + movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
2251 + movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
2252 + cli
2253 + TRACE_IRQS_OFF
2254 +- testl %edi,TI_flags(%r10)
2255 ++ testl %edi,TI_flags(%r11)
2256 + jz \exit
2257 + CLEAR_RREGS -ARGOFFSET
2258 + jmp int_with_check
2259 +@@ -238,7 +276,7 @@ sysexit_audit:
2260 +
2261 + sysenter_tracesys:
2262 + #ifdef CONFIG_AUDITSYSCALL
2263 +- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
2264 ++ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
2265 + jz sysenter_auditsys
2266 + #endif
2267 + SAVE_REST
2268 +@@ -246,6 +284,9 @@ sysenter_tracesys:
2269 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
2270 movq %rsp,%rdi /* &pt_regs -> arg1 */
2271 call syscall_trace_enter
2272 @@ -5791,7 +6050,7 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2273 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
2274 RESTORE_REST
2275 cmpq $(IA32_NR_syscalls-1),%rax
2276 -@@ -277,19 +317,24 @@ ENDPROC(ia32_sysenter_target)
2277 +@@ -277,19 +318,20 @@ ENDPROC(ia32_sysenter_target)
2278 ENTRY(ia32_cstar_target)
2279 CFI_STARTPROC32 simple
2280 CFI_SIGNAL_FRAME
2281 @@ -5803,44 +6062,69 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2282 movl %esp,%r8d
2283 CFI_REGISTER rsp,r8
2284 movq PER_CPU_VAR(kernel_stack),%rsp
2285 -+
2286 -+#ifdef CONFIG_PAX_MEMORY_UDEREF
2287 ++ SAVE_ARGS 8*6,0,0
2288 + pax_enter_kernel_user
2289 -+#endif
2290 -+
2291 /*
2292 * No need to follow this irqs on/off section: the syscall
2293 * disabled irqs and here we enable it straight after entry:
2294 */
2295 ENABLE_INTERRUPTS(CLBR_NONE)
2296 - SAVE_ARGS 8,0,0
2297 -+ SAVE_ARGS 8*6,0,0
2298 movl %eax,%eax /* zero extension */
2299 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
2300 movq %rcx,RIP-ARGOFFSET(%rsp)
2301 -@@ -305,6 +350,12 @@ ENTRY(ia32_cstar_target)
2302 +@@ -305,13 +347,19 @@ ENTRY(ia32_cstar_target)
2303 /* no need to do an access_ok check here because r8 has been
2304 32bit zero extended */
2305 /* hardware stack frame is complete now */
2306 +
2307 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2308 -+ mov $PAX_USER_SHADOW_BASE,%r10
2309 -+ add %r10,%r8
2310 ++ mov $PAX_USER_SHADOW_BASE,%r11
2311 ++ add %r11,%r8
2312 +#endif
2313 +
2314 1: movl (%r8),%r9d
2315 .section __ex_table,"a"
2316 .quad 1b,ia32_badarg
2317 -@@ -327,6 +378,8 @@ cstar_dispatch:
2318 - testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
2319 + .previous
2320 +- GET_THREAD_INFO(%r10)
2321 +- orl $TS_COMPAT,TI_status(%r10)
2322 +- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
2323 ++ GET_THREAD_INFO(%r11)
2324 ++ orl $TS_COMPAT,TI_status(%r11)
2325 ++ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
2326 + CFI_REMEMBER_STATE
2327 + jnz cstar_tracesys
2328 + cmpq $IA32_NR_syscalls-1,%rax
2329 +@@ -321,13 +369,15 @@ cstar_do_call:
2330 + cstar_dispatch:
2331 + call *ia32_sys_call_table(,%rax,8)
2332 + movq %rax,RAX-ARGOFFSET(%rsp)
2333 +- GET_THREAD_INFO(%r10)
2334 ++ GET_THREAD_INFO(%r11)
2335 + DISABLE_INTERRUPTS(CLBR_NONE)
2336 + TRACE_IRQS_OFF
2337 +- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
2338 ++ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
2339 jnz sysretl_audit
2340 sysretl_from_sys_call:
2341 +- andl $~TS_COMPAT,TI_status(%r10)
2342 + pax_exit_kernel_user
2343 + pax_erase_kstack
2344 - andl $~TS_COMPAT,TI_status(%r10)
2345 ++ andl $~TS_COMPAT,TI_status(%r11)
2346 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
2347 movl RIP-ARGOFFSET(%rsp),%ecx
2348 -@@ -364,6 +417,9 @@ cstar_tracesys:
2349 + CFI_REGISTER rip,rcx
2350 +@@ -355,7 +405,7 @@ sysretl_audit:
2351 +
2352 + cstar_tracesys:
2353 + #ifdef CONFIG_AUDITSYSCALL
2354 +- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
2355 ++ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
2356 + jz cstar_auditsys
2357 + #endif
2358 + xchgl %r9d,%ebp
2359 +@@ -364,6 +414,9 @@ cstar_tracesys:
2360 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
2361 movq %rsp,%rdi /* &pt_regs -> arg1 */
2362 call syscall_trace_enter
2363 @@ -5850,15 +6134,37 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2364 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
2365 RESTORE_REST
2366 xchgl %ebp,%r9d
2367 -@@ -409,6 +465,7 @@ ENTRY(ia32_syscall)
2368 +@@ -409,20 +462,21 @@ ENTRY(ia32_syscall)
2369 CFI_REL_OFFSET rip,RIP-RIP
2370 PARAVIRT_ADJUST_EXCEPTION_FRAME
2371 SWAPGS
2372 +- /*
2373 +- * No need to follow this irqs on/off section: the syscall
2374 +- * disabled irqs and here we enable it straight after entry:
2375 +- */
2376 +- ENABLE_INTERRUPTS(CLBR_NONE)
2377 + movl %eax,%eax
2378 + pushq_cfi %rax
2379 + cld
2380 + /* note the registers are not zero extended to the sf.
2381 + this could be a problem. */
2382 + SAVE_ARGS 0,1,0
2383 +- GET_THREAD_INFO(%r10)
2384 +- orl $TS_COMPAT,TI_status(%r10)
2385 +- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
2386 + pax_enter_kernel_user
2387 - /*
2388 - * No need to follow this irqs on/off section: the syscall
2389 - * disabled irqs and here we enable it straight after entry:
2390 -@@ -441,6 +498,9 @@ ia32_tracesys:
2391 ++ /*
2392 ++ * No need to follow this irqs on/off section: the syscall
2393 ++ * disabled irqs and here we enable it straight after entry:
2394 ++ */
2395 ++ ENABLE_INTERRUPTS(CLBR_NONE)
2396 ++ GET_THREAD_INFO(%r11)
2397 ++ orl $TS_COMPAT,TI_status(%r11)
2398 ++ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
2399 + jnz ia32_tracesys
2400 + cmpq $(IA32_NR_syscalls-1),%rax
2401 + ja ia32_badsys
2402 +@@ -441,6 +495,9 @@ ia32_tracesys:
2403 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
2404 movq %rsp,%rdi /* &pt_regs -> arg1 */
2405 call syscall_trace_enter
2406 @@ -5868,7 +6174,7 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2407 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
2408 RESTORE_REST
2409 cmpq $(IA32_NR_syscalls-1),%rax
2410 -@@ -455,6 +515,7 @@ ia32_badsys:
2411 +@@ -455,6 +512,7 @@ ia32_badsys:
2412
2413 quiet_ni_syscall:
2414 movq $-ENOSYS,%rax
2415 @@ -5876,9 +6182,9 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32entry.S linux-3.1.3/arch/x86/ia32/ia32e
2416 ret
2417 CFI_ENDPROC
2418
2419 -diff -urNp linux-3.1.3/arch/x86/ia32/ia32_signal.c linux-3.1.3/arch/x86/ia32/ia32_signal.c
2420 ---- linux-3.1.3/arch/x86/ia32/ia32_signal.c 2011-11-11 15:19:27.000000000 -0500
2421 -+++ linux-3.1.3/arch/x86/ia32/ia32_signal.c 2011-11-16 18:39:07.000000000 -0500
2422 +diff -urNp linux-3.1.4/arch/x86/ia32/ia32_signal.c linux-3.1.4/arch/x86/ia32/ia32_signal.c
2423 +--- linux-3.1.4/arch/x86/ia32/ia32_signal.c 2011-11-11 15:19:27.000000000 -0500
2424 ++++ linux-3.1.4/arch/x86/ia32/ia32_signal.c 2011-11-16 18:39:07.000000000 -0500
2425 @@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const
2426 }
2427 seg = get_fs();
2428 @@ -5955,9 +6261,9 @@ diff -urNp linux-3.1.3/arch/x86/ia32/ia32_signal.c linux-3.1.3/arch/x86/ia32/ia3
2429 } put_user_catch(err);
2430
2431 if (err)
2432 -diff -urNp linux-3.1.3/arch/x86/ia32/sys_ia32.c linux-3.1.3/arch/x86/ia32/sys_ia32.c
2433 ---- linux-3.1.3/arch/x86/ia32/sys_ia32.c 2011-11-11 15:19:27.000000000 -0500
2434 -+++ linux-3.1.3/arch/x86/ia32/sys_ia32.c 2011-11-16 18:39:07.000000000 -0500
2435 +diff -urNp linux-3.1.4/arch/x86/ia32/sys_ia32.c linux-3.1.4/arch/x86/ia32/sys_ia32.c
2436 +--- linux-3.1.4/arch/x86/ia32/sys_ia32.c 2011-11-11 15:19:27.000000000 -0500
2437 ++++ linux-3.1.4/arch/x86/ia32/sys_ia32.c 2011-11-16 18:39:07.000000000 -0500
2438 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
2439 */
2440 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
2441 @@ -6025,33 +6331,58 @@ diff -urNp linux-3.1.3/arch/x86/ia32/sys_ia32.c linux-3.1.3/arch/x86/ia32/sys_ia
2442 count);
2443 set_fs(old_fs);
2444
2445 -diff -urNp linux-3.1.3/arch/x86/include/asm/alternative-asm.h linux-3.1.3/arch/x86/include/asm/alternative-asm.h
2446 ---- linux-3.1.3/arch/x86/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
2447 -+++ linux-3.1.3/arch/x86/include/asm/alternative-asm.h 2011-11-16 18:39:07.000000000 -0500
2448 -@@ -15,6 +15,20 @@
2449 +diff -urNp linux-3.1.4/arch/x86/include/asm/alternative-asm.h linux-3.1.4/arch/x86/include/asm/alternative-asm.h
2450 +--- linux-3.1.4/arch/x86/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
2451 ++++ linux-3.1.4/arch/x86/include/asm/alternative-asm.h 2011-12-02 17:40:13.000000000 -0500
2452 +@@ -15,6 +15,45 @@
2453 .endm
2454 #endif
2455
2456 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
2457 -+ .macro pax_force_retaddr rip=0
2458 ++ .macro pax_force_retaddr_bts rip=0
2459 ++ btsq $63,\rip(%rsp)
2460 ++ .endm
2461 ++#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
2462 ++ .macro pax_force_retaddr rip=0, reload=0
2463 + btsq $63,\rip(%rsp)
2464 + .endm
2465 + .macro pax_force_fptr ptr
2466 + btsq $63,\ptr
2467 + .endm
2468 ++ .macro pax_set_fptr_mask
2469 ++ .endm
2470 ++#endif
2471 ++#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
2472 ++ .macro pax_force_retaddr rip=0, reload=0
2473 ++ .if \reload
2474 ++ pax_set_fptr_mask
2475 ++ .endif
2476 ++ orq %r10,\rip(%rsp)
2477 ++ .endm
2478 ++ .macro pax_force_fptr ptr
2479 ++ orq %r10,\ptr
2480 ++ .endm
2481 ++ .macro pax_set_fptr_mask
2482 ++ movabs $0x8000000000000000,%r10
2483 ++ .endm
2484 ++#endif
2485 +#else
2486 -+ .macro pax_force_retaddr rip=0
2487 ++ .macro pax_force_retaddr rip=0, reload=0
2488 + .endm
2489 + .macro pax_force_fptr ptr
2490 + .endm
2491 ++ .macro pax_force_retaddr_bts rip=0
2492 ++ .endm
2493 ++ .macro pax_set_fptr_mask
2494 ++ .endm
2495 +#endif
2496 +
2497 .macro altinstruction_entry orig alt feature orig_len alt_len
2498 .long \orig - .
2499 .long \alt - .
2500 -diff -urNp linux-3.1.3/arch/x86/include/asm/alternative.h linux-3.1.3/arch/x86/include/asm/alternative.h
2501 ---- linux-3.1.3/arch/x86/include/asm/alternative.h 2011-11-11 15:19:27.000000000 -0500
2502 -+++ linux-3.1.3/arch/x86/include/asm/alternative.h 2011-11-16 18:39:07.000000000 -0500
2503 +diff -urNp linux-3.1.4/arch/x86/include/asm/alternative.h linux-3.1.4/arch/x86/include/asm/alternative.h
2504 +--- linux-3.1.4/arch/x86/include/asm/alternative.h 2011-11-11 15:19:27.000000000 -0500
2505 ++++ linux-3.1.4/arch/x86/include/asm/alternative.h 2011-11-16 18:39:07.000000000 -0500
2506 @@ -89,7 +89,7 @@ static inline int alternatives_text_rese
2507 ".section .discard,\"aw\",@progbits\n" \
2508 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
2509 @@ -6061,9 +6392,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/alternative.h linux-3.1.3/arch/x86/i
2510 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
2511 ".previous"
2512
2513 -diff -urNp linux-3.1.3/arch/x86/include/asm/apic.h linux-3.1.3/arch/x86/include/asm/apic.h
2514 ---- linux-3.1.3/arch/x86/include/asm/apic.h 2011-11-11 15:19:27.000000000 -0500
2515 -+++ linux-3.1.3/arch/x86/include/asm/apic.h 2011-11-16 18:39:07.000000000 -0500
2516 +diff -urNp linux-3.1.4/arch/x86/include/asm/apic.h linux-3.1.4/arch/x86/include/asm/apic.h
2517 +--- linux-3.1.4/arch/x86/include/asm/apic.h 2011-11-11 15:19:27.000000000 -0500
2518 ++++ linux-3.1.4/arch/x86/include/asm/apic.h 2011-11-16 18:39:07.000000000 -0500
2519 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
2520
2521 #ifdef CONFIG_X86_LOCAL_APIC
2522 @@ -6073,9 +6404,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/apic.h linux-3.1.3/arch/x86/include/
2523 extern int local_apic_timer_c2_ok;
2524
2525 extern int disable_apic;
2526 -diff -urNp linux-3.1.3/arch/x86/include/asm/apm.h linux-3.1.3/arch/x86/include/asm/apm.h
2527 ---- linux-3.1.3/arch/x86/include/asm/apm.h 2011-11-11 15:19:27.000000000 -0500
2528 -+++ linux-3.1.3/arch/x86/include/asm/apm.h 2011-11-16 18:39:07.000000000 -0500
2529 +diff -urNp linux-3.1.4/arch/x86/include/asm/apm.h linux-3.1.4/arch/x86/include/asm/apm.h
2530 +--- linux-3.1.4/arch/x86/include/asm/apm.h 2011-11-11 15:19:27.000000000 -0500
2531 ++++ linux-3.1.4/arch/x86/include/asm/apm.h 2011-11-16 18:39:07.000000000 -0500
2532 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
2533 __asm__ __volatile__(APM_DO_ZERO_SEGS
2534 "pushl %%edi\n\t"
2535 @@ -6094,9 +6425,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/apm.h linux-3.1.3/arch/x86/include/a
2536 "setc %%bl\n\t"
2537 "popl %%ebp\n\t"
2538 "popl %%edi\n\t"
2539 -diff -urNp linux-3.1.3/arch/x86/include/asm/atomic64_32.h linux-3.1.3/arch/x86/include/asm/atomic64_32.h
2540 ---- linux-3.1.3/arch/x86/include/asm/atomic64_32.h 2011-11-11 15:19:27.000000000 -0500
2541 -+++ linux-3.1.3/arch/x86/include/asm/atomic64_32.h 2011-11-16 18:39:07.000000000 -0500
2542 +diff -urNp linux-3.1.4/arch/x86/include/asm/atomic64_32.h linux-3.1.4/arch/x86/include/asm/atomic64_32.h
2543 +--- linux-3.1.4/arch/x86/include/asm/atomic64_32.h 2011-11-11 15:19:27.000000000 -0500
2544 ++++ linux-3.1.4/arch/x86/include/asm/atomic64_32.h 2011-11-16 18:39:07.000000000 -0500
2545 @@ -12,6 +12,14 @@ typedef struct {
2546 u64 __aligned(8) counter;
2547 } atomic64_t;
2548 @@ -6246,9 +6577,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/atomic64_32.h linux-3.1.3/arch/x86/i
2549 * atomic64_sub - subtract the atomic64 variable
2550 * @i: integer value to subtract
2551 * @v: pointer to type atomic64_t
2552 -diff -urNp linux-3.1.3/arch/x86/include/asm/atomic64_64.h linux-3.1.3/arch/x86/include/asm/atomic64_64.h
2553 ---- linux-3.1.3/arch/x86/include/asm/atomic64_64.h 2011-11-11 15:19:27.000000000 -0500
2554 -+++ linux-3.1.3/arch/x86/include/asm/atomic64_64.h 2011-11-16 18:39:07.000000000 -0500
2555 +diff -urNp linux-3.1.4/arch/x86/include/asm/atomic64_64.h linux-3.1.4/arch/x86/include/asm/atomic64_64.h
2556 +--- linux-3.1.4/arch/x86/include/asm/atomic64_64.h 2011-11-11 15:19:27.000000000 -0500
2557 ++++ linux-3.1.4/arch/x86/include/asm/atomic64_64.h 2011-11-16 18:39:07.000000000 -0500
2558 @@ -18,7 +18,19 @@
2559 */
2560 static inline long atomic64_read(const atomic64_t *v)
2561 @@ -6570,9 +6901,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/atomic64_64.h linux-3.1.3/arch/x86/i
2562 }
2563
2564 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
2565 -diff -urNp linux-3.1.3/arch/x86/include/asm/atomic.h linux-3.1.3/arch/x86/include/asm/atomic.h
2566 ---- linux-3.1.3/arch/x86/include/asm/atomic.h 2011-11-11 15:19:27.000000000 -0500
2567 -+++ linux-3.1.3/arch/x86/include/asm/atomic.h 2011-11-16 18:39:07.000000000 -0500
2568 +diff -urNp linux-3.1.4/arch/x86/include/asm/atomic.h linux-3.1.4/arch/x86/include/asm/atomic.h
2569 +--- linux-3.1.4/arch/x86/include/asm/atomic.h 2011-11-11 15:19:27.000000000 -0500
2570 ++++ linux-3.1.4/arch/x86/include/asm/atomic.h 2011-11-16 18:39:07.000000000 -0500
2571 @@ -22,7 +22,18 @@
2572 */
2573 static inline int atomic_read(const atomic_t *v)
2574 @@ -6981,9 +7312,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/atomic.h linux-3.1.3/arch/x86/includ
2575
2576 /*
2577 * atomic_dec_if_positive - decrement by 1 if old value positive
2578 -diff -urNp linux-3.1.3/arch/x86/include/asm/bitops.h linux-3.1.3/arch/x86/include/asm/bitops.h
2579 ---- linux-3.1.3/arch/x86/include/asm/bitops.h 2011-11-11 15:19:27.000000000 -0500
2580 -+++ linux-3.1.3/arch/x86/include/asm/bitops.h 2011-11-16 18:39:07.000000000 -0500
2581 +diff -urNp linux-3.1.4/arch/x86/include/asm/bitops.h linux-3.1.4/arch/x86/include/asm/bitops.h
2582 +--- linux-3.1.4/arch/x86/include/asm/bitops.h 2011-11-11 15:19:27.000000000 -0500
2583 ++++ linux-3.1.4/arch/x86/include/asm/bitops.h 2011-11-16 18:39:07.000000000 -0500
2584 @@ -38,7 +38,7 @@
2585 * a mask operation on a byte.
2586 */
2587 @@ -6993,9 +7324,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/bitops.h linux-3.1.3/arch/x86/includ
2588 #define CONST_MASK(nr) (1 << ((nr) & 7))
2589
2590 /**
2591 -diff -urNp linux-3.1.3/arch/x86/include/asm/boot.h linux-3.1.3/arch/x86/include/asm/boot.h
2592 ---- linux-3.1.3/arch/x86/include/asm/boot.h 2011-11-11 15:19:27.000000000 -0500
2593 -+++ linux-3.1.3/arch/x86/include/asm/boot.h 2011-11-16 18:39:07.000000000 -0500
2594 +diff -urNp linux-3.1.4/arch/x86/include/asm/boot.h linux-3.1.4/arch/x86/include/asm/boot.h
2595 +--- linux-3.1.4/arch/x86/include/asm/boot.h 2011-11-11 15:19:27.000000000 -0500
2596 ++++ linux-3.1.4/arch/x86/include/asm/boot.h 2011-11-16 18:39:07.000000000 -0500
2597 @@ -11,10 +11,15 @@
2598 #include <asm/pgtable_types.h>
2599
2600 @@ -7013,9 +7344,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/boot.h linux-3.1.3/arch/x86/include/
2601 /* Minimum kernel alignment, as a power of two */
2602 #ifdef CONFIG_X86_64
2603 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
2604 -diff -urNp linux-3.1.3/arch/x86/include/asm/cacheflush.h linux-3.1.3/arch/x86/include/asm/cacheflush.h
2605 ---- linux-3.1.3/arch/x86/include/asm/cacheflush.h 2011-11-11 15:19:27.000000000 -0500
2606 -+++ linux-3.1.3/arch/x86/include/asm/cacheflush.h 2011-11-16 18:39:07.000000000 -0500
2607 +diff -urNp linux-3.1.4/arch/x86/include/asm/cacheflush.h linux-3.1.4/arch/x86/include/asm/cacheflush.h
2608 +--- linux-3.1.4/arch/x86/include/asm/cacheflush.h 2011-11-11 15:19:27.000000000 -0500
2609 ++++ linux-3.1.4/arch/x86/include/asm/cacheflush.h 2011-11-16 18:39:07.000000000 -0500
2610 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
2611 unsigned long pg_flags = pg->flags & _PGMT_MASK;
2612
2613 @@ -7025,9 +7356,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/cacheflush.h linux-3.1.3/arch/x86/in
2614 else if (pg_flags == _PGMT_WC)
2615 return _PAGE_CACHE_WC;
2616 else if (pg_flags == _PGMT_UC_MINUS)
2617 -diff -urNp linux-3.1.3/arch/x86/include/asm/cache.h linux-3.1.3/arch/x86/include/asm/cache.h
2618 ---- linux-3.1.3/arch/x86/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
2619 -+++ linux-3.1.3/arch/x86/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
2620 +diff -urNp linux-3.1.4/arch/x86/include/asm/cache.h linux-3.1.4/arch/x86/include/asm/cache.h
2621 +--- linux-3.1.4/arch/x86/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
2622 ++++ linux-3.1.4/arch/x86/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
2623 @@ -5,12 +5,13 @@
2624
2625 /* L1 cache line size */
2626 @@ -7044,9 +7375,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/cache.h linux-3.1.3/arch/x86/include
2627
2628 #ifdef CONFIG_X86_VSMP
2629 #ifdef CONFIG_SMP
2630 -diff -urNp linux-3.1.3/arch/x86/include/asm/checksum_32.h linux-3.1.3/arch/x86/include/asm/checksum_32.h
2631 ---- linux-3.1.3/arch/x86/include/asm/checksum_32.h 2011-11-11 15:19:27.000000000 -0500
2632 -+++ linux-3.1.3/arch/x86/include/asm/checksum_32.h 2011-11-16 18:39:07.000000000 -0500
2633 +diff -urNp linux-3.1.4/arch/x86/include/asm/checksum_32.h linux-3.1.4/arch/x86/include/asm/checksum_32.h
2634 +--- linux-3.1.4/arch/x86/include/asm/checksum_32.h 2011-11-11 15:19:27.000000000 -0500
2635 ++++ linux-3.1.4/arch/x86/include/asm/checksum_32.h 2011-11-16 18:39:07.000000000 -0500
2636 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
2637 int len, __wsum sum,
2638 int *src_err_ptr, int *dst_err_ptr);
2639 @@ -7080,9 +7411,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/checksum_32.h linux-3.1.3/arch/x86/i
2640 len, sum, NULL, err_ptr);
2641
2642 if (len)
2643 -diff -urNp linux-3.1.3/arch/x86/include/asm/cpufeature.h linux-3.1.3/arch/x86/include/asm/cpufeature.h
2644 ---- linux-3.1.3/arch/x86/include/asm/cpufeature.h 2011-11-11 15:19:27.000000000 -0500
2645 -+++ linux-3.1.3/arch/x86/include/asm/cpufeature.h 2011-11-16 18:39:07.000000000 -0500
2646 +diff -urNp linux-3.1.4/arch/x86/include/asm/cpufeature.h linux-3.1.4/arch/x86/include/asm/cpufeature.h
2647 +--- linux-3.1.4/arch/x86/include/asm/cpufeature.h 2011-11-11 15:19:27.000000000 -0500
2648 ++++ linux-3.1.4/arch/x86/include/asm/cpufeature.h 2011-11-16 18:39:07.000000000 -0500
2649 @@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
2650 ".section .discard,\"aw\",@progbits\n"
2651 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
2652 @@ -7092,9 +7423,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/cpufeature.h linux-3.1.3/arch/x86/in
2653 "3: movb $1,%0\n"
2654 "4:\n"
2655 ".previous\n"
2656 -diff -urNp linux-3.1.3/arch/x86/include/asm/desc_defs.h linux-3.1.3/arch/x86/include/asm/desc_defs.h
2657 ---- linux-3.1.3/arch/x86/include/asm/desc_defs.h 2011-11-11 15:19:27.000000000 -0500
2658 -+++ linux-3.1.3/arch/x86/include/asm/desc_defs.h 2011-11-16 18:39:07.000000000 -0500
2659 +diff -urNp linux-3.1.4/arch/x86/include/asm/desc_defs.h linux-3.1.4/arch/x86/include/asm/desc_defs.h
2660 +--- linux-3.1.4/arch/x86/include/asm/desc_defs.h 2011-11-11 15:19:27.000000000 -0500
2661 ++++ linux-3.1.4/arch/x86/include/asm/desc_defs.h 2011-11-16 18:39:07.000000000 -0500
2662 @@ -31,6 +31,12 @@ struct desc_struct {
2663 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
2664 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
2665 @@ -7108,9 +7439,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/desc_defs.h linux-3.1.3/arch/x86/inc
2666 };
2667 } __attribute__((packed));
2668
2669 -diff -urNp linux-3.1.3/arch/x86/include/asm/desc.h linux-3.1.3/arch/x86/include/asm/desc.h
2670 ---- linux-3.1.3/arch/x86/include/asm/desc.h 2011-11-11 15:19:27.000000000 -0500
2671 -+++ linux-3.1.3/arch/x86/include/asm/desc.h 2011-11-16 18:39:07.000000000 -0500
2672 +diff -urNp linux-3.1.4/arch/x86/include/asm/desc.h linux-3.1.4/arch/x86/include/asm/desc.h
2673 +--- linux-3.1.4/arch/x86/include/asm/desc.h 2011-11-11 15:19:27.000000000 -0500
2674 ++++ linux-3.1.4/arch/x86/include/asm/desc.h 2011-11-16 18:39:07.000000000 -0500
2675 @@ -4,6 +4,7 @@
2676 #include <asm/desc_defs.h>
2677 #include <asm/ldt.h>
2678 @@ -7289,9 +7620,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/desc.h linux-3.1.3/arch/x86/include/
2679 +#endif
2680 +
2681 #endif /* _ASM_X86_DESC_H */
2682 -diff -urNp linux-3.1.3/arch/x86/include/asm/e820.h linux-3.1.3/arch/x86/include/asm/e820.h
2683 ---- linux-3.1.3/arch/x86/include/asm/e820.h 2011-11-11 15:19:27.000000000 -0500
2684 -+++ linux-3.1.3/arch/x86/include/asm/e820.h 2011-11-16 18:39:07.000000000 -0500
2685 +diff -urNp linux-3.1.4/arch/x86/include/asm/e820.h linux-3.1.4/arch/x86/include/asm/e820.h
2686 +--- linux-3.1.4/arch/x86/include/asm/e820.h 2011-11-11 15:19:27.000000000 -0500
2687 ++++ linux-3.1.4/arch/x86/include/asm/e820.h 2011-11-16 18:39:07.000000000 -0500
2688 @@ -69,7 +69,7 @@ struct e820map {
2689 #define ISA_START_ADDRESS 0xa0000
2690 #define ISA_END_ADDRESS 0x100000
2691 @@ -7301,9 +7632,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/e820.h linux-3.1.3/arch/x86/include/
2692 #define BIOS_END 0x00100000
2693
2694 #define BIOS_ROM_BASE 0xffe00000
2695 -diff -urNp linux-3.1.3/arch/x86/include/asm/elf.h linux-3.1.3/arch/x86/include/asm/elf.h
2696 ---- linux-3.1.3/arch/x86/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
2697 -+++ linux-3.1.3/arch/x86/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
2698 +diff -urNp linux-3.1.4/arch/x86/include/asm/elf.h linux-3.1.4/arch/x86/include/asm/elf.h
2699 +--- linux-3.1.4/arch/x86/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
2700 ++++ linux-3.1.4/arch/x86/include/asm/elf.h 2011-11-16 18:39:07.000000000 -0500
2701 @@ -237,7 +237,25 @@ extern int force_personality32;
2702 the loader. We need to make sure that it is out of the way of the program
2703 that it will "exec", and that there is sufficient room for the brk. */
2704 @@ -7358,9 +7689,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/elf.h linux-3.1.3/arch/x86/include/a
2705 -#define arch_randomize_brk arch_randomize_brk
2706 -
2707 #endif /* _ASM_X86_ELF_H */
2708 -diff -urNp linux-3.1.3/arch/x86/include/asm/emergency-restart.h linux-3.1.3/arch/x86/include/asm/emergency-restart.h
2709 ---- linux-3.1.3/arch/x86/include/asm/emergency-restart.h 2011-11-11 15:19:27.000000000 -0500
2710 -+++ linux-3.1.3/arch/x86/include/asm/emergency-restart.h 2011-11-16 18:39:07.000000000 -0500
2711 +diff -urNp linux-3.1.4/arch/x86/include/asm/emergency-restart.h linux-3.1.4/arch/x86/include/asm/emergency-restart.h
2712 +--- linux-3.1.4/arch/x86/include/asm/emergency-restart.h 2011-11-11 15:19:27.000000000 -0500
2713 ++++ linux-3.1.4/arch/x86/include/asm/emergency-restart.h 2011-11-16 18:39:07.000000000 -0500
2714 @@ -15,6 +15,6 @@ enum reboot_type {
2715
2716 extern enum reboot_type reboot_type;
2717 @@ -7369,9 +7700,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/emergency-restart.h linux-3.1.3/arch
2718 +extern void machine_emergency_restart(void) __noreturn;
2719
2720 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
2721 -diff -urNp linux-3.1.3/arch/x86/include/asm/futex.h linux-3.1.3/arch/x86/include/asm/futex.h
2722 ---- linux-3.1.3/arch/x86/include/asm/futex.h 2011-11-11 15:19:27.000000000 -0500
2723 -+++ linux-3.1.3/arch/x86/include/asm/futex.h 2011-11-16 18:39:07.000000000 -0500
2724 +diff -urNp linux-3.1.4/arch/x86/include/asm/futex.h linux-3.1.4/arch/x86/include/asm/futex.h
2725 +--- linux-3.1.4/arch/x86/include/asm/futex.h 2011-11-11 15:19:27.000000000 -0500
2726 ++++ linux-3.1.4/arch/x86/include/asm/futex.h 2011-11-16 18:39:07.000000000 -0500
2727 @@ -12,16 +12,18 @@
2728 #include <asm/system.h>
2729
2730 @@ -7430,9 +7761,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/futex.h linux-3.1.3/arch/x86/include
2731 : "i" (-EFAULT), "r" (newval), "1" (oldval)
2732 : "memory"
2733 );
2734 -diff -urNp linux-3.1.3/arch/x86/include/asm/hw_irq.h linux-3.1.3/arch/x86/include/asm/hw_irq.h
2735 ---- linux-3.1.3/arch/x86/include/asm/hw_irq.h 2011-11-11 15:19:27.000000000 -0500
2736 -+++ linux-3.1.3/arch/x86/include/asm/hw_irq.h 2011-11-16 18:39:07.000000000 -0500
2737 +diff -urNp linux-3.1.4/arch/x86/include/asm/hw_irq.h linux-3.1.4/arch/x86/include/asm/hw_irq.h
2738 +--- linux-3.1.4/arch/x86/include/asm/hw_irq.h 2011-11-11 15:19:27.000000000 -0500
2739 ++++ linux-3.1.4/arch/x86/include/asm/hw_irq.h 2011-11-16 18:39:07.000000000 -0500
2740 @@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
2741 extern void enable_IO_APIC(void);
2742
2743 @@ -7444,9 +7775,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/hw_irq.h linux-3.1.3/arch/x86/includ
2744
2745 /* EISA */
2746 extern void eisa_set_level_irq(unsigned int irq);
2747 -diff -urNp linux-3.1.3/arch/x86/include/asm/i387.h linux-3.1.3/arch/x86/include/asm/i387.h
2748 ---- linux-3.1.3/arch/x86/include/asm/i387.h 2011-11-11 15:19:27.000000000 -0500
2749 -+++ linux-3.1.3/arch/x86/include/asm/i387.h 2011-11-16 18:39:07.000000000 -0500
2750 +diff -urNp linux-3.1.4/arch/x86/include/asm/i387.h linux-3.1.4/arch/x86/include/asm/i387.h
2751 +--- linux-3.1.4/arch/x86/include/asm/i387.h 2011-11-11 15:19:27.000000000 -0500
2752 ++++ linux-3.1.4/arch/x86/include/asm/i387.h 2011-11-16 18:39:07.000000000 -0500
2753 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
2754 {
2755 int err;
2756 @@ -7496,9 +7827,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/i387.h linux-3.1.3/arch/x86/include/
2757 else
2758 clts();
2759 }
2760 -diff -urNp linux-3.1.3/arch/x86/include/asm/io.h linux-3.1.3/arch/x86/include/asm/io.h
2761 ---- linux-3.1.3/arch/x86/include/asm/io.h 2011-11-11 15:19:27.000000000 -0500
2762 -+++ linux-3.1.3/arch/x86/include/asm/io.h 2011-11-16 18:39:07.000000000 -0500
2763 +diff -urNp linux-3.1.4/arch/x86/include/asm/io.h linux-3.1.4/arch/x86/include/asm/io.h
2764 +--- linux-3.1.4/arch/x86/include/asm/io.h 2011-11-11 15:19:27.000000000 -0500
2765 ++++ linux-3.1.4/arch/x86/include/asm/io.h 2011-11-16 18:39:07.000000000 -0500
2766 @@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
2767
2768 #include <linux/vmalloc.h>
2769 @@ -7517,9 +7848,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/io.h linux-3.1.3/arch/x86/include/as
2770 /*
2771 * Convert a virtual cached pointer to an uncached pointer
2772 */
2773 -diff -urNp linux-3.1.3/arch/x86/include/asm/irqflags.h linux-3.1.3/arch/x86/include/asm/irqflags.h
2774 ---- linux-3.1.3/arch/x86/include/asm/irqflags.h 2011-11-11 15:19:27.000000000 -0500
2775 -+++ linux-3.1.3/arch/x86/include/asm/irqflags.h 2011-11-16 18:39:07.000000000 -0500
2776 +diff -urNp linux-3.1.4/arch/x86/include/asm/irqflags.h linux-3.1.4/arch/x86/include/asm/irqflags.h
2777 +--- linux-3.1.4/arch/x86/include/asm/irqflags.h 2011-11-11 15:19:27.000000000 -0500
2778 ++++ linux-3.1.4/arch/x86/include/asm/irqflags.h 2011-11-16 18:39:07.000000000 -0500
2779 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch
2780 sti; \
2781 sysexit
2782 @@ -7532,9 +7863,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/irqflags.h linux-3.1.3/arch/x86/incl
2783 #else
2784 #define INTERRUPT_RETURN iret
2785 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
2786 -diff -urNp linux-3.1.3/arch/x86/include/asm/kprobes.h linux-3.1.3/arch/x86/include/asm/kprobes.h
2787 ---- linux-3.1.3/arch/x86/include/asm/kprobes.h 2011-11-11 15:19:27.000000000 -0500
2788 -+++ linux-3.1.3/arch/x86/include/asm/kprobes.h 2011-11-16 18:39:07.000000000 -0500
2789 +diff -urNp linux-3.1.4/arch/x86/include/asm/kprobes.h linux-3.1.4/arch/x86/include/asm/kprobes.h
2790 +--- linux-3.1.4/arch/x86/include/asm/kprobes.h 2011-11-11 15:19:27.000000000 -0500
2791 ++++ linux-3.1.4/arch/x86/include/asm/kprobes.h 2011-11-16 18:39:07.000000000 -0500
2792 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
2793 #define RELATIVEJUMP_SIZE 5
2794 #define RELATIVECALL_OPCODE 0xe8
2795 @@ -7551,9 +7882,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/kprobes.h linux-3.1.3/arch/x86/inclu
2796
2797 #define flush_insn_slot(p) do { } while (0)
2798
2799 -diff -urNp linux-3.1.3/arch/x86/include/asm/kvm_host.h linux-3.1.3/arch/x86/include/asm/kvm_host.h
2800 ---- linux-3.1.3/arch/x86/include/asm/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
2801 -+++ linux-3.1.3/arch/x86/include/asm/kvm_host.h 2011-11-16 18:39:07.000000000 -0500
2802 +diff -urNp linux-3.1.4/arch/x86/include/asm/kvm_host.h linux-3.1.4/arch/x86/include/asm/kvm_host.h
2803 +--- linux-3.1.4/arch/x86/include/asm/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
2804 ++++ linux-3.1.4/arch/x86/include/asm/kvm_host.h 2011-11-16 18:39:07.000000000 -0500
2805 @@ -456,7 +456,7 @@ struct kvm_arch {
2806 unsigned int n_requested_mmu_pages;
2807 unsigned int n_max_mmu_pages;
2808 @@ -7572,9 +7903,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/kvm_host.h linux-3.1.3/arch/x86/incl
2809
2810 struct kvm_arch_async_pf {
2811 u32 token;
2812 -diff -urNp linux-3.1.3/arch/x86/include/asm/local.h linux-3.1.3/arch/x86/include/asm/local.h
2813 ---- linux-3.1.3/arch/x86/include/asm/local.h 2011-11-11 15:19:27.000000000 -0500
2814 -+++ linux-3.1.3/arch/x86/include/asm/local.h 2011-11-16 18:39:07.000000000 -0500
2815 +diff -urNp linux-3.1.4/arch/x86/include/asm/local.h linux-3.1.4/arch/x86/include/asm/local.h
2816 +--- linux-3.1.4/arch/x86/include/asm/local.h 2011-11-11 15:19:27.000000000 -0500
2817 ++++ linux-3.1.4/arch/x86/include/asm/local.h 2011-11-16 18:39:07.000000000 -0500
2818 @@ -18,26 +18,58 @@ typedef struct {
2819
2820 static inline void local_inc(local_t *l)
2821 @@ -7727,9 +8058,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/local.h linux-3.1.3/arch/x86/include
2822 : "+r" (i), "+m" (l->a.counter)
2823 : : "memory");
2824 return i + __i;
2825 -diff -urNp linux-3.1.3/arch/x86/include/asm/mman.h linux-3.1.3/arch/x86/include/asm/mman.h
2826 ---- linux-3.1.3/arch/x86/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
2827 -+++ linux-3.1.3/arch/x86/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
2828 +diff -urNp linux-3.1.4/arch/x86/include/asm/mman.h linux-3.1.4/arch/x86/include/asm/mman.h
2829 +--- linux-3.1.4/arch/x86/include/asm/mman.h 2011-11-11 15:19:27.000000000 -0500
2830 ++++ linux-3.1.4/arch/x86/include/asm/mman.h 2011-11-16 18:39:07.000000000 -0500
2831 @@ -5,4 +5,14 @@
2832
2833 #include <asm-generic/mman.h>
2834 @@ -7745,9 +8076,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/mman.h linux-3.1.3/arch/x86/include/
2835 +#endif
2836 +
2837 #endif /* _ASM_X86_MMAN_H */
2838 -diff -urNp linux-3.1.3/arch/x86/include/asm/mmu_context.h linux-3.1.3/arch/x86/include/asm/mmu_context.h
2839 ---- linux-3.1.3/arch/x86/include/asm/mmu_context.h 2011-11-11 15:19:27.000000000 -0500
2840 -+++ linux-3.1.3/arch/x86/include/asm/mmu_context.h 2011-11-16 18:39:07.000000000 -0500
2841 +diff -urNp linux-3.1.4/arch/x86/include/asm/mmu_context.h linux-3.1.4/arch/x86/include/asm/mmu_context.h
2842 +--- linux-3.1.4/arch/x86/include/asm/mmu_context.h 2011-11-11 15:19:27.000000000 -0500
2843 ++++ linux-3.1.4/arch/x86/include/asm/mmu_context.h 2011-11-16 18:39:07.000000000 -0500
2844 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
2845
2846 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
2847 @@ -7868,9 +8199,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/mmu_context.h linux-3.1.3/arch/x86/i
2848 }
2849
2850 #define activate_mm(prev, next) \
2851 -diff -urNp linux-3.1.3/arch/x86/include/asm/mmu.h linux-3.1.3/arch/x86/include/asm/mmu.h
2852 ---- linux-3.1.3/arch/x86/include/asm/mmu.h 2011-11-11 15:19:27.000000000 -0500
2853 -+++ linux-3.1.3/arch/x86/include/asm/mmu.h 2011-11-16 18:39:07.000000000 -0500
2854 +diff -urNp linux-3.1.4/arch/x86/include/asm/mmu.h linux-3.1.4/arch/x86/include/asm/mmu.h
2855 +--- linux-3.1.4/arch/x86/include/asm/mmu.h 2011-11-11 15:19:27.000000000 -0500
2856 ++++ linux-3.1.4/arch/x86/include/asm/mmu.h 2011-11-16 18:39:07.000000000 -0500
2857 @@ -9,7 +9,7 @@
2858 * we put the segment information here.
2859 */
2860 @@ -7901,9 +8232,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/mmu.h linux-3.1.3/arch/x86/include/a
2861 } mm_context_t;
2862
2863 #ifdef CONFIG_SMP
2864 -diff -urNp linux-3.1.3/arch/x86/include/asm/module.h linux-3.1.3/arch/x86/include/asm/module.h
2865 ---- linux-3.1.3/arch/x86/include/asm/module.h 2011-11-11 15:19:27.000000000 -0500
2866 -+++ linux-3.1.3/arch/x86/include/asm/module.h 2011-11-16 18:39:07.000000000 -0500
2867 +diff -urNp linux-3.1.4/arch/x86/include/asm/module.h linux-3.1.4/arch/x86/include/asm/module.h
2868 +--- linux-3.1.4/arch/x86/include/asm/module.h 2011-11-11 15:19:27.000000000 -0500
2869 ++++ linux-3.1.4/arch/x86/include/asm/module.h 2011-12-02 17:38:47.000000000 -0500
2870 @@ -5,6 +5,7 @@
2871
2872 #ifdef CONFIG_X86_64
2873 @@ -7912,14 +8243,16 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/module.h linux-3.1.3/arch/x86/includ
2874 #elif defined CONFIG_M386
2875 #define MODULE_PROC_FAMILY "386 "
2876 #elif defined CONFIG_M486
2877 -@@ -59,8 +60,18 @@
2878 +@@ -59,8 +60,20 @@
2879 #error unknown processor family
2880 #endif
2881
2882 -#ifdef CONFIG_X86_32
2883 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
2884 -+#ifdef CONFIG_PAX_KERNEXEC
2885 -+#define MODULE_PAX_KERNEXEC "KERNEXEC "
2886 ++#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
2887 ++#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
2888 ++#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
2889 ++#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
2890 +#else
2891 +#define MODULE_PAX_KERNEXEC ""
2892 #endif
2893 @@ -7933,9 +8266,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/module.h linux-3.1.3/arch/x86/includ
2894 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
2895 +
2896 #endif /* _ASM_X86_MODULE_H */
2897 -diff -urNp linux-3.1.3/arch/x86/include/asm/page_64_types.h linux-3.1.3/arch/x86/include/asm/page_64_types.h
2898 ---- linux-3.1.3/arch/x86/include/asm/page_64_types.h 2011-11-11 15:19:27.000000000 -0500
2899 -+++ linux-3.1.3/arch/x86/include/asm/page_64_types.h 2011-11-16 18:39:07.000000000 -0500
2900 +diff -urNp linux-3.1.4/arch/x86/include/asm/page_64_types.h linux-3.1.4/arch/x86/include/asm/page_64_types.h
2901 +--- linux-3.1.4/arch/x86/include/asm/page_64_types.h 2011-11-11 15:19:27.000000000 -0500
2902 ++++ linux-3.1.4/arch/x86/include/asm/page_64_types.h 2011-11-16 18:39:07.000000000 -0500
2903 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
2904
2905 /* duplicated to the one in bootmem.h */
2906 @@ -7945,9 +8278,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/page_64_types.h linux-3.1.3/arch/x86
2907
2908 extern unsigned long __phys_addr(unsigned long);
2909 #define __phys_reloc_hide(x) (x)
2910 -diff -urNp linux-3.1.3/arch/x86/include/asm/paravirt.h linux-3.1.3/arch/x86/include/asm/paravirt.h
2911 ---- linux-3.1.3/arch/x86/include/asm/paravirt.h 2011-11-11 15:19:27.000000000 -0500
2912 -+++ linux-3.1.3/arch/x86/include/asm/paravirt.h 2011-11-16 18:39:07.000000000 -0500
2913 +diff -urNp linux-3.1.4/arch/x86/include/asm/paravirt.h linux-3.1.4/arch/x86/include/asm/paravirt.h
2914 +--- linux-3.1.4/arch/x86/include/asm/paravirt.h 2011-11-11 15:19:27.000000000 -0500
2915 ++++ linux-3.1.4/arch/x86/include/asm/paravirt.h 2011-11-16 18:39:07.000000000 -0500
2916 @@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp,
2917 val);
2918 }
2919 @@ -8020,9 +8353,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/paravirt.h linux-3.1.3/arch/x86/incl
2920 #endif /* CONFIG_X86_32 */
2921
2922 #endif /* __ASSEMBLY__ */
2923 -diff -urNp linux-3.1.3/arch/x86/include/asm/paravirt_types.h linux-3.1.3/arch/x86/include/asm/paravirt_types.h
2924 ---- linux-3.1.3/arch/x86/include/asm/paravirt_types.h 2011-11-11 15:19:27.000000000 -0500
2925 -+++ linux-3.1.3/arch/x86/include/asm/paravirt_types.h 2011-11-16 18:39:07.000000000 -0500
2926 +diff -urNp linux-3.1.4/arch/x86/include/asm/paravirt_types.h linux-3.1.4/arch/x86/include/asm/paravirt_types.h
2927 +--- linux-3.1.4/arch/x86/include/asm/paravirt_types.h 2011-11-11 15:19:27.000000000 -0500
2928 ++++ linux-3.1.4/arch/x86/include/asm/paravirt_types.h 2011-11-16 18:39:07.000000000 -0500
2929 @@ -84,20 +84,20 @@ struct pv_init_ops {
2930 */
2931 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
2932 @@ -8095,9 +8428,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/paravirt_types.h linux-3.1.3/arch/x8
2933
2934 /* This contains all the paravirt structures: we get a convenient
2935 * number for each function using the offset which we use to indicate
2936 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgalloc.h linux-3.1.3/arch/x86/include/asm/pgalloc.h
2937 ---- linux-3.1.3/arch/x86/include/asm/pgalloc.h 2011-11-11 15:19:27.000000000 -0500
2938 -+++ linux-3.1.3/arch/x86/include/asm/pgalloc.h 2011-11-16 18:39:07.000000000 -0500
2939 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgalloc.h linux-3.1.4/arch/x86/include/asm/pgalloc.h
2940 +--- linux-3.1.4/arch/x86/include/asm/pgalloc.h 2011-11-11 15:19:27.000000000 -0500
2941 ++++ linux-3.1.4/arch/x86/include/asm/pgalloc.h 2011-11-16 18:39:07.000000000 -0500
2942 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
2943 pmd_t *pmd, pte_t *pte)
2944 {
2945 @@ -8112,9 +8445,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgalloc.h linux-3.1.3/arch/x86/inclu
2946 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
2947 }
2948
2949 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable-2level.h linux-3.1.3/arch/x86/include/asm/pgtable-2level.h
2950 ---- linux-3.1.3/arch/x86/include/asm/pgtable-2level.h 2011-11-11 15:19:27.000000000 -0500
2951 -+++ linux-3.1.3/arch/x86/include/asm/pgtable-2level.h 2011-11-16 18:39:07.000000000 -0500
2952 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable-2level.h linux-3.1.4/arch/x86/include/asm/pgtable-2level.h
2953 +--- linux-3.1.4/arch/x86/include/asm/pgtable-2level.h 2011-11-11 15:19:27.000000000 -0500
2954 ++++ linux-3.1.4/arch/x86/include/asm/pgtable-2level.h 2011-11-16 18:39:07.000000000 -0500
2955 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
2956
2957 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
2958 @@ -8125,9 +8458,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable-2level.h linux-3.1.3/arch/x8
2959 }
2960
2961 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
2962 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_32.h linux-3.1.3/arch/x86/include/asm/pgtable_32.h
2963 ---- linux-3.1.3/arch/x86/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
2964 -+++ linux-3.1.3/arch/x86/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
2965 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable_32.h linux-3.1.4/arch/x86/include/asm/pgtable_32.h
2966 +--- linux-3.1.4/arch/x86/include/asm/pgtable_32.h 2011-11-11 15:19:27.000000000 -0500
2967 ++++ linux-3.1.4/arch/x86/include/asm/pgtable_32.h 2011-11-16 18:39:07.000000000 -0500
2968 @@ -25,9 +25,6 @@
2969 struct mm_struct;
2970 struct vm_area_struct;
2971 @@ -8171,9 +8504,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_32.h linux-3.1.3/arch/x86/in
2972 /*
2973 * kern_addr_valid() is (1) for FLATMEM and (0) for
2974 * SPARSEMEM and DISCONTIGMEM
2975 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h
2976 ---- linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h 2011-11-11 15:19:27.000000000 -0500
2977 -+++ linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h 2011-11-16 18:39:07.000000000 -0500
2978 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable_32_types.h linux-3.1.4/arch/x86/include/asm/pgtable_32_types.h
2979 +--- linux-3.1.4/arch/x86/include/asm/pgtable_32_types.h 2011-11-11 15:19:27.000000000 -0500
2980 ++++ linux-3.1.4/arch/x86/include/asm/pgtable_32_types.h 2011-11-16 18:39:07.000000000 -0500
2981 @@ -8,7 +8,7 @@
2982 */
2983 #ifdef CONFIG_X86_PAE
2984 @@ -8203,9 +8536,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_32_types.h linux-3.1.3/arch/
2985 #define MODULES_VADDR VMALLOC_START
2986 #define MODULES_END VMALLOC_END
2987 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
2988 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable-3level.h linux-3.1.3/arch/x86/include/asm/pgtable-3level.h
2989 ---- linux-3.1.3/arch/x86/include/asm/pgtable-3level.h 2011-11-11 15:19:27.000000000 -0500
2990 -+++ linux-3.1.3/arch/x86/include/asm/pgtable-3level.h 2011-11-16 18:39:07.000000000 -0500
2991 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable-3level.h linux-3.1.4/arch/x86/include/asm/pgtable-3level.h
2992 +--- linux-3.1.4/arch/x86/include/asm/pgtable-3level.h 2011-11-11 15:19:27.000000000 -0500
2993 ++++ linux-3.1.4/arch/x86/include/asm/pgtable-3level.h 2011-11-16 18:39:07.000000000 -0500
2994 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
2995
2996 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
2997 @@ -8223,9 +8556,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable-3level.h linux-3.1.3/arch/x8
2998 }
2999
3000 /*
3001 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_64.h linux-3.1.3/arch/x86/include/asm/pgtable_64.h
3002 ---- linux-3.1.3/arch/x86/include/asm/pgtable_64.h 2011-11-11 15:19:27.000000000 -0500
3003 -+++ linux-3.1.3/arch/x86/include/asm/pgtable_64.h 2011-11-16 18:39:07.000000000 -0500
3004 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable_64.h linux-3.1.4/arch/x86/include/asm/pgtable_64.h
3005 +--- linux-3.1.4/arch/x86/include/asm/pgtable_64.h 2011-11-11 15:19:27.000000000 -0500
3006 ++++ linux-3.1.4/arch/x86/include/asm/pgtable_64.h 2011-11-16 18:39:07.000000000 -0500
3007 @@ -16,10 +16,13 @@
3008
3009 extern pud_t level3_kernel_pgt[512];
3010 @@ -8266,9 +8599,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_64.h linux-3.1.3/arch/x86/in
3011 *pgdp = pgd;
3012 }
3013
3014 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h
3015 ---- linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h 2011-11-11 15:19:27.000000000 -0500
3016 -+++ linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h 2011-11-16 18:39:07.000000000 -0500
3017 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable_64_types.h linux-3.1.4/arch/x86/include/asm/pgtable_64_types.h
3018 +--- linux-3.1.4/arch/x86/include/asm/pgtable_64_types.h 2011-11-11 15:19:27.000000000 -0500
3019 ++++ linux-3.1.4/arch/x86/include/asm/pgtable_64_types.h 2011-11-16 18:39:07.000000000 -0500
3020 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
3021 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
3022 #define MODULES_END _AC(0xffffffffff000000, UL)
3023 @@ -8280,9 +8613,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_64_types.h linux-3.1.3/arch/
3024 +#define ktva_ktla(addr) (addr)
3025
3026 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
3027 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable.h linux-3.1.3/arch/x86/include/asm/pgtable.h
3028 ---- linux-3.1.3/arch/x86/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
3029 -+++ linux-3.1.3/arch/x86/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
3030 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable.h linux-3.1.4/arch/x86/include/asm/pgtable.h
3031 +--- linux-3.1.4/arch/x86/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
3032 ++++ linux-3.1.4/arch/x86/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
3033 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
3034
3035 #ifndef __PAGETABLE_PUD_FOLDED
3036 @@ -8460,9 +8793,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable.h linux-3.1.3/arch/x86/inclu
3037
3038 #include <asm-generic/pgtable.h>
3039 #endif /* __ASSEMBLY__ */
3040 -diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_types.h linux-3.1.3/arch/x86/include/asm/pgtable_types.h
3041 ---- linux-3.1.3/arch/x86/include/asm/pgtable_types.h 2011-11-11 15:19:27.000000000 -0500
3042 -+++ linux-3.1.3/arch/x86/include/asm/pgtable_types.h 2011-11-16 18:39:07.000000000 -0500
3043 +diff -urNp linux-3.1.4/arch/x86/include/asm/pgtable_types.h linux-3.1.4/arch/x86/include/asm/pgtable_types.h
3044 +--- linux-3.1.4/arch/x86/include/asm/pgtable_types.h 2011-11-11 15:19:27.000000000 -0500
3045 ++++ linux-3.1.4/arch/x86/include/asm/pgtable_types.h 2011-11-16 18:39:07.000000000 -0500
3046 @@ -16,13 +16,12 @@
3047 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
3048 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
3049 @@ -8574,9 +8907,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/pgtable_types.h linux-3.1.3/arch/x86
3050
3051 #define pgprot_writecombine pgprot_writecombine
3052 extern pgprot_t pgprot_writecombine(pgprot_t prot);
3053 -diff -urNp linux-3.1.3/arch/x86/include/asm/processor.h linux-3.1.3/arch/x86/include/asm/processor.h
3054 ---- linux-3.1.3/arch/x86/include/asm/processor.h 2011-11-11 15:19:27.000000000 -0500
3055 -+++ linux-3.1.3/arch/x86/include/asm/processor.h 2011-11-16 18:39:07.000000000 -0500
3056 +diff -urNp linux-3.1.4/arch/x86/include/asm/processor.h linux-3.1.4/arch/x86/include/asm/processor.h
3057 +--- linux-3.1.4/arch/x86/include/asm/processor.h 2011-11-11 15:19:27.000000000 -0500
3058 ++++ linux-3.1.4/arch/x86/include/asm/processor.h 2011-11-16 18:39:07.000000000 -0500
3059 @@ -266,7 +266,7 @@ struct tss_struct {
3060
3061 } ____cacheline_aligned;
3062 @@ -8679,9 +9012,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/processor.h linux-3.1.3/arch/x86/inc
3063 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
3064
3065 /* Get/set a process' ability to use the timestamp counter instruction */
3066 -diff -urNp linux-3.1.3/arch/x86/include/asm/ptrace.h linux-3.1.3/arch/x86/include/asm/ptrace.h
3067 ---- linux-3.1.3/arch/x86/include/asm/ptrace.h 2011-11-11 15:19:27.000000000 -0500
3068 -+++ linux-3.1.3/arch/x86/include/asm/ptrace.h 2011-11-16 18:39:07.000000000 -0500
3069 +diff -urNp linux-3.1.4/arch/x86/include/asm/ptrace.h linux-3.1.4/arch/x86/include/asm/ptrace.h
3070 +--- linux-3.1.4/arch/x86/include/asm/ptrace.h 2011-11-11 15:19:27.000000000 -0500
3071 ++++ linux-3.1.4/arch/x86/include/asm/ptrace.h 2011-11-16 18:39:07.000000000 -0500
3072 @@ -156,28 +156,29 @@ static inline unsigned long regs_return_
3073 }
3074
3075 @@ -8737,9 +9070,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/ptrace.h linux-3.1.3/arch/x86/includ
3076 #endif
3077 }
3078 #endif
3079 -diff -urNp linux-3.1.3/arch/x86/include/asm/reboot.h linux-3.1.3/arch/x86/include/asm/reboot.h
3080 ---- linux-3.1.3/arch/x86/include/asm/reboot.h 2011-11-11 15:19:27.000000000 -0500
3081 -+++ linux-3.1.3/arch/x86/include/asm/reboot.h 2011-11-16 18:39:07.000000000 -0500
3082 +diff -urNp linux-3.1.4/arch/x86/include/asm/reboot.h linux-3.1.4/arch/x86/include/asm/reboot.h
3083 +--- linux-3.1.4/arch/x86/include/asm/reboot.h 2011-11-11 15:19:27.000000000 -0500
3084 ++++ linux-3.1.4/arch/x86/include/asm/reboot.h 2011-11-16 18:39:07.000000000 -0500
3085 @@ -6,19 +6,19 @@
3086 struct pt_regs;
3087
3088 @@ -8766,9 +9099,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/reboot.h linux-3.1.3/arch/x86/includ
3089 /* These must match dispatch_table in reboot_32.S */
3090 #define MRR_BIOS 0
3091 #define MRR_APM 1
3092 -diff -urNp linux-3.1.3/arch/x86/include/asm/rwsem.h linux-3.1.3/arch/x86/include/asm/rwsem.h
3093 ---- linux-3.1.3/arch/x86/include/asm/rwsem.h 2011-11-11 15:19:27.000000000 -0500
3094 -+++ linux-3.1.3/arch/x86/include/asm/rwsem.h 2011-11-16 18:39:07.000000000 -0500
3095 +diff -urNp linux-3.1.4/arch/x86/include/asm/rwsem.h linux-3.1.4/arch/x86/include/asm/rwsem.h
3096 +--- linux-3.1.4/arch/x86/include/asm/rwsem.h 2011-11-11 15:19:27.000000000 -0500
3097 ++++ linux-3.1.4/arch/x86/include/asm/rwsem.h 2011-11-16 18:39:07.000000000 -0500
3098 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw
3099 {
3100 asm volatile("# beginning down_read\n\t"
3101 @@ -8893,9 +9226,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/rwsem.h linux-3.1.3/arch/x86/include
3102 : "+r" (tmp), "+m" (sem->count)
3103 : : "memory");
3104
3105 -diff -urNp linux-3.1.3/arch/x86/include/asm/segment.h linux-3.1.3/arch/x86/include/asm/segment.h
3106 ---- linux-3.1.3/arch/x86/include/asm/segment.h 2011-11-11 15:19:27.000000000 -0500
3107 -+++ linux-3.1.3/arch/x86/include/asm/segment.h 2011-11-16 18:39:07.000000000 -0500
3108 +diff -urNp linux-3.1.4/arch/x86/include/asm/segment.h linux-3.1.4/arch/x86/include/asm/segment.h
3109 +--- linux-3.1.4/arch/x86/include/asm/segment.h 2011-11-11 15:19:27.000000000 -0500
3110 ++++ linux-3.1.4/arch/x86/include/asm/segment.h 2011-11-16 18:39:07.000000000 -0500
3111 @@ -64,10 +64,15 @@
3112 * 26 - ESPFIX small SS
3113 * 27 - per-cpu [ offset to per-cpu data area ]
3114 @@ -8962,9 +9295,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/segment.h linux-3.1.3/arch/x86/inclu
3115 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
3116 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
3117 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
3118 -diff -urNp linux-3.1.3/arch/x86/include/asm/smp.h linux-3.1.3/arch/x86/include/asm/smp.h
3119 ---- linux-3.1.3/arch/x86/include/asm/smp.h 2011-11-11 15:19:27.000000000 -0500
3120 -+++ linux-3.1.3/arch/x86/include/asm/smp.h 2011-11-16 18:39:07.000000000 -0500
3121 +diff -urNp linux-3.1.4/arch/x86/include/asm/smp.h linux-3.1.4/arch/x86/include/asm/smp.h
3122 +--- linux-3.1.4/arch/x86/include/asm/smp.h 2011-11-11 15:19:27.000000000 -0500
3123 ++++ linux-3.1.4/arch/x86/include/asm/smp.h 2011-11-16 18:39:07.000000000 -0500
3124 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_
3125 /* cpus sharing the last level cache: */
3126 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
3127 @@ -9000,9 +9333,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/smp.h linux-3.1.3/arch/x86/include/a
3128 #define safe_smp_processor_id() smp_processor_id()
3129
3130 #endif
3131 -diff -urNp linux-3.1.3/arch/x86/include/asm/spinlock.h linux-3.1.3/arch/x86/include/asm/spinlock.h
3132 ---- linux-3.1.3/arch/x86/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
3133 -+++ linux-3.1.3/arch/x86/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
3134 +diff -urNp linux-3.1.4/arch/x86/include/asm/spinlock.h linux-3.1.4/arch/x86/include/asm/spinlock.h
3135 +--- linux-3.1.4/arch/x86/include/asm/spinlock.h 2011-11-11 15:19:27.000000000 -0500
3136 ++++ linux-3.1.4/arch/x86/include/asm/spinlock.h 2011-11-16 18:39:07.000000000 -0500
3137 @@ -248,6 +248,14 @@ static inline int arch_write_can_lock(ar
3138 static inline void arch_read_lock(arch_rwlock_t *rw)
3139 {
3140 @@ -9065,9 +9398,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/spinlock.h linux-3.1.3/arch/x86/incl
3141 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
3142 }
3143
3144 -diff -urNp linux-3.1.3/arch/x86/include/asm/stackprotector.h linux-3.1.3/arch/x86/include/asm/stackprotector.h
3145 ---- linux-3.1.3/arch/x86/include/asm/stackprotector.h 2011-11-11 15:19:27.000000000 -0500
3146 -+++ linux-3.1.3/arch/x86/include/asm/stackprotector.h 2011-11-16 18:39:07.000000000 -0500
3147 +diff -urNp linux-3.1.4/arch/x86/include/asm/stackprotector.h linux-3.1.4/arch/x86/include/asm/stackprotector.h
3148 +--- linux-3.1.4/arch/x86/include/asm/stackprotector.h 2011-11-11 15:19:27.000000000 -0500
3149 ++++ linux-3.1.4/arch/x86/include/asm/stackprotector.h 2011-11-16 18:39:07.000000000 -0500
3150 @@ -48,7 +48,7 @@
3151 * head_32 for boot CPU and setup_per_cpu_areas() for others.
3152 */
3153 @@ -9086,9 +9419,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/stackprotector.h linux-3.1.3/arch/x8
3154 asm volatile ("mov %0, %%gs" : : "r" (0));
3155 #endif
3156 }
3157 -diff -urNp linux-3.1.3/arch/x86/include/asm/stacktrace.h linux-3.1.3/arch/x86/include/asm/stacktrace.h
3158 ---- linux-3.1.3/arch/x86/include/asm/stacktrace.h 2011-11-11 15:19:27.000000000 -0500
3159 -+++ linux-3.1.3/arch/x86/include/asm/stacktrace.h 2011-11-16 18:39:07.000000000 -0500
3160 +diff -urNp linux-3.1.4/arch/x86/include/asm/stacktrace.h linux-3.1.4/arch/x86/include/asm/stacktrace.h
3161 +--- linux-3.1.4/arch/x86/include/asm/stacktrace.h 2011-11-11 15:19:27.000000000 -0500
3162 ++++ linux-3.1.4/arch/x86/include/asm/stacktrace.h 2011-11-16 18:39:07.000000000 -0500
3163 @@ -11,28 +11,20 @@
3164
3165 extern int kstack_depth_to_print;
3166 @@ -9139,9 +9472,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/stacktrace.h linux-3.1.3/arch/x86/in
3167 };
3168
3169 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
3170 -diff -urNp linux-3.1.3/arch/x86/include/asm/sys_ia32.h linux-3.1.3/arch/x86/include/asm/sys_ia32.h
3171 ---- linux-3.1.3/arch/x86/include/asm/sys_ia32.h 2011-11-11 15:19:27.000000000 -0500
3172 -+++ linux-3.1.3/arch/x86/include/asm/sys_ia32.h 2011-11-16 18:39:07.000000000 -0500
3173 +diff -urNp linux-3.1.4/arch/x86/include/asm/sys_ia32.h linux-3.1.4/arch/x86/include/asm/sys_ia32.h
3174 +--- linux-3.1.4/arch/x86/include/asm/sys_ia32.h 2011-11-11 15:19:27.000000000 -0500
3175 ++++ linux-3.1.4/arch/x86/include/asm/sys_ia32.h 2011-11-16 18:39:07.000000000 -0500
3176 @@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int
3177 compat_sigset_t __user *, unsigned int);
3178 asmlinkage long sys32_alarm(unsigned int);
3179 @@ -9151,9 +9484,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/sys_ia32.h linux-3.1.3/arch/x86/incl
3180 asmlinkage long sys32_sysfs(int, u32, u32);
3181
3182 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
3183 -diff -urNp linux-3.1.3/arch/x86/include/asm/system.h linux-3.1.3/arch/x86/include/asm/system.h
3184 ---- linux-3.1.3/arch/x86/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
3185 -+++ linux-3.1.3/arch/x86/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
3186 +diff -urNp linux-3.1.4/arch/x86/include/asm/system.h linux-3.1.4/arch/x86/include/asm/system.h
3187 +--- linux-3.1.4/arch/x86/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
3188 ++++ linux-3.1.4/arch/x86/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
3189 @@ -129,7 +129,7 @@ do { \
3190 "call __switch_to\n\t" \
3191 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
3192 @@ -9196,9 +9529,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/system.h linux-3.1.3/arch/x86/includ
3193
3194 /*
3195 * Force strict CPU ordering.
3196 -diff -urNp linux-3.1.3/arch/x86/include/asm/thread_info.h linux-3.1.3/arch/x86/include/asm/thread_info.h
3197 ---- linux-3.1.3/arch/x86/include/asm/thread_info.h 2011-11-11 15:19:27.000000000 -0500
3198 -+++ linux-3.1.3/arch/x86/include/asm/thread_info.h 2011-11-16 18:39:07.000000000 -0500
3199 +diff -urNp linux-3.1.4/arch/x86/include/asm/thread_info.h linux-3.1.4/arch/x86/include/asm/thread_info.h
3200 +--- linux-3.1.4/arch/x86/include/asm/thread_info.h 2011-11-11 15:19:27.000000000 -0500
3201 ++++ linux-3.1.4/arch/x86/include/asm/thread_info.h 2011-11-16 18:39:07.000000000 -0500
3202 @@ -10,6 +10,7 @@
3203 #include <linux/compiler.h>
3204 #include <asm/page.h>
3205 @@ -9346,9 +9679,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/thread_info.h linux-3.1.3/arch/x86/i
3206 +
3207 #endif
3208 #endif /* _ASM_X86_THREAD_INFO_H */
3209 -diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess_32.h linux-3.1.3/arch/x86/include/asm/uaccess_32.h
3210 ---- linux-3.1.3/arch/x86/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
3211 -+++ linux-3.1.3/arch/x86/include/asm/uaccess_32.h 2011-11-16 18:40:08.000000000 -0500
3212 +diff -urNp linux-3.1.4/arch/x86/include/asm/uaccess_32.h linux-3.1.4/arch/x86/include/asm/uaccess_32.h
3213 +--- linux-3.1.4/arch/x86/include/asm/uaccess_32.h 2011-11-11 15:19:27.000000000 -0500
3214 ++++ linux-3.1.4/arch/x86/include/asm/uaccess_32.h 2011-11-16 18:40:08.000000000 -0500
3215 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_u
3216 static __always_inline unsigned long __must_check
3217 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
3218 @@ -9516,9 +9849,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess_32.h linux-3.1.3/arch/x86/in
3219 return n;
3220 }
3221
3222 -diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess_64.h linux-3.1.3/arch/x86/include/asm/uaccess_64.h
3223 ---- linux-3.1.3/arch/x86/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
3224 -+++ linux-3.1.3/arch/x86/include/asm/uaccess_64.h 2011-11-16 18:40:08.000000000 -0500
3225 +diff -urNp linux-3.1.4/arch/x86/include/asm/uaccess_64.h linux-3.1.4/arch/x86/include/asm/uaccess_64.h
3226 +--- linux-3.1.4/arch/x86/include/asm/uaccess_64.h 2011-11-11 15:19:27.000000000 -0500
3227 ++++ linux-3.1.4/arch/x86/include/asm/uaccess_64.h 2011-11-16 18:40:08.000000000 -0500
3228 @@ -10,6 +10,9 @@
3229 #include <asm/alternative.h>
3230 #include <asm/cpufeature.h>
3231 @@ -9930,9 +10263,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess_64.h linux-3.1.3/arch/x86/in
3232 +copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest);
3233
3234 #endif /* _ASM_X86_UACCESS_64_H */
3235 -diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess.h linux-3.1.3/arch/x86/include/asm/uaccess.h
3236 ---- linux-3.1.3/arch/x86/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
3237 -+++ linux-3.1.3/arch/x86/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
3238 +diff -urNp linux-3.1.4/arch/x86/include/asm/uaccess.h linux-3.1.4/arch/x86/include/asm/uaccess.h
3239 +--- linux-3.1.4/arch/x86/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
3240 ++++ linux-3.1.4/arch/x86/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
3241 @@ -7,12 +7,15 @@
3242 #include <linux/compiler.h>
3243 #include <linux/thread_info.h>
3244 @@ -10152,9 +10485,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/uaccess.h linux-3.1.3/arch/x86/inclu
3245 } while (0)
3246
3247 #ifdef CONFIG_X86_WP_WORKS_OK
3248 -diff -urNp linux-3.1.3/arch/x86/include/asm/vdso.h linux-3.1.3/arch/x86/include/asm/vdso.h
3249 ---- linux-3.1.3/arch/x86/include/asm/vdso.h 2011-11-11 15:19:27.000000000 -0500
3250 -+++ linux-3.1.3/arch/x86/include/asm/vdso.h 2011-11-16 18:39:07.000000000 -0500
3251 +diff -urNp linux-3.1.4/arch/x86/include/asm/vdso.h linux-3.1.4/arch/x86/include/asm/vdso.h
3252 +--- linux-3.1.4/arch/x86/include/asm/vdso.h 2011-11-11 15:19:27.000000000 -0500
3253 ++++ linux-3.1.4/arch/x86/include/asm/vdso.h 2011-11-16 18:39:07.000000000 -0500
3254 @@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
3255 #define VDSO32_SYMBOL(base, name) \
3256 ({ \
3257 @@ -10164,9 +10497,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/vdso.h linux-3.1.3/arch/x86/include/
3258 })
3259 #endif
3260
3261 -diff -urNp linux-3.1.3/arch/x86/include/asm/x86_init.h linux-3.1.3/arch/x86/include/asm/x86_init.h
3262 ---- linux-3.1.3/arch/x86/include/asm/x86_init.h 2011-11-11 15:19:27.000000000 -0500
3263 -+++ linux-3.1.3/arch/x86/include/asm/x86_init.h 2011-11-16 18:39:07.000000000 -0500
3264 +diff -urNp linux-3.1.4/arch/x86/include/asm/x86_init.h linux-3.1.4/arch/x86/include/asm/x86_init.h
3265 +--- linux-3.1.4/arch/x86/include/asm/x86_init.h 2011-11-11 15:19:27.000000000 -0500
3266 ++++ linux-3.1.4/arch/x86/include/asm/x86_init.h 2011-11-16 18:39:07.000000000 -0500
3267 @@ -28,7 +28,7 @@ struct x86_init_mpparse {
3268 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
3269 void (*find_smp_config)(void);
3270 @@ -10284,9 +10617,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/x86_init.h linux-3.1.3/arch/x86/incl
3271
3272 extern struct x86_init_ops x86_init;
3273 extern struct x86_cpuinit_ops x86_cpuinit;
3274 -diff -urNp linux-3.1.3/arch/x86/include/asm/xsave.h linux-3.1.3/arch/x86/include/asm/xsave.h
3275 ---- linux-3.1.3/arch/x86/include/asm/xsave.h 2011-11-11 15:19:27.000000000 -0500
3276 -+++ linux-3.1.3/arch/x86/include/asm/xsave.h 2011-11-16 18:39:07.000000000 -0500
3277 +diff -urNp linux-3.1.4/arch/x86/include/asm/xsave.h linux-3.1.4/arch/x86/include/asm/xsave.h
3278 +--- linux-3.1.4/arch/x86/include/asm/xsave.h 2011-11-11 15:19:27.000000000 -0500
3279 ++++ linux-3.1.4/arch/x86/include/asm/xsave.h 2011-11-16 18:39:07.000000000 -0500
3280 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
3281 {
3282 int err;
3283 @@ -10316,9 +10649,9 @@ diff -urNp linux-3.1.3/arch/x86/include/asm/xsave.h linux-3.1.3/arch/x86/include
3284 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
3285 "2:\n"
3286 ".section .fixup,\"ax\"\n"
3287 -diff -urNp linux-3.1.3/arch/x86/Kconfig linux-3.1.3/arch/x86/Kconfig
3288 ---- linux-3.1.3/arch/x86/Kconfig 2011-11-11 15:19:27.000000000 -0500
3289 -+++ linux-3.1.3/arch/x86/Kconfig 2011-11-16 18:40:08.000000000 -0500
3290 +diff -urNp linux-3.1.4/arch/x86/Kconfig linux-3.1.4/arch/x86/Kconfig
3291 +--- linux-3.1.4/arch/x86/Kconfig 2011-11-11 15:19:27.000000000 -0500
3292 ++++ linux-3.1.4/arch/x86/Kconfig 2011-11-16 18:40:08.000000000 -0500
3293 @@ -236,7 +236,7 @@ config X86_HT
3294
3295 config X86_32_LAZY_GS
3296 @@ -10391,9 +10724,9 @@ diff -urNp linux-3.1.3/arch/x86/Kconfig linux-3.1.3/arch/x86/Kconfig
3297 ---help---
3298 Map the 32-bit VDSO to the predictable old-style address too.
3299
3300 -diff -urNp linux-3.1.3/arch/x86/Kconfig.cpu linux-3.1.3/arch/x86/Kconfig.cpu
3301 ---- linux-3.1.3/arch/x86/Kconfig.cpu 2011-11-11 15:19:27.000000000 -0500
3302 -+++ linux-3.1.3/arch/x86/Kconfig.cpu 2011-11-16 18:39:07.000000000 -0500
3303 +diff -urNp linux-3.1.4/arch/x86/Kconfig.cpu linux-3.1.4/arch/x86/Kconfig.cpu
3304 +--- linux-3.1.4/arch/x86/Kconfig.cpu 2011-11-11 15:19:27.000000000 -0500
3305 ++++ linux-3.1.4/arch/x86/Kconfig.cpu 2011-11-16 18:39:07.000000000 -0500
3306 @@ -341,7 +341,7 @@ config X86_PPRO_FENCE
3307
3308 config X86_F00F_BUG
3309 @@ -10421,9 +10754,9 @@ diff -urNp linux-3.1.3/arch/x86/Kconfig.cpu linux-3.1.3/arch/x86/Kconfig.cpu
3310
3311 config X86_MINIMUM_CPU_FAMILY
3312 int
3313 -diff -urNp linux-3.1.3/arch/x86/Kconfig.debug linux-3.1.3/arch/x86/Kconfig.debug
3314 ---- linux-3.1.3/arch/x86/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
3315 -+++ linux-3.1.3/arch/x86/Kconfig.debug 2011-11-16 18:39:07.000000000 -0500
3316 +diff -urNp linux-3.1.4/arch/x86/Kconfig.debug linux-3.1.4/arch/x86/Kconfig.debug
3317 +--- linux-3.1.4/arch/x86/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
3318 ++++ linux-3.1.4/arch/x86/Kconfig.debug 2011-11-16 18:39:07.000000000 -0500
3319 @@ -81,7 +81,7 @@ config X86_PTDUMP
3320 config DEBUG_RODATA
3321 bool "Write protect kernel read-only data structures"
3322 @@ -10442,9 +10775,9 @@ diff -urNp linux-3.1.3/arch/x86/Kconfig.debug linux-3.1.3/arch/x86/Kconfig.debug
3323 ---help---
3324 This option helps catch unintended modifications to loadable
3325 kernel module's text and read-only data. It also prevents execution
3326 -diff -urNp linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile
3327 ---- linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile 2011-11-11 15:19:27.000000000 -0500
3328 -+++ linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile 2011-11-16 18:39:07.000000000 -0500
3329 +diff -urNp linux-3.1.4/arch/x86/kernel/acpi/realmode/Makefile linux-3.1.4/arch/x86/kernel/acpi/realmode/Makefile
3330 +--- linux-3.1.4/arch/x86/kernel/acpi/realmode/Makefile 2011-11-11 15:19:27.000000000 -0500
3331 ++++ linux-3.1.4/arch/x86/kernel/acpi/realmode/Makefile 2011-11-16 18:39:07.000000000 -0500
3332 @@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os
3333 $(call cc-option, -fno-stack-protector) \
3334 $(call cc-option, -mpreferred-stack-boundary=2)
3335 @@ -10455,9 +10788,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.1.3/arch/x
3336 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
3337 GCOV_PROFILE := n
3338
3339 -diff -urNp linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S
3340 ---- linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-11 15:19:27.000000000 -0500
3341 -+++ linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-16 18:40:08.000000000 -0500
3342 +diff -urNp linux-3.1.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.1.4/arch/x86/kernel/acpi/realmode/wakeup.S
3343 +--- linux-3.1.4/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-11 15:19:27.000000000 -0500
3344 ++++ linux-3.1.4/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-16 18:40:08.000000000 -0500
3345 @@ -108,6 +108,9 @@ wakeup_code:
3346 /* Do any other stuff... */
3347
3348 @@ -10476,9 +10809,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.1.3/arch/x
3349 #else
3350 pushw $0
3351 pushw trampoline_segment
3352 -diff -urNp linux-3.1.3/arch/x86/kernel/acpi/sleep.c linux-3.1.3/arch/x86/kernel/acpi/sleep.c
3353 ---- linux-3.1.3/arch/x86/kernel/acpi/sleep.c 2011-11-11 15:19:27.000000000 -0500
3354 -+++ linux-3.1.3/arch/x86/kernel/acpi/sleep.c 2011-11-16 18:39:07.000000000 -0500
3355 +diff -urNp linux-3.1.4/arch/x86/kernel/acpi/sleep.c linux-3.1.4/arch/x86/kernel/acpi/sleep.c
3356 +--- linux-3.1.4/arch/x86/kernel/acpi/sleep.c 2011-11-11 15:19:27.000000000 -0500
3357 ++++ linux-3.1.4/arch/x86/kernel/acpi/sleep.c 2011-11-16 18:39:07.000000000 -0500
3358 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
3359 header->trampoline_segment = trampoline_address() >> 4;
3360 #ifdef CONFIG_SMP
3361 @@ -10492,9 +10825,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/acpi/sleep.c linux-3.1.3/arch/x86/kernel/
3362 initial_gs = per_cpu_offset(smp_processor_id());
3363 #endif
3364 initial_code = (unsigned long)wakeup_long64;
3365 -diff -urNp linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S
3366 ---- linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S 2011-11-11 15:19:27.000000000 -0500
3367 -+++ linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S 2011-11-16 18:39:07.000000000 -0500
3368 +diff -urNp linux-3.1.4/arch/x86/kernel/acpi/wakeup_32.S linux-3.1.4/arch/x86/kernel/acpi/wakeup_32.S
3369 +--- linux-3.1.4/arch/x86/kernel/acpi/wakeup_32.S 2011-11-11 15:19:27.000000000 -0500
3370 ++++ linux-3.1.4/arch/x86/kernel/acpi/wakeup_32.S 2011-11-16 18:39:07.000000000 -0500
3371 @@ -30,13 +30,11 @@ wakeup_pmode_return:
3372 # and restore the stack ... but you need gdt for this to work
3373 movl saved_context_esp, %esp
3374 @@ -10511,9 +10844,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.1.3/arch/x86/ker
3375
3376 bogus_magic:
3377 jmp bogus_magic
3378 -diff -urNp linux-3.1.3/arch/x86/kernel/alternative.c linux-3.1.3/arch/x86/kernel/alternative.c
3379 ---- linux-3.1.3/arch/x86/kernel/alternative.c 2011-11-11 15:19:27.000000000 -0500
3380 -+++ linux-3.1.3/arch/x86/kernel/alternative.c 2011-11-16 18:39:07.000000000 -0500
3381 +diff -urNp linux-3.1.4/arch/x86/kernel/alternative.c linux-3.1.4/arch/x86/kernel/alternative.c
3382 +--- linux-3.1.4/arch/x86/kernel/alternative.c 2011-11-11 15:19:27.000000000 -0500
3383 ++++ linux-3.1.4/arch/x86/kernel/alternative.c 2011-11-16 18:39:07.000000000 -0500
3384 @@ -276,6 +276,13 @@ void __init_or_module apply_alternatives
3385 */
3386 for (a = start; a < end; a++) {
3387 @@ -10647,9 +10980,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/alternative.c linux-3.1.3/arch/x86/kernel
3388 return addr;
3389 }
3390
3391 -diff -urNp linux-3.1.3/arch/x86/kernel/apic/apic.c linux-3.1.3/arch/x86/kernel/apic/apic.c
3392 ---- linux-3.1.3/arch/x86/kernel/apic/apic.c 2011-11-11 15:19:27.000000000 -0500
3393 -+++ linux-3.1.3/arch/x86/kernel/apic/apic.c 2011-11-16 18:40:08.000000000 -0500
3394 +diff -urNp linux-3.1.4/arch/x86/kernel/apic/apic.c linux-3.1.4/arch/x86/kernel/apic/apic.c
3395 +--- linux-3.1.4/arch/x86/kernel/apic/apic.c 2011-11-11 15:19:27.000000000 -0500
3396 ++++ linux-3.1.4/arch/x86/kernel/apic/apic.c 2011-11-16 18:40:08.000000000 -0500
3397 @@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
3398 /*
3399 * Debug level, exported for io_apic.c
3400 @@ -10677,9 +11010,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/apic/apic.c linux-3.1.3/arch/x86/kernel/a
3401 bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
3402 bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
3403
3404 -diff -urNp linux-3.1.3/arch/x86/kernel/apic/io_apic.c linux-3.1.3/arch/x86/kernel/apic/io_apic.c
3405 ---- linux-3.1.3/arch/x86/kernel/apic/io_apic.c 2011-11-11 15:19:27.000000000 -0500
3406 -+++ linux-3.1.3/arch/x86/kernel/apic/io_apic.c 2011-11-16 18:39:07.000000000 -0500
3407 +diff -urNp linux-3.1.4/arch/x86/kernel/apic/io_apic.c linux-3.1.4/arch/x86/kernel/apic/io_apic.c
3408 +--- linux-3.1.4/arch/x86/kernel/apic/io_apic.c 2011-11-11 15:19:27.000000000 -0500
3409 ++++ linux-3.1.4/arch/x86/kernel/apic/io_apic.c 2011-11-16 18:39:07.000000000 -0500
3410 @@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
3411 }
3412 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
3413 @@ -10716,9 +11049,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/apic/io_apic.c linux-3.1.3/arch/x86/kerne
3414
3415 eoi_ioapic_irq(irq, cfg);
3416 }
3417 -diff -urNp linux-3.1.3/arch/x86/kernel/apm_32.c linux-3.1.3/arch/x86/kernel/apm_32.c
3418 ---- linux-3.1.3/arch/x86/kernel/apm_32.c 2011-11-11 15:19:27.000000000 -0500
3419 -+++ linux-3.1.3/arch/x86/kernel/apm_32.c 2011-11-16 18:39:07.000000000 -0500
3420 +diff -urNp linux-3.1.4/arch/x86/kernel/apm_32.c linux-3.1.4/arch/x86/kernel/apm_32.c
3421 +--- linux-3.1.4/arch/x86/kernel/apm_32.c 2011-11-11 15:19:27.000000000 -0500
3422 ++++ linux-3.1.4/arch/x86/kernel/apm_32.c 2011-11-16 18:39:07.000000000 -0500
3423 @@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex);
3424 * This is for buggy BIOS's that refer to (real mode) segment 0x40
3425 * even though they are called in protected mode.
3426 @@ -10790,9 +11123,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/apm_32.c linux-3.1.3/arch/x86/kernel/apm_
3427
3428 proc_create("apm", 0, NULL, &apm_file_ops);
3429
3430 -diff -urNp linux-3.1.3/arch/x86/kernel/asm-offsets_64.c linux-3.1.3/arch/x86/kernel/asm-offsets_64.c
3431 ---- linux-3.1.3/arch/x86/kernel/asm-offsets_64.c 2011-11-11 15:19:27.000000000 -0500
3432 -+++ linux-3.1.3/arch/x86/kernel/asm-offsets_64.c 2011-11-16 18:39:07.000000000 -0500
3433 +diff -urNp linux-3.1.4/arch/x86/kernel/asm-offsets_64.c linux-3.1.4/arch/x86/kernel/asm-offsets_64.c
3434 +--- linux-3.1.4/arch/x86/kernel/asm-offsets_64.c 2011-11-11 15:19:27.000000000 -0500
3435 ++++ linux-3.1.4/arch/x86/kernel/asm-offsets_64.c 2011-11-16 18:39:07.000000000 -0500
3436 @@ -69,6 +69,7 @@ int main(void)
3437 BLANK();
3438 #undef ENTRY
3439 @@ -10801,9 +11134,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/asm-offsets_64.c linux-3.1.3/arch/x86/ker
3440 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
3441 BLANK();
3442
3443 -diff -urNp linux-3.1.3/arch/x86/kernel/asm-offsets.c linux-3.1.3/arch/x86/kernel/asm-offsets.c
3444 ---- linux-3.1.3/arch/x86/kernel/asm-offsets.c 2011-11-11 15:19:27.000000000 -0500
3445 -+++ linux-3.1.3/arch/x86/kernel/asm-offsets.c 2011-11-16 18:39:07.000000000 -0500
3446 +diff -urNp linux-3.1.4/arch/x86/kernel/asm-offsets.c linux-3.1.4/arch/x86/kernel/asm-offsets.c
3447 +--- linux-3.1.4/arch/x86/kernel/asm-offsets.c 2011-11-11 15:19:27.000000000 -0500
3448 ++++ linux-3.1.4/arch/x86/kernel/asm-offsets.c 2011-11-16 18:39:07.000000000 -0500
3449 @@ -33,6 +33,8 @@ void common(void) {
3450 OFFSET(TI_status, thread_info, status);
3451 OFFSET(TI_addr_limit, thread_info, addr_limit);
3452 @@ -10840,9 +11173,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/asm-offsets.c linux-3.1.3/arch/x86/kernel
3453 #ifdef CONFIG_XEN
3454 BLANK();
3455 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
3456 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/amd.c linux-3.1.3/arch/x86/kernel/cpu/amd.c
3457 ---- linux-3.1.3/arch/x86/kernel/cpu/amd.c 2011-11-11 15:19:27.000000000 -0500
3458 -+++ linux-3.1.3/arch/x86/kernel/cpu/amd.c 2011-11-16 18:39:07.000000000 -0500
3459 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/amd.c linux-3.1.4/arch/x86/kernel/cpu/amd.c
3460 +--- linux-3.1.4/arch/x86/kernel/cpu/amd.c 2011-11-11 15:19:27.000000000 -0500
3461 ++++ linux-3.1.4/arch/x86/kernel/cpu/amd.c 2011-11-16 18:39:07.000000000 -0500
3462 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
3463 unsigned int size)
3464 {
3465 @@ -10852,9 +11185,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/amd.c linux-3.1.3/arch/x86/kernel/cpu
3466 /* Duron Rev A0 */
3467 if (c->x86_model == 3 && c->x86_mask == 0)
3468 size = 64;
3469 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/common.c linux-3.1.3/arch/x86/kernel/cpu/common.c
3470 ---- linux-3.1.3/arch/x86/kernel/cpu/common.c 2011-11-11 15:19:27.000000000 -0500
3471 -+++ linux-3.1.3/arch/x86/kernel/cpu/common.c 2011-11-16 18:39:07.000000000 -0500
3472 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/common.c linux-3.1.4/arch/x86/kernel/cpu/common.c
3473 +--- linux-3.1.4/arch/x86/kernel/cpu/common.c 2011-11-11 15:19:27.000000000 -0500
3474 ++++ linux-3.1.4/arch/x86/kernel/cpu/common.c 2011-11-16 18:39:07.000000000 -0500
3475 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
3476
3477 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
3478 @@ -10999,9 +11332,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/common.c linux-3.1.3/arch/x86/kernel/
3479 struct thread_struct *thread = &curr->thread;
3480
3481 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
3482 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/intel.c linux-3.1.3/arch/x86/kernel/cpu/intel.c
3483 ---- linux-3.1.3/arch/x86/kernel/cpu/intel.c 2011-11-11 15:19:27.000000000 -0500
3484 -+++ linux-3.1.3/arch/x86/kernel/cpu/intel.c 2011-11-16 18:39:07.000000000 -0500
3485 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/intel.c linux-3.1.4/arch/x86/kernel/cpu/intel.c
3486 +--- linux-3.1.4/arch/x86/kernel/cpu/intel.c 2011-11-11 15:19:27.000000000 -0500
3487 ++++ linux-3.1.4/arch/x86/kernel/cpu/intel.c 2011-11-16 18:39:07.000000000 -0500
3488 @@ -172,7 +172,7 @@ static void __cpuinit trap_init_f00f_bug
3489 * Update the IDT descriptor and reload the IDT so that
3490 * it uses the read-only mapped virtual address.
3491 @@ -11011,9 +11344,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/intel.c linux-3.1.3/arch/x86/kernel/c
3492 load_idt(&idt_descr);
3493 }
3494 #endif
3495 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/Makefile linux-3.1.3/arch/x86/kernel/cpu/Makefile
3496 ---- linux-3.1.3/arch/x86/kernel/cpu/Makefile 2011-11-11 15:19:27.000000000 -0500
3497 -+++ linux-3.1.3/arch/x86/kernel/cpu/Makefile 2011-11-16 18:39:07.000000000 -0500
3498 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/Makefile linux-3.1.4/arch/x86/kernel/cpu/Makefile
3499 +--- linux-3.1.4/arch/x86/kernel/cpu/Makefile 2011-11-11 15:19:27.000000000 -0500
3500 ++++ linux-3.1.4/arch/x86/kernel/cpu/Makefile 2011-11-16 18:39:07.000000000 -0500
3501 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
3502 CFLAGS_REMOVE_perf_event.o = -pg
3503 endif
3504 @@ -11025,9 +11358,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/Makefile linux-3.1.3/arch/x86/kernel/
3505 obj-y := intel_cacheinfo.o scattered.o topology.o
3506 obj-y += proc.o capflags.o powerflags.o common.o
3507 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
3508 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c
3509 ---- linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-11 15:19:27.000000000 -0500
3510 -+++ linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-16 18:39:07.000000000 -0500
3511 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce.c
3512 +--- linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-11 15:19:27.000000000 -0500
3513 ++++ linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce.c 2011-12-02 17:38:47.000000000 -0500
3514 @@ -42,6 +42,7 @@
3515 #include <asm/processor.h>
3516 #include <asm/mce.h>
3517 @@ -11085,7 +11418,26 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/ker
3518 wait_for_panic();
3519 if (!monarch_timeout)
3520 goto out;
3521 -@@ -1429,7 +1430,7 @@ void __cpuinit mcheck_cpu_init(struct cp
3522 +@@ -1392,7 +1393,7 @@ static void unexpected_machine_check(str
3523 + }
3524 +
3525 + /* Call the installed machine check handler for this CPU setup. */
3526 +-void (*machine_check_vector)(struct pt_regs *, long error_code) =
3527 ++void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
3528 + unexpected_machine_check;
3529 +
3530 + /*
3531 +@@ -1415,7 +1416,9 @@ void __cpuinit mcheck_cpu_init(struct cp
3532 + return;
3533 + }
3534 +
3535 ++ pax_open_kernel();
3536 + machine_check_vector = do_machine_check;
3537 ++ pax_close_kernel();
3538 +
3539 + __mcheck_cpu_init_generic();
3540 + __mcheck_cpu_init_vendor(c);
3541 +@@ -1429,7 +1432,7 @@ void __cpuinit mcheck_cpu_init(struct cp
3542 */
3543
3544 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
3545 @@ -11094,7 +11446,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/ker
3546 static int mce_chrdev_open_exclu; /* already open exclusive? */
3547
3548 static int mce_chrdev_open(struct inode *inode, struct file *file)
3549 -@@ -1437,7 +1438,7 @@ static int mce_chrdev_open(struct inode
3550 +@@ -1437,7 +1440,7 @@ static int mce_chrdev_open(struct inode
3551 spin_lock(&mce_chrdev_state_lock);
3552
3553 if (mce_chrdev_open_exclu ||
3554 @@ -11103,7 +11455,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/ker
3555 spin_unlock(&mce_chrdev_state_lock);
3556
3557 return -EBUSY;
3558 -@@ -1445,7 +1446,7 @@ static int mce_chrdev_open(struct inode
3559 +@@ -1445,7 +1448,7 @@ static int mce_chrdev_open(struct inode
3560
3561 if (file->f_flags & O_EXCL)
3562 mce_chrdev_open_exclu = 1;
3563 @@ -11112,7 +11464,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/ker
3564
3565 spin_unlock(&mce_chrdev_state_lock);
3566
3567 -@@ -1456,7 +1457,7 @@ static int mce_chrdev_release(struct ino
3568 +@@ -1456,7 +1459,7 @@ static int mce_chrdev_release(struct ino
3569 {
3570 spin_lock(&mce_chrdev_state_lock);
3571
3572 @@ -11121,7 +11473,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/ker
3573 mce_chrdev_open_exclu = 0;
3574
3575 spin_unlock(&mce_chrdev_state_lock);
3576 -@@ -2147,7 +2148,7 @@ struct dentry *mce_get_debugfs_dir(void)
3577 +@@ -2147,7 +2150,7 @@ struct dentry *mce_get_debugfs_dir(void)
3578 static void mce_reset(void)
3579 {
3580 cpu_missing = 0;
3581 @@ -11130,9 +11482,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.3/arch/x86/ker
3582 atomic_set(&mce_executing, 0);
3583 atomic_set(&mce_callin, 0);
3584 atomic_set(&global_nwo, 0);
3585 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c
3586 ---- linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-11 15:19:27.000000000 -0500
3587 -+++ linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-16 18:39:07.000000000 -0500
3588 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce-inject.c
3589 +--- linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-11 15:19:27.000000000 -0500
3590 ++++ linux-3.1.4/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-16 18:39:07.000000000 -0500
3591 @@ -215,7 +215,9 @@ static int inject_init(void)
3592 if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
3593 return -ENOMEM;
3594 @@ -11144,9 +11496,35 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.1.3/arch/
3595 register_die_notifier(&mce_raise_nb);
3596 return 0;
3597 }
3598 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c
3599 ---- linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c 2011-11-11 15:19:27.000000000 -0500
3600 -+++ linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c 2011-11-16 18:39:07.000000000 -0500
3601 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/mcheck/p5.c linux-3.1.4/arch/x86/kernel/cpu/mcheck/p5.c
3602 +--- linux-3.1.4/arch/x86/kernel/cpu/mcheck/p5.c 2011-11-11 15:19:27.000000000 -0500
3603 ++++ linux-3.1.4/arch/x86/kernel/cpu/mcheck/p5.c 2011-12-02 17:38:47.000000000 -0500
3604 +@@ -50,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo
3605 + if (!cpu_has(c, X86_FEATURE_MCE))
3606 + return;
3607 +
3608 ++ pax_open_kernel();
3609 + machine_check_vector = pentium_machine_check;
3610 ++ pax_close_kernel();
3611 + /* Make sure the vector pointer is visible before we enable MCEs: */
3612 + wmb();
3613 +
3614 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/mcheck/winchip.c linux-3.1.4/arch/x86/kernel/cpu/mcheck/winchip.c
3615 +--- linux-3.1.4/arch/x86/kernel/cpu/mcheck/winchip.c 2011-11-11 15:19:27.000000000 -0500
3616 ++++ linux-3.1.4/arch/x86/kernel/cpu/mcheck/winchip.c 2011-12-02 17:38:47.000000000 -0500
3617 +@@ -24,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_
3618 + {
3619 + u32 lo, hi;
3620 +
3621 ++ pax_open_kernel();
3622 + machine_check_vector = winchip_machine_check;
3623 ++ pax_close_kernel();
3624 + /* Make sure the vector pointer is visible before we enable MCEs: */
3625 + wmb();
3626 +
3627 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/mtrr/main.c linux-3.1.4/arch/x86/kernel/cpu/mtrr/main.c
3628 +--- linux-3.1.4/arch/x86/kernel/cpu/mtrr/main.c 2011-11-11 15:19:27.000000000 -0500
3629 ++++ linux-3.1.4/arch/x86/kernel/cpu/mtrr/main.c 2011-11-16 18:39:07.000000000 -0500
3630 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
3631 u64 size_or_mask, size_and_mask;
3632 static bool mtrr_aps_delayed_init;
3633 @@ -11156,9 +11534,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.1.3/arch/x86/kern
3634
3635 const struct mtrr_ops *mtrr_if;
3636
3637 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h
3638 ---- linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-11 15:19:27.000000000 -0500
3639 -+++ linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-16 18:39:07.000000000 -0500
3640 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.1.4/arch/x86/kernel/cpu/mtrr/mtrr.h
3641 +--- linux-3.1.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-11 15:19:27.000000000 -0500
3642 ++++ linux-3.1.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-16 18:39:07.000000000 -0500
3643 @@ -25,7 +25,7 @@ struct mtrr_ops {
3644 int (*validate_add_page)(unsigned long base, unsigned long size,
3645 unsigned int type);
3646 @@ -11168,9 +11546,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.1.3/arch/x86/kern
3647
3648 extern int generic_get_free_region(unsigned long base, unsigned long size,
3649 int replace_reg);
3650 -diff -urNp linux-3.1.3/arch/x86/kernel/cpu/perf_event.c linux-3.1.3/arch/x86/kernel/cpu/perf_event.c
3651 ---- linux-3.1.3/arch/x86/kernel/cpu/perf_event.c 2011-11-11 15:19:27.000000000 -0500
3652 -+++ linux-3.1.3/arch/x86/kernel/cpu/perf_event.c 2011-11-16 18:40:08.000000000 -0500
3653 +diff -urNp linux-3.1.4/arch/x86/kernel/cpu/perf_event.c linux-3.1.4/arch/x86/kernel/cpu/perf_event.c
3654 +--- linux-3.1.4/arch/x86/kernel/cpu/perf_event.c 2011-11-11 15:19:27.000000000 -0500
3655 ++++ linux-3.1.4/arch/x86/kernel/cpu/perf_event.c 2011-11-16 18:40:08.000000000 -0500
3656 @@ -795,6 +795,8 @@ static int x86_schedule_events(struct cp
3657 int i, j, w, wmax, num = 0;
3658 struct hw_perf_event *hwc;
3659 @@ -11189,9 +11567,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/cpu/perf_event.c linux-3.1.3/arch/x86/ker
3660 }
3661 }
3662
3663 -diff -urNp linux-3.1.3/arch/x86/kernel/crash.c linux-3.1.3/arch/x86/kernel/crash.c
3664 ---- linux-3.1.3/arch/x86/kernel/crash.c 2011-11-11 15:19:27.000000000 -0500
3665 -+++ linux-3.1.3/arch/x86/kernel/crash.c 2011-11-16 18:39:07.000000000 -0500
3666 +diff -urNp linux-3.1.4/arch/x86/kernel/crash.c linux-3.1.4/arch/x86/kernel/crash.c
3667 +--- linux-3.1.4/arch/x86/kernel/crash.c 2011-11-11 15:19:27.000000000 -0500
3668 ++++ linux-3.1.4/arch/x86/kernel/crash.c 2011-11-16 18:39:07.000000000 -0500
3669 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
3670 regs = args->regs;
3671
3672 @@ -11201,9 +11579,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/crash.c linux-3.1.3/arch/x86/kernel/crash
3673 crash_fixup_ss_esp(&fixed_regs, regs);
3674 regs = &fixed_regs;
3675 }
3676 -diff -urNp linux-3.1.3/arch/x86/kernel/doublefault_32.c linux-3.1.3/arch/x86/kernel/doublefault_32.c
3677 ---- linux-3.1.3/arch/x86/kernel/doublefault_32.c 2011-11-11 15:19:27.000000000 -0500
3678 -+++ linux-3.1.3/arch/x86/kernel/doublefault_32.c 2011-11-16 18:39:07.000000000 -0500
3679 +diff -urNp linux-3.1.4/arch/x86/kernel/doublefault_32.c linux-3.1.4/arch/x86/kernel/doublefault_32.c
3680 +--- linux-3.1.4/arch/x86/kernel/doublefault_32.c 2011-11-11 15:19:27.000000000 -0500
3681 ++++ linux-3.1.4/arch/x86/kernel/doublefault_32.c 2011-11-16 18:39:07.000000000 -0500
3682 @@ -11,7 +11,7 @@
3683
3684 #define DOUBLEFAULT_STACKSIZE (1024)
3685 @@ -11235,9 +11613,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/doublefault_32.c linux-3.1.3/arch/x86/ker
3686 .fs = __KERNEL_PERCPU,
3687
3688 .__cr3 = __pa_nodebug(swapper_pg_dir),
3689 -diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack_32.c linux-3.1.3/arch/x86/kernel/dumpstack_32.c
3690 ---- linux-3.1.3/arch/x86/kernel/dumpstack_32.c 2011-11-11 15:19:27.000000000 -0500
3691 -+++ linux-3.1.3/arch/x86/kernel/dumpstack_32.c 2011-11-16 18:39:07.000000000 -0500
3692 +diff -urNp linux-3.1.4/arch/x86/kernel/dumpstack_32.c linux-3.1.4/arch/x86/kernel/dumpstack_32.c
3693 +--- linux-3.1.4/arch/x86/kernel/dumpstack_32.c 2011-11-11 15:19:27.000000000 -0500
3694 ++++ linux-3.1.4/arch/x86/kernel/dumpstack_32.c 2011-11-16 18:39:07.000000000 -0500
3695 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
3696 bp = stack_frame(task, regs);
3697
3698 @@ -11317,9 +11695,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack_32.c linux-3.1.3/arch/x86/kerne
3699 +}
3700 +EXPORT_SYMBOL(pax_check_alloca);
3701 +#endif
3702 -diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack_64.c linux-3.1.3/arch/x86/kernel/dumpstack_64.c
3703 ---- linux-3.1.3/arch/x86/kernel/dumpstack_64.c 2011-11-11 15:19:27.000000000 -0500
3704 -+++ linux-3.1.3/arch/x86/kernel/dumpstack_64.c 2011-11-16 18:39:07.000000000 -0500
3705 +diff -urNp linux-3.1.4/arch/x86/kernel/dumpstack_64.c linux-3.1.4/arch/x86/kernel/dumpstack_64.c
3706 +--- linux-3.1.4/arch/x86/kernel/dumpstack_64.c 2011-11-11 15:19:27.000000000 -0500
3707 ++++ linux-3.1.4/arch/x86/kernel/dumpstack_64.c 2011-11-16 18:39:07.000000000 -0500
3708 @@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task
3709 unsigned long *irq_stack_end =
3710 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
3711 @@ -11422,9 +11800,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack_64.c linux-3.1.3/arch/x86/kerne
3712 +}
3713 +EXPORT_SYMBOL(pax_check_alloca);
3714 +#endif
3715 -diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack.c linux-3.1.3/arch/x86/kernel/dumpstack.c
3716 ---- linux-3.1.3/arch/x86/kernel/dumpstack.c 2011-11-11 15:19:27.000000000 -0500
3717 -+++ linux-3.1.3/arch/x86/kernel/dumpstack.c 2011-11-16 18:40:08.000000000 -0500
3718 +diff -urNp linux-3.1.4/arch/x86/kernel/dumpstack.c linux-3.1.4/arch/x86/kernel/dumpstack.c
3719 +--- linux-3.1.4/arch/x86/kernel/dumpstack.c 2011-11-11 15:19:27.000000000 -0500
3720 ++++ linux-3.1.4/arch/x86/kernel/dumpstack.c 2011-11-16 18:40:08.000000000 -0500
3721 @@ -2,6 +2,9 @@
3722 * Copyright (C) 1991, 1992 Linus Torvalds
3723 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
3724 @@ -11568,9 +11946,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/dumpstack.c linux-3.1.3/arch/x86/kernel/d
3725 report_bug(regs->ip, regs);
3726
3727 if (__die(str, regs, err))
3728 -diff -urNp linux-3.1.3/arch/x86/kernel/early_printk.c linux-3.1.3/arch/x86/kernel/early_printk.c
3729 ---- linux-3.1.3/arch/x86/kernel/early_printk.c 2011-11-11 15:19:27.000000000 -0500
3730 -+++ linux-3.1.3/arch/x86/kernel/early_printk.c 2011-11-16 18:40:08.000000000 -0500
3731 +diff -urNp linux-3.1.4/arch/x86/kernel/early_printk.c linux-3.1.4/arch/x86/kernel/early_printk.c
3732 +--- linux-3.1.4/arch/x86/kernel/early_printk.c 2011-11-11 15:19:27.000000000 -0500
3733 ++++ linux-3.1.4/arch/x86/kernel/early_printk.c 2011-11-16 18:40:08.000000000 -0500
3734 @@ -7,6 +7,7 @@
3735 #include <linux/pci_regs.h>
3736 #include <linux/pci_ids.h>
3737 @@ -11588,9 +11966,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/early_printk.c linux-3.1.3/arch/x86/kerne
3738 va_start(ap, fmt);
3739 n = vscnprintf(buf, sizeof(buf), fmt, ap);
3740 early_console->write(early_console, buf, n);
3741 -diff -urNp linux-3.1.3/arch/x86/kernel/entry_32.S linux-3.1.3/arch/x86/kernel/entry_32.S
3742 ---- linux-3.1.3/arch/x86/kernel/entry_32.S 2011-11-11 15:19:27.000000000 -0500
3743 -+++ linux-3.1.3/arch/x86/kernel/entry_32.S 2011-11-16 18:40:08.000000000 -0500
3744 +diff -urNp linux-3.1.4/arch/x86/kernel/entry_32.S linux-3.1.4/arch/x86/kernel/entry_32.S
3745 +--- linux-3.1.4/arch/x86/kernel/entry_32.S 2011-11-11 15:19:27.000000000 -0500
3746 ++++ linux-3.1.4/arch/x86/kernel/entry_32.S 2011-11-16 18:40:08.000000000 -0500
3747 @@ -186,13 +186,146 @@
3748 /*CFI_REL_OFFSET gs, PT_GS*/
3749 .endm
3750 @@ -12368,9 +12746,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_32.S linux-3.1.3/arch/x86/kernel/en
3751 #endif
3752
3753 /*
3754 -diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/entry_64.S
3755 ---- linux-3.1.3/arch/x86/kernel/entry_64.S 2011-11-11 15:19:27.000000000 -0500
3756 -+++ linux-3.1.3/arch/x86/kernel/entry_64.S 2011-11-17 18:28:56.000000000 -0500
3757 +diff -urNp linux-3.1.4/arch/x86/kernel/entry_64.S linux-3.1.4/arch/x86/kernel/entry_64.S
3758 +--- linux-3.1.4/arch/x86/kernel/entry_64.S 2011-11-11 15:19:27.000000000 -0500
3759 ++++ linux-3.1.4/arch/x86/kernel/entry_64.S 2011-12-02 17:40:13.000000000 -0500
3760 @@ -55,6 +55,8 @@
3761 #include <asm/paravirt.h>
3762 #include <asm/ftrace.h>
3763 @@ -12444,7 +12822,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3764 jmp *%rdi
3765 #endif
3766
3767 -@@ -178,6 +186,269 @@ ENTRY(native_usergs_sysret64)
3768 +@@ -178,6 +186,282 @@ ENTRY(native_usergs_sysret64)
3769 ENDPROC(native_usergs_sysret64)
3770 #endif /* CONFIG_PARAVIRT */
3771
3772 @@ -12463,6 +12841,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3773 + .endm
3774 +
3775 + .macro pax_enter_kernel
3776 ++ pax_set_fptr_mask
3777 +#ifdef CONFIG_PAX_KERNEXEC
3778 + call pax_enter_kernel
3779 +#endif
3780 @@ -12484,14 +12863,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3781 +
3782 + GET_CR0_INTO_RDI
3783 + bts $16,%rdi
3784 -+ jnc 1f
3785 ++ jnc 3f
3786 + mov %cs,%edi
3787 + cmp $__KERNEL_CS,%edi
3788 -+ jz 3f
3789 -+ ljmpq __KERNEL_CS,3f
3790 -+1: ljmpq __KERNEXEC_KERNEL_CS,2f
3791 -+2: SET_RDI_INTO_CR0
3792 -+3:
3793 ++ jnz 2f
3794 ++1:
3795 +
3796 +#ifdef CONFIG_PARAVIRT
3797 + PV_RESTORE_REGS(CLBR_RDI)
3798 @@ -12500,6 +12876,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3799 + popq %rdi
3800 + pax_force_retaddr
3801 + retq
3802 ++
3803 ++2: ljmpq __KERNEL_CS,1f
3804 ++3: ljmpq __KERNEXEC_KERNEL_CS,4f
3805 ++4: SET_RDI_INTO_CR0
3806 ++ jmp 1b
3807 +ENDPROC(pax_enter_kernel)
3808 +
3809 +ENTRY(pax_exit_kernel)
3810 @@ -12511,13 +12892,22 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3811 +
3812 + mov %cs,%rdi
3813 + cmp $__KERNEXEC_KERNEL_CS,%edi
3814 -+ jnz 2f
3815 -+ GET_CR0_INTO_RDI
3816 -+ btr $16,%rdi
3817 -+ ljmpq __KERNEL_CS,1f
3818 -+1: SET_RDI_INTO_CR0
3819 -+2:
3820 ++ jz 2f
3821 ++1:
3822 ++
3823 ++#ifdef CONFIG_PARAVIRT
3824 ++ PV_RESTORE_REGS(CLBR_RDI);
3825 ++#endif
3826 ++
3827 ++ popq %rdi
3828 ++ pax_force_retaddr
3829 ++ retq
3830 +
3831 ++2: GET_CR0_INTO_RDI
3832 ++ btr $16,%rdi
3833 ++ ljmpq __KERNEL_CS,3f
3834 ++3: SET_RDI_INTO_CR0
3835 ++ jmp 1b
3836 +#ifdef CONFIG_PARAVIRT
3837 + PV_RESTORE_REGS(CLBR_RDI);
3838 +#endif
3839 @@ -12529,6 +12919,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3840 +#endif
3841 +
3842 + .macro pax_enter_kernel_user
3843 ++ pax_set_fptr_mask
3844 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3845 + call pax_enter_kernel_user
3846 +#endif
3847 @@ -12661,16 +13052,16 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3848 +
3849 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
3850 +/*
3851 -+ * r10: thread_info
3852 ++ * r11: thread_info
3853 + * rcx, rdx: can be clobbered
3854 + */
3855 +ENTRY(pax_erase_kstack)
3856 + pushq %rdi
3857 + pushq %rax
3858 -+ pushq %r10
3859 ++ pushq %r11
3860 +
3861 -+ GET_THREAD_INFO(%r10)
3862 -+ mov TI_lowest_stack(%r10), %rdi
3863 ++ GET_THREAD_INFO(%r11)
3864 ++ mov TI_lowest_stack(%r11), %rdi
3865 + mov $-0xBEEF, %rax
3866 + std
3867 +
3868 @@ -12700,11 +13091,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3869 + shr $3, %ecx
3870 + rep stosq
3871 +
3872 -+ mov TI_task_thread_sp0(%r10), %rdi
3873 ++ mov TI_task_thread_sp0(%r11), %rdi
3874 + sub $256, %rdi
3875 -+ mov %rdi, TI_lowest_stack(%r10)
3876 ++ mov %rdi, TI_lowest_stack(%r11)
3877 +
3878 -+ popq %r10
3879 ++ popq %r11
3880 + popq %rax
3881 + popq %rdi
3882 + pax_force_retaddr
3883 @@ -12714,7 +13105,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3884
3885 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
3886 #ifdef CONFIG_TRACE_IRQFLAGS
3887 -@@ -319,7 +590,7 @@ ENDPROC(native_usergs_sysret64)
3888 +@@ -319,7 +603,7 @@ ENDPROC(native_usergs_sysret64)
3889 movq %rsp, %rsi
3890
3891 leaq -RBP(%rsp),%rdi /* arg1 for handler */
3892 @@ -12723,7 +13114,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3893 je 1f
3894 SWAPGS
3895 /*
3896 -@@ -350,9 +621,10 @@ ENTRY(save_rest)
3897 +@@ -350,9 +634,10 @@ ENTRY(save_rest)
3898 movq_cfi r15, R15+16
3899 movq %r11, 8(%rsp) /* return address */
3900 FIXUP_TOP_OF_STACK %r11, 16
3901 @@ -12735,12 +13126,12 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3902
3903 /* save complete stack frame */
3904 .pushsection .kprobes.text, "ax"
3905 -@@ -381,9 +653,10 @@ ENTRY(save_paranoid)
3906 +@@ -381,9 +666,10 @@ ENTRY(save_paranoid)
3907 js 1f /* negative -> in kernel */
3908 SWAPGS
3909 xorl %ebx,%ebx
3910 -1: ret
3911 -+1: pax_force_retaddr
3912 ++1: pax_force_retaddr_bts
3913 + ret
3914 CFI_ENDPROC
3915 -END(save_paranoid)
3916 @@ -12748,7 +13139,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3917 .popsection
3918
3919 /*
3920 -@@ -405,7 +678,7 @@ ENTRY(ret_from_fork)
3921 +@@ -405,7 +691,7 @@ ENTRY(ret_from_fork)
3922
3923 RESTORE_REST
3924
3925 @@ -12757,7 +13148,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3926 je int_ret_from_sys_call
3927
3928 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
3929 -@@ -415,7 +688,7 @@ ENTRY(ret_from_fork)
3930 +@@ -415,7 +701,7 @@ ENTRY(ret_from_fork)
3931 jmp ret_from_sys_call # go to the SYSRET fastpath
3932
3933 CFI_ENDPROC
3934 @@ -12766,7 +13157,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3935
3936 /*
3937 * System call entry. Up to 6 arguments in registers are supported.
3938 -@@ -451,7 +724,7 @@ END(ret_from_fork)
3939 +@@ -451,7 +737,7 @@ END(ret_from_fork)
3940 ENTRY(system_call)
3941 CFI_STARTPROC simple
3942 CFI_SIGNAL_FRAME
3943 @@ -12775,10 +13166,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3944 CFI_REGISTER rip,rcx
3945 /*CFI_REGISTER rflags,r11*/
3946 SWAPGS_UNSAFE_STACK
3947 -@@ -464,12 +737,13 @@ ENTRY(system_call_after_swapgs)
3948 +@@ -464,12 +750,13 @@ ENTRY(system_call_after_swapgs)
3949
3950 movq %rsp,PER_CPU_VAR(old_rsp)
3951 movq PER_CPU_VAR(kernel_stack),%rsp
3952 ++ SAVE_ARGS 8*6,0
3953 + pax_enter_kernel_user
3954 /*
3955 * No need to follow this irqs off/on section - it's straight
3956 @@ -12786,11 +13178,19 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3957 */
3958 ENABLE_INTERRUPTS(CLBR_NONE)
3959 - SAVE_ARGS 8,0
3960 -+ SAVE_ARGS 8*6,0
3961 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
3962 movq %rcx,RIP-ARGOFFSET(%rsp)
3963 CFI_REL_OFFSET rip,RIP-ARGOFFSET
3964 -@@ -498,6 +772,8 @@ sysret_check:
3965 +@@ -479,7 +766,7 @@ ENTRY(system_call_after_swapgs)
3966 + system_call_fastpath:
3967 + cmpq $__NR_syscall_max,%rax
3968 + ja badsys
3969 +- movq %r10,%rcx
3970 ++ movq R10-ARGOFFSET(%rsp),%rcx
3971 + call *sys_call_table(,%rax,8) # XXX: rip relative
3972 + movq %rax,RAX-ARGOFFSET(%rsp)
3973 + /*
3974 +@@ -498,6 +785,8 @@ sysret_check:
3975 andl %edi,%edx
3976 jnz sysret_careful
3977 CFI_REMEMBER_STATE
3978 @@ -12799,7 +13199,15 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3979 /*
3980 * sysretq will re-enable interrupts:
3981 */
3982 -@@ -556,6 +832,9 @@ auditsys:
3983 +@@ -549,14 +838,18 @@ badsys:
3984 + * jump back to the normal fast path.
3985 + */
3986 + auditsys:
3987 +- movq %r10,%r9 /* 6th arg: 4th syscall arg */
3988 ++ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
3989 + movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
3990 + movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
3991 + movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
3992 movq %rax,%rsi /* 2nd arg: syscall number */
3993 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
3994 call audit_syscall_entry
3995 @@ -12807,9 +13215,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
3996 + pax_erase_kstack
3997 +
3998 LOAD_ARGS 0 /* reload call-clobbered registers */
3999 ++ pax_set_fptr_mask
4000 jmp system_call_fastpath
4001
4002 -@@ -586,6 +865,9 @@ tracesys:
4003 + /*
4004 +@@ -586,16 +879,20 @@ tracesys:
4005 FIXUP_TOP_OF_STACK %rdi
4006 movq %rsp,%rdi
4007 call syscall_trace_enter
4008 @@ -12819,7 +13229,19 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4009 /*
4010 * Reload arg registers from stack in case ptrace changed them.
4011 * We don't reload %rax because syscall_trace_enter() returned
4012 -@@ -607,7 +889,7 @@ tracesys:
4013 + * the value it wants us to use in the table lookup.
4014 + */
4015 + LOAD_ARGS ARGOFFSET, 1
4016 ++ pax_set_fptr_mask
4017 + RESTORE_REST
4018 + cmpq $__NR_syscall_max,%rax
4019 + ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
4020 +- movq %r10,%rcx /* fixup for C */
4021 ++ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
4022 + call *sys_call_table(,%rax,8)
4023 + movq %rax,RAX-ARGOFFSET(%rsp)
4024 + /* Use IRET because user could have changed frame */
4025 +@@ -607,7 +904,7 @@ tracesys:
4026 GLOBAL(int_ret_from_sys_call)
4027 DISABLE_INTERRUPTS(CLBR_NONE)
4028 TRACE_IRQS_OFF
4029 @@ -12828,7 +13250,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4030 je retint_restore_args
4031 movl $_TIF_ALLWORK_MASK,%edi
4032 /* edi: mask to check */
4033 -@@ -664,7 +946,7 @@ int_restore_rest:
4034 +@@ -664,7 +961,7 @@ int_restore_rest:
4035 TRACE_IRQS_OFF
4036 jmp int_with_check
4037 CFI_ENDPROC
4038 @@ -12837,7 +13259,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4039
4040 /*
4041 * Certain special system calls that need to save a complete full stack frame.
4042 -@@ -680,7 +962,7 @@ ENTRY(\label)
4043 +@@ -680,7 +977,7 @@ ENTRY(\label)
4044 call \func
4045 jmp ptregscall_common
4046 CFI_ENDPROC
4047 @@ -12846,7 +13268,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4048 .endm
4049
4050 PTREGSCALL stub_clone, sys_clone, %r8
4051 -@@ -698,9 +980,10 @@ ENTRY(ptregscall_common)
4052 +@@ -698,9 +995,10 @@ ENTRY(ptregscall_common)
4053 movq_cfi_restore R12+8, r12
4054 movq_cfi_restore RBP+8, rbp
4055 movq_cfi_restore RBX+8, rbx
4056 @@ -12858,7 +13280,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4057
4058 ENTRY(stub_execve)
4059 CFI_STARTPROC
4060 -@@ -715,7 +998,7 @@ ENTRY(stub_execve)
4061 +@@ -715,7 +1013,7 @@ ENTRY(stub_execve)
4062 RESTORE_REST
4063 jmp int_ret_from_sys_call
4064 CFI_ENDPROC
4065 @@ -12867,7 +13289,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4066
4067 /*
4068 * sigreturn is special because it needs to restore all registers on return.
4069 -@@ -733,7 +1016,7 @@ ENTRY(stub_rt_sigreturn)
4070 +@@ -733,7 +1031,7 @@ ENTRY(stub_rt_sigreturn)
4071 RESTORE_REST
4072 jmp int_ret_from_sys_call
4073 CFI_ENDPROC
4074 @@ -12876,7 +13298,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4075
4076 /*
4077 * Build the entry stubs and pointer table with some assembler magic.
4078 -@@ -768,7 +1051,7 @@ vector=vector+1
4079 +@@ -768,7 +1066,7 @@ vector=vector+1
4080 2: jmp common_interrupt
4081 .endr
4082 CFI_ENDPROC
4083 @@ -12885,7 +13307,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4084
4085 .previous
4086 END(interrupt)
4087 -@@ -789,6 +1072,16 @@ END(interrupt)
4088 +@@ -789,6 +1087,16 @@ END(interrupt)
4089 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
4090 SAVE_ARGS_IRQ
4091 PARTIAL_FRAME 0
4092 @@ -12902,7 +13324,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4093 call \func
4094 .endm
4095
4096 -@@ -820,7 +1113,7 @@ ret_from_intr:
4097 +@@ -820,7 +1128,7 @@ ret_from_intr:
4098
4099 exit_intr:
4100 GET_THREAD_INFO(%rcx)
4101 @@ -12911,7 +13333,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4102 je retint_kernel
4103
4104 /* Interrupt came from user space */
4105 -@@ -842,12 +1135,16 @@ retint_swapgs: /* return to user-space
4106 +@@ -842,12 +1150,16 @@ retint_swapgs: /* return to user-space
4107 * The iretq could re-enable interrupts:
4108 */
4109 DISABLE_INTERRUPTS(CLBR_ANY)
4110 @@ -12928,7 +13350,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4111 /*
4112 * The iretq could re-enable interrupts:
4113 */
4114 -@@ -936,7 +1233,7 @@ ENTRY(retint_kernel)
4115 +@@ -936,7 +1248,7 @@ ENTRY(retint_kernel)
4116 #endif
4117
4118 CFI_ENDPROC
4119 @@ -12937,7 +13359,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4120 /*
4121 * End of kprobes section
4122 */
4123 -@@ -952,7 +1249,7 @@ ENTRY(\sym)
4124 +@@ -952,7 +1264,7 @@ ENTRY(\sym)
4125 interrupt \do_sym
4126 jmp ret_from_intr
4127 CFI_ENDPROC
4128 @@ -12946,7 +13368,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4129 .endm
4130
4131 #ifdef CONFIG_SMP
4132 -@@ -1017,12 +1314,22 @@ ENTRY(\sym)
4133 +@@ -1017,12 +1329,22 @@ ENTRY(\sym)
4134 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
4135 call error_entry
4136 DEFAULT_FRAME 0
4137 @@ -12970,7 +13392,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4138 .endm
4139
4140 .macro paranoidzeroentry sym do_sym
4141 -@@ -1034,15 +1341,25 @@ ENTRY(\sym)
4142 +@@ -1034,15 +1356,25 @@ ENTRY(\sym)
4143 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
4144 call save_paranoid
4145 TRACE_IRQS_OFF
4146 @@ -12998,7 +13420,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4147 .macro paranoidzeroentry_ist sym do_sym ist
4148 ENTRY(\sym)
4149 INTR_FRAME
4150 -@@ -1052,14 +1369,30 @@ ENTRY(\sym)
4151 +@@ -1052,14 +1384,30 @@ ENTRY(\sym)
4152 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
4153 call save_paranoid
4154 TRACE_IRQS_OFF
4155 @@ -13030,7 +13452,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4156 .endm
4157
4158 .macro errorentry sym do_sym
4159 -@@ -1070,13 +1403,23 @@ ENTRY(\sym)
4160 +@@ -1070,13 +1418,23 @@ ENTRY(\sym)
4161 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
4162 call error_entry
4163 DEFAULT_FRAME 0
4164 @@ -13055,7 +13477,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4165 .endm
4166
4167 /* error code is on the stack already */
4168 -@@ -1089,13 +1432,23 @@ ENTRY(\sym)
4169 +@@ -1089,13 +1447,23 @@ ENTRY(\sym)
4170 call save_paranoid
4171 DEFAULT_FRAME 0
4172 TRACE_IRQS_OFF
4173 @@ -13080,7 +13502,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4174 .endm
4175
4176 zeroentry divide_error do_divide_error
4177 -@@ -1125,9 +1478,10 @@ gs_change:
4178 +@@ -1125,9 +1493,10 @@ gs_change:
4179 2: mfence /* workaround */
4180 SWAPGS
4181 popfq_cfi
4182 @@ -13092,7 +13514,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4183
4184 .section __ex_table,"a"
4185 .align 8
4186 -@@ -1149,13 +1503,14 @@ ENTRY(kernel_thread_helper)
4187 +@@ -1149,13 +1518,14 @@ ENTRY(kernel_thread_helper)
4188 * Here we are in the child and the registers are set as they were
4189 * at kernel_thread() invocation in the parent.
4190 */
4191 @@ -13108,7 +13530,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4192
4193 /*
4194 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
4195 -@@ -1184,9 +1539,10 @@ ENTRY(kernel_execve)
4196 +@@ -1184,9 +1554,10 @@ ENTRY(kernel_execve)
4197 je int_ret_from_sys_call
4198 RESTORE_ARGS
4199 UNFAKE_STACK_FRAME
4200 @@ -13120,7 +13542,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4201
4202 /* Call softirq on interrupt stack. Interrupts are off. */
4203 ENTRY(call_softirq)
4204 -@@ -1204,9 +1560,10 @@ ENTRY(call_softirq)
4205 +@@ -1204,9 +1575,10 @@ ENTRY(call_softirq)
4206 CFI_DEF_CFA_REGISTER rsp
4207 CFI_ADJUST_CFA_OFFSET -8
4208 decl PER_CPU_VAR(irq_count)
4209 @@ -13132,7 +13554,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4210
4211 #ifdef CONFIG_XEN
4212 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
4213 -@@ -1244,7 +1601,7 @@ ENTRY(xen_do_hypervisor_callback) # do
4214 +@@ -1244,7 +1616,7 @@ ENTRY(xen_do_hypervisor_callback) # do
4215 decl PER_CPU_VAR(irq_count)
4216 jmp error_exit
4217 CFI_ENDPROC
4218 @@ -13141,7 +13563,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4219
4220 /*
4221 * Hypervisor uses this for application faults while it executes.
4222 -@@ -1303,7 +1660,7 @@ ENTRY(xen_failsafe_callback)
4223 +@@ -1303,7 +1675,7 @@ ENTRY(xen_failsafe_callback)
4224 SAVE_ALL
4225 jmp error_exit
4226 CFI_ENDPROC
4227 @@ -13150,7 +13572,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4228
4229 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
4230 xen_hvm_callback_vector xen_evtchn_do_upcall
4231 -@@ -1352,16 +1709,31 @@ ENTRY(paranoid_exit)
4232 +@@ -1352,16 +1724,31 @@ ENTRY(paranoid_exit)
4233 TRACE_IRQS_OFF
4234 testl %ebx,%ebx /* swapgs needed? */
4235 jnz paranoid_restore
4236 @@ -13162,7 +13584,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4237 + TRACE_IRQS_IRETQ 0
4238 + SWAPGS_UNSAFE_STACK
4239 + RESTORE_ALL 8
4240 -+ pax_force_retaddr
4241 ++ pax_force_retaddr_bts
4242 + jmp irq_return
4243 +#endif
4244 paranoid_swapgs:
4245 @@ -13179,11 +13601,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4246 + pax_exit_kernel
4247 TRACE_IRQS_IRETQ 0
4248 RESTORE_ALL 8
4249 -+ pax_force_retaddr
4250 ++ pax_force_retaddr_bts
4251 jmp irq_return
4252 paranoid_userspace:
4253 GET_THREAD_INFO(%rcx)
4254 -@@ -1390,7 +1762,7 @@ paranoid_schedule:
4255 +@@ -1390,7 +1777,7 @@ paranoid_schedule:
4256 TRACE_IRQS_OFF
4257 jmp paranoid_userspace
4258 CFI_ENDPROC
4259 @@ -13192,7 +13614,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4260
4261 /*
4262 * Exception entry point. This expects an error code/orig_rax on the stack.
4263 -@@ -1417,12 +1789,13 @@ ENTRY(error_entry)
4264 +@@ -1417,12 +1804,13 @@ ENTRY(error_entry)
4265 movq_cfi r14, R14+8
4266 movq_cfi r15, R15+8
4267 xorl %ebx,%ebx
4268 @@ -13203,11 +13625,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4269 SWAPGS
4270 error_sti:
4271 TRACE_IRQS_OFF
4272 -+ pax_force_retaddr
4273 ++ pax_force_retaddr_bts
4274 ret
4275
4276 /*
4277 -@@ -1449,7 +1822,7 @@ bstep_iret:
4278 +@@ -1449,7 +1837,7 @@ bstep_iret:
4279 movq %rcx,RIP+8(%rsp)
4280 jmp error_swapgs
4281 CFI_ENDPROC
4282 @@ -13216,7 +13638,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4283
4284
4285 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
4286 -@@ -1469,7 +1842,7 @@ ENTRY(error_exit)
4287 +@@ -1469,7 +1857,7 @@ ENTRY(error_exit)
4288 jnz retint_careful
4289 jmp retint_swapgs
4290 CFI_ENDPROC
4291 @@ -13225,7 +13647,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4292
4293
4294 /* runs on exception stack */
4295 -@@ -1481,6 +1854,16 @@ ENTRY(nmi)
4296 +@@ -1481,6 +1869,16 @@ ENTRY(nmi)
4297 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
4298 call save_paranoid
4299 DEFAULT_FRAME 0
4300 @@ -13242,7 +13664,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4301 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
4302 movq %rsp,%rdi
4303 movq $-1,%rsi
4304 -@@ -1491,12 +1874,28 @@ ENTRY(nmi)
4305 +@@ -1491,12 +1889,28 @@ ENTRY(nmi)
4306 DISABLE_INTERRUPTS(CLBR_NONE)
4307 testl %ebx,%ebx /* swapgs needed? */
4308 jnz nmi_restore
4309 @@ -13253,7 +13675,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4310 + pax_exit_kernel
4311 + SWAPGS_UNSAFE_STACK
4312 + RESTORE_ALL 8
4313 -+ pax_force_retaddr
4314 ++ pax_force_retaddr_bts
4315 + jmp irq_return
4316 +#endif
4317 nmi_swapgs:
4318 @@ -13268,11 +13690,11 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4319 nmi_restore:
4320 + pax_exit_kernel
4321 RESTORE_ALL 8
4322 -+ pax_force_retaddr
4323 ++ pax_force_retaddr_bts
4324 jmp irq_return
4325 nmi_userspace:
4326 GET_THREAD_INFO(%rcx)
4327 -@@ -1525,14 +1924,14 @@ nmi_schedule:
4328 +@@ -1525,14 +1939,14 @@ nmi_schedule:
4329 jmp paranoid_exit
4330 CFI_ENDPROC
4331 #endif
4332 @@ -13289,9 +13711,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/entry_64.S linux-3.1.3/arch/x86/kernel/en
4333
4334 /*
4335 * End of kprobes section
4336 -diff -urNp linux-3.1.3/arch/x86/kernel/ftrace.c linux-3.1.3/arch/x86/kernel/ftrace.c
4337 ---- linux-3.1.3/arch/x86/kernel/ftrace.c 2011-11-11 15:19:27.000000000 -0500
4338 -+++ linux-3.1.3/arch/x86/kernel/ftrace.c 2011-11-16 18:39:07.000000000 -0500
4339 +diff -urNp linux-3.1.4/arch/x86/kernel/ftrace.c linux-3.1.4/arch/x86/kernel/ftrace.c
4340 +--- linux-3.1.4/arch/x86/kernel/ftrace.c 2011-11-11 15:19:27.000000000 -0500
4341 ++++ linux-3.1.4/arch/x86/kernel/ftrace.c 2011-11-16 18:39:07.000000000 -0500
4342 @@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the
4343 static const void *mod_code_newcode; /* holds the text to write to the IP */
4344
4345 @@ -13349,9 +13771,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/ftrace.c linux-3.1.3/arch/x86/kernel/ftra
4346 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
4347 return -EFAULT;
4348
4349 -diff -urNp linux-3.1.3/arch/x86/kernel/head32.c linux-3.1.3/arch/x86/kernel/head32.c
4350 ---- linux-3.1.3/arch/x86/kernel/head32.c 2011-11-11 15:19:27.000000000 -0500
4351 -+++ linux-3.1.3/arch/x86/kernel/head32.c 2011-11-16 18:39:07.000000000 -0500
4352 +diff -urNp linux-3.1.4/arch/x86/kernel/head32.c linux-3.1.4/arch/x86/kernel/head32.c
4353 +--- linux-3.1.4/arch/x86/kernel/head32.c 2011-11-11 15:19:27.000000000 -0500
4354 ++++ linux-3.1.4/arch/x86/kernel/head32.c 2011-11-16 18:39:07.000000000 -0500
4355 @@ -19,6 +19,7 @@
4356 #include <asm/io_apic.h>
4357 #include <asm/bios_ebda.h>
4358 @@ -13369,9 +13791,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head32.c linux-3.1.3/arch/x86/kernel/head
4359
4360 #ifdef CONFIG_BLK_DEV_INITRD
4361 /* Reserve INITRD */
4362 -diff -urNp linux-3.1.3/arch/x86/kernel/head_32.S linux-3.1.3/arch/x86/kernel/head_32.S
4363 ---- linux-3.1.3/arch/x86/kernel/head_32.S 2011-11-11 15:19:27.000000000 -0500
4364 -+++ linux-3.1.3/arch/x86/kernel/head_32.S 2011-11-16 18:39:07.000000000 -0500
4365 +diff -urNp linux-3.1.4/arch/x86/kernel/head_32.S linux-3.1.4/arch/x86/kernel/head_32.S
4366 +--- linux-3.1.4/arch/x86/kernel/head_32.S 2011-11-11 15:19:27.000000000 -0500
4367 ++++ linux-3.1.4/arch/x86/kernel/head_32.S 2011-11-16 18:39:07.000000000 -0500
4368 @@ -25,6 +25,12 @@
4369 /* Physical address */
4370 #define pa(X) ((X) - __PAGE_OFFSET)
4371 @@ -13806,18 +14228,19 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_32.S linux-3.1.3/arch/x86/kernel/hea
4372 + /* Be sure this is zeroed to avoid false validations in Xen */
4373 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
4374 + .endr
4375 -diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/head_64.S
4376 ---- linux-3.1.3/arch/x86/kernel/head_64.S 2011-11-11 15:19:27.000000000 -0500
4377 -+++ linux-3.1.3/arch/x86/kernel/head_64.S 2011-11-16 18:39:07.000000000 -0500
4378 -@@ -19,6 +19,7 @@
4379 +diff -urNp linux-3.1.4/arch/x86/kernel/head_64.S linux-3.1.4/arch/x86/kernel/head_64.S
4380 +--- linux-3.1.4/arch/x86/kernel/head_64.S 2011-11-11 15:19:27.000000000 -0500
4381 ++++ linux-3.1.4/arch/x86/kernel/head_64.S 2011-12-02 17:38:47.000000000 -0500
4382 +@@ -19,6 +19,8 @@
4383 #include <asm/cache.h>
4384 #include <asm/processor-flags.h>
4385 #include <asm/percpu.h>
4386 +#include <asm/cpufeature.h>
4387 ++#include <asm/alternative-asm.h>
4388
4389 #ifdef CONFIG_PARAVIRT
4390 #include <asm/asm-offsets.h>
4391 -@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET
4392 +@@ -38,6 +40,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET
4393 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
4394 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
4395 L3_START_KERNEL = pud_index(__START_KERNEL_map)
4396 @@ -13828,7 +14251,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4397
4398 .text
4399 __HEAD
4400 -@@ -85,35 +90,22 @@ startup_64:
4401 +@@ -85,35 +91,22 @@ startup_64:
4402 */
4403 addq %rbp, init_level4_pgt + 0(%rip)
4404 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
4405 @@ -13874,7 +14297,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4406
4407 /*
4408 * Fixup the kernel text+data virtual addresses. Note that
4409 -@@ -160,8 +152,8 @@ ENTRY(secondary_startup_64)
4410 +@@ -160,8 +153,8 @@ ENTRY(secondary_startup_64)
4411 * after the boot processor executes this code.
4412 */
4413
4414 @@ -13885,7 +14308,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4415 movq %rax, %cr4
4416
4417 /* Setup early boot stage 4 level pagetables. */
4418 -@@ -183,9 +175,14 @@ ENTRY(secondary_startup_64)
4419 +@@ -183,9 +176,16 @@ ENTRY(secondary_startup_64)
4420 movl $MSR_EFER, %ecx
4421 rdmsr
4422 btsl $_EFER_SCE, %eax /* Enable System Call */
4423 @@ -13894,14 +14317,24 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4424 jnc 1f
4425 btsl $_EFER_NX, %eax
4426 + leaq init_level4_pgt(%rip), %rdi
4427 ++#ifndef CONFIG_EFI
4428 + btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
4429 ++#endif
4430 + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
4431 + btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
4432 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
4433 1: wrmsr /* Make changes effective */
4434
4435 /* Setup cr0 */
4436 -@@ -269,7 +266,7 @@ ENTRY(secondary_startup_64)
4437 +@@ -247,6 +247,7 @@ ENTRY(secondary_startup_64)
4438 + * jump. In addition we need to ensure %cs is set so we make this
4439 + * a far return.
4440 + */
4441 ++ pax_set_fptr_mask
4442 + movq initial_code(%rip),%rax
4443 + pushq $0 # fake return address to stop unwinder
4444 + pushq $__KERNEL_CS # set correct cs
4445 +@@ -269,7 +270,7 @@ ENTRY(secondary_startup_64)
4446 bad_address:
4447 jmp bad_address
4448
4449 @@ -13910,7 +14343,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4450 #ifdef CONFIG_EARLY_PRINTK
4451 .globl early_idt_handlers
4452 early_idt_handlers:
4453 -@@ -314,18 +311,23 @@ ENTRY(early_idt_handler)
4454 +@@ -314,18 +315,23 @@ ENTRY(early_idt_handler)
4455 #endif /* EARLY_PRINTK */
4456 1: hlt
4457 jmp 1b
4458 @@ -13935,7 +14368,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4459 #define NEXT_PAGE(name) \
4460 .balign PAGE_SIZE; \
4461 ENTRY(name)
4462 -@@ -338,7 +340,6 @@ ENTRY(name)
4463 +@@ -338,7 +344,6 @@ ENTRY(name)
4464 i = i + 1 ; \
4465 .endr
4466
4467 @@ -13943,7 +14376,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4468 /*
4469 * This default setting generates an ident mapping at address 0x100000
4470 * and a mapping for the kernel that precisely maps virtual address
4471 -@@ -349,13 +350,36 @@ NEXT_PAGE(init_level4_pgt)
4472 +@@ -349,13 +354,36 @@ NEXT_PAGE(init_level4_pgt)
4473 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
4474 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
4475 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
4476 @@ -13980,7 +14413,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4477
4478 NEXT_PAGE(level3_kernel_pgt)
4479 .fill L3_START_KERNEL,8,0
4480 -@@ -363,20 +387,23 @@ NEXT_PAGE(level3_kernel_pgt)
4481 +@@ -363,20 +391,23 @@ NEXT_PAGE(level3_kernel_pgt)
4482 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
4483 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
4484
4485 @@ -14012,7 +14445,7 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4486
4487 NEXT_PAGE(level2_kernel_pgt)
4488 /*
4489 -@@ -389,33 +416,55 @@ NEXT_PAGE(level2_kernel_pgt)
4490 +@@ -389,33 +420,55 @@ NEXT_PAGE(level2_kernel_pgt)
4491 * If you want to increase this then increase MODULES_VADDR
4492 * too.)
4493 */
4494 @@ -14078,9 +14511,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/head_64.S linux-3.1.3/arch/x86/kernel/hea
4495
4496 __PAGE_ALIGNED_BSS
4497 .align PAGE_SIZE
4498 -diff -urNp linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c
4499 ---- linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c 2011-11-11 15:19:27.000000000 -0500
4500 -+++ linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c 2011-11-16 18:39:07.000000000 -0500
4501 +diff -urNp linux-3.1.4/arch/x86/kernel/i386_ksyms_32.c linux-3.1.4/arch/x86/kernel/i386_ksyms_32.c
4502 +--- linux-3.1.4/arch/x86/kernel/i386_ksyms_32.c 2011-11-11 15:19:27.000000000 -0500
4503 ++++ linux-3.1.4/arch/x86/kernel/i386_ksyms_32.c 2011-11-16 18:39:07.000000000 -0500
4504 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
4505 EXPORT_SYMBOL(cmpxchg8b_emu);
4506 #endif
4507 @@ -14102,9 +14535,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/i386_ksyms_32.c linux-3.1.3/arch/x86/kern
4508 +#ifdef CONFIG_PAX_KERNEXEC
4509 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
4510 +#endif
4511 -diff -urNp linux-3.1.3/arch/x86/kernel/i8259.c linux-3.1.3/arch/x86/kernel/i8259.c
4512 ---- linux-3.1.3/arch/x86/kernel/i8259.c 2011-11-11 15:19:27.000000000 -0500
4513 -+++ linux-3.1.3/arch/x86/kernel/i8259.c 2011-11-16 18:39:07.000000000 -0500
4514 +diff -urNp linux-3.1.4/arch/x86/kernel/i8259.c linux-3.1.4/arch/x86/kernel/i8259.c
4515 +--- linux-3.1.4/arch/x86/kernel/i8259.c 2011-11-11 15:19:27.000000000 -0500
4516 ++++ linux-3.1.4/arch/x86/kernel/i8259.c 2011-11-16 18:39:07.000000000 -0500
4517 @@ -210,7 +210,7 @@ spurious_8259A_irq:
4518 "spurious 8259A interrupt: IRQ%d.\n", irq);
4519 spurious_irq_mask |= irqmask;
4520 @@ -14114,9 +14547,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/i8259.c linux-3.1.3/arch/x86/kernel/i8259
4521 /*
4522 * Theoretically we do not have to handle this IRQ,
4523 * but in Linux this does not cause problems and is
4524 -diff -urNp linux-3.1.3/arch/x86/kernel/init_task.c linux-3.1.3/arch/x86/kernel/init_task.c
4525 ---- linux-3.1.3/arch/x86/kernel/init_task.c 2011-11-11 15:19:27.000000000 -0500
4526 -+++ linux-3.1.3/arch/x86/kernel/init_task.c 2011-11-16 18:39:07.000000000 -0500
4527 +diff -urNp linux-3.1.4/arch/x86/kernel/init_task.c linux-3.1.4/arch/x86/kernel/init_task.c
4528 +--- linux-3.1.4/arch/x86/kernel/init_task.c 2011-11-11 15:19:27.000000000 -0500
4529 ++++ linux-3.1.4/arch/x86/kernel/init_task.c 2011-11-16 18:39:07.000000000 -0500
4530 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
4531 * way process stacks are handled. This is done by having a special
4532 * "init_task" linker map entry..
4533 @@ -14135,9 +14568,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/init_task.c linux-3.1.3/arch/x86/kernel/i
4534 -
4535 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
4536 +EXPORT_SYMBOL(init_tss);
4537 -diff -urNp linux-3.1.3/arch/x86/kernel/ioport.c linux-3.1.3/arch/x86/kernel/ioport.c
4538 ---- linux-3.1.3/arch/x86/kernel/ioport.c 2011-11-11 15:19:27.000000000 -0500
4539 -+++ linux-3.1.3/arch/x86/kernel/ioport.c 2011-11-16 18:40:08.000000000 -0500
4540 +diff -urNp linux-3.1.4/arch/x86/kernel/ioport.c linux-3.1.4/arch/x86/kernel/ioport.c
4541 +--- linux-3.1.4/arch/x86/kernel/ioport.c 2011-11-11 15:19:27.000000000 -0500
4542 ++++ linux-3.1.4/arch/x86/kernel/ioport.c 2011-11-16 18:40:08.000000000 -0500
4543 @@ -6,6 +6,7 @@
4544 #include <linux/sched.h>
4545 #include <linux/kernel.h>
4546 @@ -14181,9 +14614,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/ioport.c linux-3.1.3/arch/x86/kernel/iopo
4547 if (!capable(CAP_SYS_RAWIO))
4548 return -EPERM;
4549 }
4550 -diff -urNp linux-3.1.3/arch/x86/kernel/irq_32.c linux-3.1.3/arch/x86/kernel/irq_32.c
4551 ---- linux-3.1.3/arch/x86/kernel/irq_32.c 2011-11-11 15:19:27.000000000 -0500
4552 -+++ linux-3.1.3/arch/x86/kernel/irq_32.c 2011-11-16 18:39:07.000000000 -0500
4553 +diff -urNp linux-3.1.4/arch/x86/kernel/irq_32.c linux-3.1.4/arch/x86/kernel/irq_32.c
4554 +--- linux-3.1.4/arch/x86/kernel/irq_32.c 2011-11-11 15:19:27.000000000 -0500
4555 ++++ linux-3.1.4/arch/x86/kernel/irq_32.c 2011-11-16 18:39:07.000000000 -0500
4556 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
4557 __asm__ __volatile__("andl %%esp,%0" :
4558 "=r" (sp) : "0" (THREAD_SIZE - 1));
4559 @@ -14323,9 +14756,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/irq_32.c linux-3.1.3/arch/x86/kernel/irq_
4560 /*
4561 * Shouldn't happen, we returned above if in_interrupt():
4562 */
4563 -diff -urNp linux-3.1.3/arch/x86/kernel/irq.c linux-3.1.3/arch/x86/kernel/irq.c
4564 ---- linux-3.1.3/arch/x86/kernel/irq.c 2011-11-11 15:19:27.000000000 -0500
4565 -+++ linux-3.1.3/arch/x86/kernel/irq.c 2011-11-16 18:39:07.000000000 -0500
4566 +diff -urNp linux-3.1.4/arch/x86/kernel/irq.c linux-3.1.4/arch/x86/kernel/irq.c
4567 +--- linux-3.1.4/arch/x86/kernel/irq.c 2011-11-11 15:19:27.000000000 -0500
4568 ++++ linux-3.1.4/arch/x86/kernel/irq.c 2011-11-16 18:39:07.000000000 -0500
4569 @@ -17,7 +17,7 @@
4570 #include <asm/mce.h>
4571 #include <asm/hw_irq.h>
4572 @@ -14360,9 +14793,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/irq.c linux-3.1.3/arch/x86/kernel/irq.c
4573 #endif
4574 return sum;
4575 }
4576 -diff -urNp linux-3.1.3/arch/x86/kernel/kgdb.c linux-3.1.3/arch/x86/kernel/kgdb.c
4577 ---- linux-3.1.3/arch/x86/kernel/kgdb.c 2011-11-11 15:19:27.000000000 -0500
4578 -+++ linux-3.1.3/arch/x86/kernel/kgdb.c 2011-11-16 18:39:07.000000000 -0500
4579 +diff -urNp linux-3.1.4/arch/x86/kernel/kgdb.c linux-3.1.4/arch/x86/kernel/kgdb.c
4580 +--- linux-3.1.4/arch/x86/kernel/kgdb.c 2011-11-11 15:19:27.000000000 -0500
4581 ++++ linux-3.1.4/arch/x86/kernel/kgdb.c 2011-11-16 18:39:07.000000000 -0500
4582 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem,
4583 #ifdef CONFIG_X86_32
4584 switch (regno) {
4585 @@ -14401,9 +14834,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/kgdb.c linux-3.1.3/arch/x86/kernel/kgdb.c
4586 if (user_mode(regs))
4587 return single_step_cont(regs, args);
4588 break;
4589 -diff -urNp linux-3.1.3/arch/x86/kernel/kprobes.c linux-3.1.3/arch/x86/kernel/kprobes.c
4590 ---- linux-3.1.3/arch/x86/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
4591 -+++ linux-3.1.3/arch/x86/kernel/kprobes.c 2011-11-16 18:39:07.000000000 -0500
4592 +diff -urNp linux-3.1.4/arch/x86/kernel/kprobes.c linux-3.1.4/arch/x86/kernel/kprobes.c
4593 +--- linux-3.1.4/arch/x86/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
4594 ++++ linux-3.1.4/arch/x86/kernel/kprobes.c 2011-11-16 18:39:07.000000000 -0500
4595 @@ -117,8 +117,11 @@ static void __kprobes __synthesize_relat
4596 } __attribute__((packed)) *insn;
4597
4598 @@ -14547,9 +14980,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/kprobes.c linux-3.1.3/arch/x86/kernel/kpr
4599 RELATIVE_ADDR_SIZE);
4600
4601 insn_buf[0] = RELATIVEJUMP_OPCODE;
4602 -diff -urNp linux-3.1.3/arch/x86/kernel/kvm.c linux-3.1.3/arch/x86/kernel/kvm.c
4603 ---- linux-3.1.3/arch/x86/kernel/kvm.c 2011-11-11 15:19:27.000000000 -0500
4604 -+++ linux-3.1.3/arch/x86/kernel/kvm.c 2011-11-16 18:39:07.000000000 -0500
4605 +diff -urNp linux-3.1.4/arch/x86/kernel/kvm.c linux-3.1.4/arch/x86/kernel/kvm.c
4606 +--- linux-3.1.4/arch/x86/kernel/kvm.c 2011-11-11 15:19:27.000000000 -0500
4607 ++++ linux-3.1.4/arch/x86/kernel/kvm.c 2011-11-16 18:39:07.000000000 -0500
4608 @@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(vo
4609 pv_mmu_ops.set_pud = kvm_set_pud;
4610 #if PAGETABLE_LEVELS == 4
4611 @@ -14558,9 +14991,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/kvm.c linux-3.1.3/arch/x86/kernel/kvm.c
4612 #endif
4613 #endif
4614 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
4615 -diff -urNp linux-3.1.3/arch/x86/kernel/ldt.c linux-3.1.3/arch/x86/kernel/ldt.c
4616 ---- linux-3.1.3/arch/x86/kernel/ldt.c 2011-11-11 15:19:27.000000000 -0500
4617 -+++ linux-3.1.3/arch/x86/kernel/ldt.c 2011-11-16 18:39:07.000000000 -0500
4618 +diff -urNp linux-3.1.4/arch/x86/kernel/ldt.c linux-3.1.4/arch/x86/kernel/ldt.c
4619 +--- linux-3.1.4/arch/x86/kernel/ldt.c 2011-11-11 15:19:27.000000000 -0500
4620 ++++ linux-3.1.4/arch/x86/kernel/ldt.c 2011-11-16 18:39:07.000000000 -0500
4621 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
4622 if (reload) {
4623 #ifdef CONFIG_SMP
4624 @@ -14625,9 +15058,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/ldt.c linux-3.1.3/arch/x86/kernel/ldt.c
4625 fill_ldt(&ldt, &ldt_info);
4626 if (oldmode)
4627 ldt.avl = 0;
4628 -diff -urNp linux-3.1.3/arch/x86/kernel/machine_kexec_32.c linux-3.1.3/arch/x86/kernel/machine_kexec_32.c
4629 ---- linux-3.1.3/arch/x86/kernel/machine_kexec_32.c 2011-11-11 15:19:27.000000000 -0500
4630 -+++ linux-3.1.3/arch/x86/kernel/machine_kexec_32.c 2011-11-16 18:39:07.000000000 -0500
4631 +diff -urNp linux-3.1.4/arch/x86/kernel/machine_kexec_32.c linux-3.1.4/arch/x86/kernel/machine_kexec_32.c
4632 +--- linux-3.1.4/arch/x86/kernel/machine_kexec_32.c 2011-11-11 15:19:27.000000000 -0500
4633 ++++ linux-3.1.4/arch/x86/kernel/machine_kexec_32.c 2011-11-16 18:39:07.000000000 -0500
4634 @@ -27,7 +27,7 @@
4635 #include <asm/cacheflush.h>
4636 #include <asm/debugreg.h>
4637 @@ -14655,9 +15088,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/machine_kexec_32.c linux-3.1.3/arch/x86/k
4638
4639 relocate_kernel_ptr = control_page;
4640 page_list[PA_CONTROL_PAGE] = __pa(control_page);
4641 -diff -urNp linux-3.1.3/arch/x86/kernel/microcode_intel.c linux-3.1.3/arch/x86/kernel/microcode_intel.c
4642 ---- linux-3.1.3/arch/x86/kernel/microcode_intel.c 2011-11-11 15:19:27.000000000 -0500
4643 -+++ linux-3.1.3/arch/x86/kernel/microcode_intel.c 2011-11-16 18:39:07.000000000 -0500
4644 +diff -urNp linux-3.1.4/arch/x86/kernel/microcode_intel.c linux-3.1.4/arch/x86/kernel/microcode_intel.c
4645 +--- linux-3.1.4/arch/x86/kernel/microcode_intel.c 2011-11-11 15:19:27.000000000 -0500
4646 ++++ linux-3.1.4/arch/x86/kernel/microcode_intel.c 2011-11-16 18:39:07.000000000 -0500
4647 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
4648
4649 static int get_ucode_user(void *to, const void *from, size_t n)
4650 @@ -14674,9 +15107,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/microcode_intel.c linux-3.1.3/arch/x86/ke
4651 }
4652
4653 static void microcode_fini_cpu(int cpu)
4654 -diff -urNp linux-3.1.3/arch/x86/kernel/module.c linux-3.1.3/arch/x86/kernel/module.c
4655 ---- linux-3.1.3/arch/x86/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
4656 -+++ linux-3.1.3/arch/x86/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
4657 +diff -urNp linux-3.1.4/arch/x86/kernel/module.c linux-3.1.4/arch/x86/kernel/module.c
4658 +--- linux-3.1.4/arch/x86/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
4659 ++++ linux-3.1.4/arch/x86/kernel/module.c 2011-11-16 18:39:07.000000000 -0500
4660 @@ -36,15 +36,60 @@
4661 #define DEBUGP(fmt...)
4662 #endif
4663 @@ -14809,9 +15242,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/module.c linux-3.1.3/arch/x86/kernel/modu
4664 #if 0
4665 if ((s64)val != *(s32 *)loc)
4666 goto overflow;
4667 -diff -urNp linux-3.1.3/arch/x86/kernel/paravirt.c linux-3.1.3/arch/x86/kernel/paravirt.c
4668 ---- linux-3.1.3/arch/x86/kernel/paravirt.c 2011-11-11 15:19:27.000000000 -0500
4669 -+++ linux-3.1.3/arch/x86/kernel/paravirt.c 2011-11-17 18:29:42.000000000 -0500
4670 +diff -urNp linux-3.1.4/arch/x86/kernel/paravirt.c linux-3.1.4/arch/x86/kernel/paravirt.c
4671 +--- linux-3.1.4/arch/x86/kernel/paravirt.c 2011-11-11 15:19:27.000000000 -0500
4672 ++++ linux-3.1.4/arch/x86/kernel/paravirt.c 2011-11-17 18:29:42.000000000 -0500
4673 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
4674 {
4675 return x;
4676 @@ -14953,9 +15386,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/paravirt.c linux-3.1.3/arch/x86/kernel/pa
4677 };
4678
4679 EXPORT_SYMBOL_GPL(pv_time_ops);
4680 -diff -urNp linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c
4681 ---- linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c 2011-11-11 15:19:27.000000000 -0500
4682 -+++ linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c 2011-11-16 18:39:07.000000000 -0500
4683 +diff -urNp linux-3.1.4/arch/x86/kernel/paravirt-spinlocks.c linux-3.1.4/arch/x86/kernel/paravirt-spinlocks.c
4684 +--- linux-3.1.4/arch/x86/kernel/paravirt-spinlocks.c 2011-11-11 15:19:27.000000000 -0500
4685 ++++ linux-3.1.4/arch/x86/kernel/paravirt-spinlocks.c 2011-11-16 18:39:07.000000000 -0500
4686 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
4687 arch_spin_lock(lock);
4688 }
4689 @@ -14965,9 +15398,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.1.3/arch/x86
4690 #ifdef CONFIG_SMP
4691 .spin_is_locked = __ticket_spin_is_locked,
4692 .spin_is_contended = __ticket_spin_is_contended,
4693 -diff -urNp linux-3.1.3/arch/x86/kernel/pci-iommu_table.c linux-3.1.3/arch/x86/kernel/pci-iommu_table.c
4694 ---- linux-3.1.3/arch/x86/kernel/pci-iommu_table.c 2011-11-11 15:19:27.000000000 -0500
4695 -+++ linux-3.1.3/arch/x86/kernel/pci-iommu_table.c 2011-11-16 18:40:08.000000000 -0500
4696 +diff -urNp linux-3.1.4/arch/x86/kernel/pci-iommu_table.c linux-3.1.4/arch/x86/kernel/pci-iommu_table.c
4697 +--- linux-3.1.4/arch/x86/kernel/pci-iommu_table.c 2011-11-11 15:19:27.000000000 -0500
4698 ++++ linux-3.1.4/arch/x86/kernel/pci-iommu_table.c 2011-11-16 18:40:08.000000000 -0500
4699 @@ -2,7 +2,7 @@
4700 #include <asm/iommu_table.h>
4701 #include <linux/string.h>
4702 @@ -14986,9 +15419,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/pci-iommu_table.c linux-3.1.3/arch/x86/ke
4703 /* Simple cyclic dependency checker. */
4704 for (p = start; p < finish; p++) {
4705 q = find_dependents_of(start, finish, p);
4706 -diff -urNp linux-3.1.3/arch/x86/kernel/process_32.c linux-3.1.3/arch/x86/kernel/process_32.c
4707 ---- linux-3.1.3/arch/x86/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
4708 -+++ linux-3.1.3/arch/x86/kernel/process_32.c 2011-11-16 18:39:07.000000000 -0500
4709 +diff -urNp linux-3.1.4/arch/x86/kernel/process_32.c linux-3.1.4/arch/x86/kernel/process_32.c
4710 +--- linux-3.1.4/arch/x86/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
4711 ++++ linux-3.1.4/arch/x86/kernel/process_32.c 2011-11-16 18:39:07.000000000 -0500
4712 @@ -66,6 +66,7 @@ asmlinkage void ret_from_fork(void) __as
4713 unsigned long thread_saved_pc(struct task_struct *tsk)
4714 {
4715 @@ -15075,9 +15508,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/process_32.c linux-3.1.3/arch/x86/kernel/
4716 return 0;
4717 }
4718 -
4719 -diff -urNp linux-3.1.3/arch/x86/kernel/process_64.c linux-3.1.3/arch/x86/kernel/process_64.c
4720 ---- linux-3.1.3/arch/x86/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
4721 -+++ linux-3.1.3/arch/x86/kernel/process_64.c 2011-11-16 18:39:07.000000000 -0500
4722 +diff -urNp linux-3.1.4/arch/x86/kernel/process_64.c linux-3.1.4/arch/x86/kernel/process_64.c
4723 +--- linux-3.1.4/arch/x86/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
4724 ++++ linux-3.1.4/arch/x86/kernel/process_64.c 2011-11-16 18:39:07.000000000 -0500
4725 @@ -88,7 +88,7 @@ static void __exit_idle(void)
4726 void exit_idle(void)
4727 {
4728 @@ -15142,9 +15575,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/process_64.c linux-3.1.3/arch/x86/kernel/
4729 return 0;
4730 ip = *(u64 *)(fp+8);
4731 if (!in_sched_functions(ip))
4732 -diff -urNp linux-3.1.3/arch/x86/kernel/process.c linux-3.1.3/arch/x86/kernel/process.c
4733 ---- linux-3.1.3/arch/x86/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
4734 -+++ linux-3.1.3/arch/x86/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
4735 +diff -urNp linux-3.1.4/arch/x86/kernel/process.c linux-3.1.4/arch/x86/kernel/process.c
4736 +--- linux-3.1.4/arch/x86/kernel/process.c 2011-11-11 15:19:27.000000000 -0500
4737 ++++ linux-3.1.4/arch/x86/kernel/process.c 2011-11-16 18:39:07.000000000 -0500
4738 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
4739
4740 void free_thread_info(struct thread_info *ti)
4741 @@ -15282,9 +15715,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/process.c linux-3.1.3/arch/x86/kernel/pro
4742 +#endif
4743 +}
4744 +#endif
4745 -diff -urNp linux-3.1.3/arch/x86/kernel/ptrace.c linux-3.1.3/arch/x86/kernel/ptrace.c
4746 ---- linux-3.1.3/arch/x86/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
4747 -+++ linux-3.1.3/arch/x86/kernel/ptrace.c 2011-11-16 18:39:07.000000000 -0500
4748 +diff -urNp linux-3.1.4/arch/x86/kernel/ptrace.c linux-3.1.4/arch/x86/kernel/ptrace.c
4749 +--- linux-3.1.4/arch/x86/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
4750 ++++ linux-3.1.4/arch/x86/kernel/ptrace.c 2011-11-16 18:39:07.000000000 -0500
4751 @@ -822,7 +822,7 @@ long arch_ptrace(struct task_struct *chi
4752 unsigned long addr, unsigned long data)
4753 {
4754 @@ -15320,9 +15753,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/ptrace.c linux-3.1.3/arch/x86/kernel/ptra
4755 }
4756
4757 void user_single_step_siginfo(struct task_struct *tsk,
4758 -diff -urNp linux-3.1.3/arch/x86/kernel/pvclock.c linux-3.1.3/arch/x86/kernel/pvclock.c
4759 ---- linux-3.1.3/arch/x86/kernel/pvclock.c 2011-11-11 15:19:27.000000000 -0500
4760 -+++ linux-3.1.3/arch/x86/kernel/pvclock.c 2011-11-16 18:39:07.000000000 -0500
4761 +diff -urNp linux-3.1.4/arch/x86/kernel/pvclock.c linux-3.1.4/arch/x86/kernel/pvclock.c
4762 +--- linux-3.1.4/arch/x86/kernel/pvclock.c 2011-11-11 15:19:27.000000000 -0500
4763 ++++ linux-3.1.4/arch/x86/kernel/pvclock.c 2011-11-16 18:39:07.000000000 -0500
4764 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
4765 return pv_tsc_khz;
4766 }
4767 @@ -15351,9 +15784,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/pvclock.c linux-3.1.3/arch/x86/kernel/pvc
4768 } while (unlikely(last != ret));
4769
4770 return ret;
4771 -diff -urNp linux-3.1.3/arch/x86/kernel/reboot.c linux-3.1.3/arch/x86/kernel/reboot.c
4772 ---- linux-3.1.3/arch/x86/kernel/reboot.c 2011-11-11 15:19:27.000000000 -0500
4773 -+++ linux-3.1.3/arch/x86/kernel/reboot.c 2011-11-16 18:39:07.000000000 -0500
4774 +diff -urNp linux-3.1.4/arch/x86/kernel/reboot.c linux-3.1.4/arch/x86/kernel/reboot.c
4775 +--- linux-3.1.4/arch/x86/kernel/reboot.c 2011-11-11 15:19:27.000000000 -0500
4776 ++++ linux-3.1.4/arch/x86/kernel/reboot.c 2011-11-16 18:39:07.000000000 -0500
4777 @@ -35,7 +35,7 @@ void (*pm_power_off)(void);
4778 EXPORT_SYMBOL(pm_power_off);
4779
4780 @@ -15485,9 +15918,36 @@ diff -urNp linux-3.1.3/arch/x86/kernel/reboot.c linux-3.1.3/arch/x86/kernel/rebo
4781 }
4782
4783 struct machine_ops machine_ops = {
4784 -diff -urNp linux-3.1.3/arch/x86/kernel/setup.c linux-3.1.3/arch/x86/kernel/setup.c
4785 ---- linux-3.1.3/arch/x86/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
4786 -+++ linux-3.1.3/arch/x86/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
4787 +diff -urNp linux-3.1.4/arch/x86/kernel/relocate_kernel_64.S linux-3.1.4/arch/x86/kernel/relocate_kernel_64.S
4788 +--- linux-3.1.4/arch/x86/kernel/relocate_kernel_64.S 2011-11-11 15:19:27.000000000 -0500
4789 ++++ linux-3.1.4/arch/x86/kernel/relocate_kernel_64.S 2011-12-02 17:38:47.000000000 -0500
4790 +@@ -11,6 +11,7 @@
4791 + #include <asm/kexec.h>
4792 + #include <asm/processor-flags.h>
4793 + #include <asm/pgtable_types.h>
4794 ++#include <asm/alternative-asm.h>
4795 +
4796 + /*
4797 + * Must be relocatable PIC code callable as a C function
4798 +@@ -160,13 +161,14 @@ identity_mapped:
4799 + xorq %rbp, %rbp
4800 + xorq %r8, %r8
4801 + xorq %r9, %r9
4802 +- xorq %r10, %r9
4803 ++ xorq %r10, %r10
4804 + xorq %r11, %r11
4805 + xorq %r12, %r12
4806 + xorq %r13, %r13
4807 + xorq %r14, %r14
4808 + xorq %r15, %r15
4809 +
4810 ++ pax_force_retaddr 0, 1
4811 + ret
4812 +
4813 + 1:
4814 +diff -urNp linux-3.1.4/arch/x86/kernel/setup.c linux-3.1.4/arch/x86/kernel/setup.c
4815 +--- linux-3.1.4/arch/x86/kernel/setup.c 2011-11-11 15:19:27.000000000 -0500
4816 ++++ linux-3.1.4/arch/x86/kernel/setup.c 2011-11-16 18:39:07.000000000 -0500
4817 @@ -447,7 +447,7 @@ static void __init parse_setup_data(void
4818
4819 switch (data->type) {
4820 @@ -15526,9 +15986,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/setup.c linux-3.1.3/arch/x86/kernel/setup
4821 data_resource.end = virt_to_phys(_edata)-1;
4822 bss_resource.start = virt_to_phys(&__bss_start);
4823 bss_resource.end = virt_to_phys(&__bss_stop)-1;
4824 -diff -urNp linux-3.1.3/arch/x86/kernel/setup_percpu.c linux-3.1.3/arch/x86/kernel/setup_percpu.c
4825 ---- linux-3.1.3/arch/x86/kernel/setup_percpu.c 2011-11-11 15:19:27.000000000 -0500
4826 -+++ linux-3.1.3/arch/x86/kernel/setup_percpu.c 2011-11-16 18:39:07.000000000 -0500
4827 +diff -urNp linux-3.1.4/arch/x86/kernel/setup_percpu.c linux-3.1.4/arch/x86/kernel/setup_percpu.c
4828 +--- linux-3.1.4/arch/x86/kernel/setup_percpu.c 2011-11-11 15:19:27.000000000 -0500
4829 ++++ linux-3.1.4/arch/x86/kernel/setup_percpu.c 2011-11-16 18:39:07.000000000 -0500
4830 @@ -21,19 +21,17 @@
4831 #include <asm/cpu.h>
4832 #include <asm/stackprotector.h>
4833 @@ -15592,9 +16052,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/setup_percpu.c linux-3.1.3/arch/x86/kerne
4834 /*
4835 * Up to this point, the boot CPU has been using .init.data
4836 * area. Reload any changed state for the boot CPU.
4837 -diff -urNp linux-3.1.3/arch/x86/kernel/signal.c linux-3.1.3/arch/x86/kernel/signal.c
4838 ---- linux-3.1.3/arch/x86/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
4839 -+++ linux-3.1.3/arch/x86/kernel/signal.c 2011-11-16 19:39:49.000000000 -0500
4840 +diff -urNp linux-3.1.4/arch/x86/kernel/signal.c linux-3.1.4/arch/x86/kernel/signal.c
4841 +--- linux-3.1.4/arch/x86/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
4842 ++++ linux-3.1.4/arch/x86/kernel/signal.c 2011-11-16 19:39:49.000000000 -0500
4843 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
4844 * Align the stack pointer according to the i386 ABI,
4845 * i.e. so that on function entry ((sp + 4) & 15) == 0.
4846 @@ -15678,9 +16138,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/signal.c linux-3.1.3/arch/x86/kernel/sign
4847 return;
4848
4849 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
4850 -diff -urNp linux-3.1.3/arch/x86/kernel/smpboot.c linux-3.1.3/arch/x86/kernel/smpboot.c
4851 ---- linux-3.1.3/arch/x86/kernel/smpboot.c 2011-11-11 15:19:27.000000000 -0500
4852 -+++ linux-3.1.3/arch/x86/kernel/smpboot.c 2011-11-16 18:39:07.000000000 -0500
4853 +diff -urNp linux-3.1.4/arch/x86/kernel/smpboot.c linux-3.1.4/arch/x86/kernel/smpboot.c
4854 +--- linux-3.1.4/arch/x86/kernel/smpboot.c 2011-11-11 15:19:27.000000000 -0500
4855 ++++ linux-3.1.4/arch/x86/kernel/smpboot.c 2011-11-16 18:39:07.000000000 -0500
4856 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
4857 set_idle_for_cpu(cpu, c_idle.idle);
4858 do_rest:
4859 @@ -15718,9 +16178,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/smpboot.c linux-3.1.3/arch/x86/kernel/smp
4860 err = do_boot_cpu(apicid, cpu);
4861 if (err) {
4862 pr_debug("do_boot_cpu failed %d\n", err);
4863 -diff -urNp linux-3.1.3/arch/x86/kernel/step.c linux-3.1.3/arch/x86/kernel/step.c
4864 ---- linux-3.1.3/arch/x86/kernel/step.c 2011-11-11 15:19:27.000000000 -0500
4865 -+++ linux-3.1.3/arch/x86/kernel/step.c 2011-11-16 18:39:07.000000000 -0500
4866 +diff -urNp linux-3.1.4/arch/x86/kernel/step.c linux-3.1.4/arch/x86/kernel/step.c
4867 +--- linux-3.1.4/arch/x86/kernel/step.c 2011-11-11 15:19:27.000000000 -0500
4868 ++++ linux-3.1.4/arch/x86/kernel/step.c 2011-11-16 18:39:07.000000000 -0500
4869 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
4870 struct desc_struct *desc;
4871 unsigned long base;
4872 @@ -15754,17 +16214,17 @@ diff -urNp linux-3.1.3/arch/x86/kernel/step.c linux-3.1.3/arch/x86/kernel/step.c
4873 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
4874 for (i = 0; i < copied; i++) {
4875 switch (opcode[i]) {
4876 -diff -urNp linux-3.1.3/arch/x86/kernel/syscall_table_32.S linux-3.1.3/arch/x86/kernel/syscall_table_32.S
4877 ---- linux-3.1.3/arch/x86/kernel/syscall_table_32.S 2011-11-11 15:19:27.000000000 -0500
4878 -+++ linux-3.1.3/arch/x86/kernel/syscall_table_32.S 2011-11-16 18:39:07.000000000 -0500
4879 +diff -urNp linux-3.1.4/arch/x86/kernel/syscall_table_32.S linux-3.1.4/arch/x86/kernel/syscall_table_32.S
4880 +--- linux-3.1.4/arch/x86/kernel/syscall_table_32.S 2011-11-11 15:19:27.000000000 -0500
4881 ++++ linux-3.1.4/arch/x86/kernel/syscall_table_32.S 2011-11-16 18:39:07.000000000 -0500
4882 @@ -1,3 +1,4 @@
4883 +.section .rodata,"a",@progbits
4884 ENTRY(sys_call_table)
4885 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
4886 .long sys_exit
4887 -diff -urNp linux-3.1.3/arch/x86/kernel/sys_i386_32.c linux-3.1.3/arch/x86/kernel/sys_i386_32.c
4888 ---- linux-3.1.3/arch/x86/kernel/sys_i386_32.c 2011-11-11 15:19:27.000000000 -0500
4889 -+++ linux-3.1.3/arch/x86/kernel/sys_i386_32.c 2011-11-16 18:39:07.000000000 -0500
4890 +diff -urNp linux-3.1.4/arch/x86/kernel/sys_i386_32.c linux-3.1.4/arch/x86/kernel/sys_i386_32.c
4891 +--- linux-3.1.4/arch/x86/kernel/sys_i386_32.c 2011-11-11 15:19:27.000000000 -0500
4892 ++++ linux-3.1.4/arch/x86/kernel/sys_i386_32.c 2011-11-16 18:39:07.000000000 -0500
4893 @@ -24,17 +24,224 @@
4894
4895 #include <asm/syscalls.h>
4896 @@ -16002,9 +16462,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/sys_i386_32.c linux-3.1.3/arch/x86/kernel
4897 +
4898 + return addr;
4899 }
4900 -diff -urNp linux-3.1.3/arch/x86/kernel/sys_x86_64.c linux-3.1.3/arch/x86/kernel/sys_x86_64.c
4901 ---- linux-3.1.3/arch/x86/kernel/sys_x86_64.c 2011-11-11 15:19:27.000000000 -0500
4902 -+++ linux-3.1.3/arch/x86/kernel/sys_x86_64.c 2011-11-16 18:39:07.000000000 -0500
4903 +diff -urNp linux-3.1.4/arch/x86/kernel/sys_x86_64.c linux-3.1.4/arch/x86/kernel/sys_x86_64.c
4904 +--- linux-3.1.4/arch/x86/kernel/sys_x86_64.c 2011-11-11 15:19:27.000000000 -0500
4905 ++++ linux-3.1.4/arch/x86/kernel/sys_x86_64.c 2011-11-16 18:39:07.000000000 -0500
4906 @@ -32,8 +32,8 @@ out:
4907 return error;
4908 }
4909 @@ -16142,9 +16602,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/sys_x86_64.c linux-3.1.3/arch/x86/kernel/
4910 mm->cached_hole_size = ~0UL;
4911
4912 return addr;
4913 -diff -urNp linux-3.1.3/arch/x86/kernel/tboot.c linux-3.1.3/arch/x86/kernel/tboot.c
4914 ---- linux-3.1.3/arch/x86/kernel/tboot.c 2011-11-11 15:19:27.000000000 -0500
4915 -+++ linux-3.1.3/arch/x86/kernel/tboot.c 2011-11-16 18:39:07.000000000 -0500
4916 +diff -urNp linux-3.1.4/arch/x86/kernel/tboot.c linux-3.1.4/arch/x86/kernel/tboot.c
4917 +--- linux-3.1.4/arch/x86/kernel/tboot.c 2011-11-11 15:19:27.000000000 -0500
4918 ++++ linux-3.1.4/arch/x86/kernel/tboot.c 2011-11-16 18:39:07.000000000 -0500
4919 @@ -218,7 +218,7 @@ static int tboot_setup_sleep(void)
4920
4921 void tboot_shutdown(u32 shutdown_type)
4922 @@ -16193,9 +16653,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/tboot.c linux-3.1.3/arch/x86/kernel/tboot
4923 register_hotcpu_notifier(&tboot_cpu_notifier);
4924 return 0;
4925 }
4926 -diff -urNp linux-3.1.3/arch/x86/kernel/time.c linux-3.1.3/arch/x86/kernel/time.c
4927 ---- linux-3.1.3/arch/x86/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
4928 -+++ linux-3.1.3/arch/x86/kernel/time.c 2011-11-16 18:39:07.000000000 -0500
4929 +diff -urNp linux-3.1.4/arch/x86/kernel/time.c linux-3.1.4/arch/x86/kernel/time.c
4930 +--- linux-3.1.4/arch/x86/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
4931 ++++ linux-3.1.4/arch/x86/kernel/time.c 2011-11-16 18:39:07.000000000 -0500
4932 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs
4933 {
4934 unsigned long pc = instruction_pointer(regs);
4935 @@ -16226,9 +16686,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/time.c linux-3.1.3/arch/x86/kernel/time.c
4936 }
4937 return pc;
4938 }
4939 -diff -urNp linux-3.1.3/arch/x86/kernel/tls.c linux-3.1.3/arch/x86/kernel/tls.c
4940 ---- linux-3.1.3/arch/x86/kernel/tls.c 2011-11-11 15:19:27.000000000 -0500
4941 -+++ linux-3.1.3/arch/x86/kernel/tls.c 2011-11-16 18:39:07.000000000 -0500
4942 +diff -urNp linux-3.1.4/arch/x86/kernel/tls.c linux-3.1.4/arch/x86/kernel/tls.c
4943 +--- linux-3.1.4/arch/x86/kernel/tls.c 2011-11-11 15:19:27.000000000 -0500
4944 ++++ linux-3.1.4/arch/x86/kernel/tls.c 2011-11-16 18:39:07.000000000 -0500
4945 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
4946 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
4947 return -EINVAL;
4948 @@ -16241,9 +16701,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/tls.c linux-3.1.3/arch/x86/kernel/tls.c
4949 set_tls_desc(p, idx, &info, 1);
4950
4951 return 0;
4952 -diff -urNp linux-3.1.3/arch/x86/kernel/trampoline_32.S linux-3.1.3/arch/x86/kernel/trampoline_32.S
4953 ---- linux-3.1.3/arch/x86/kernel/trampoline_32.S 2011-11-11 15:19:27.000000000 -0500
4954 -+++ linux-3.1.3/arch/x86/kernel/trampoline_32.S 2011-11-16 18:39:07.000000000 -0500
4955 +diff -urNp linux-3.1.4/arch/x86/kernel/trampoline_32.S linux-3.1.4/arch/x86/kernel/trampoline_32.S
4956 +--- linux-3.1.4/arch/x86/kernel/trampoline_32.S 2011-11-11 15:19:27.000000000 -0500
4957 ++++ linux-3.1.4/arch/x86/kernel/trampoline_32.S 2011-11-16 18:39:07.000000000 -0500
4958 @@ -32,6 +32,12 @@
4959 #include <asm/segment.h>
4960 #include <asm/page_types.h>
4961 @@ -16266,9 +16726,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/trampoline_32.S linux-3.1.3/arch/x86/kern
4962
4963 # These need to be in the same 64K segment as the above;
4964 # hence we don't use the boot_gdt_descr defined in head.S
4965 -diff -urNp linux-3.1.3/arch/x86/kernel/trampoline_64.S linux-3.1.3/arch/x86/kernel/trampoline_64.S
4966 ---- linux-3.1.3/arch/x86/kernel/trampoline_64.S 2011-11-11 15:19:27.000000000 -0500
4967 -+++ linux-3.1.3/arch/x86/kernel/trampoline_64.S 2011-11-16 18:39:07.000000000 -0500
4968 +diff -urNp linux-3.1.4/arch/x86/kernel/trampoline_64.S linux-3.1.4/arch/x86/kernel/trampoline_64.S
4969 +--- linux-3.1.4/arch/x86/kernel/trampoline_64.S 2011-11-11 15:19:27.000000000 -0500
4970 ++++ linux-3.1.4/arch/x86/kernel/trampoline_64.S 2011-11-16 18:39:07.000000000 -0500
4971 @@ -90,7 +90,7 @@ startup_32:
4972 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
4973 movl %eax, %ds
4974 @@ -16287,9 +16747,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/trampoline_64.S linux-3.1.3/arch/x86/kern
4975 .long tgdt - r_base
4976 .short 0
4977 .quad 0x00cf9b000000ffff # __KERNEL32_CS
4978 -diff -urNp linux-3.1.3/arch/x86/kernel/traps.c linux-3.1.3/arch/x86/kernel/traps.c
4979 ---- linux-3.1.3/arch/x86/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
4980 -+++ linux-3.1.3/arch/x86/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
4981 +diff -urNp linux-3.1.4/arch/x86/kernel/traps.c linux-3.1.4/arch/x86/kernel/traps.c
4982 +--- linux-3.1.4/arch/x86/kernel/traps.c 2011-11-11 15:19:27.000000000 -0500
4983 ++++ linux-3.1.4/arch/x86/kernel/traps.c 2011-11-16 18:39:07.000000000 -0500
4984 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
4985
4986 /* Do we ignore FPU interrupts ? */
4987 @@ -16469,9 +16929,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/traps.c linux-3.1.3/arch/x86/kernel/traps
4988
4989 if (!tsk_used_math(tsk)) {
4990 local_irq_enable();
4991 -diff -urNp linux-3.1.3/arch/x86/kernel/verify_cpu.S linux-3.1.3/arch/x86/kernel/verify_cpu.S
4992 ---- linux-3.1.3/arch/x86/kernel/verify_cpu.S 2011-11-11 15:19:27.000000000 -0500
4993 -+++ linux-3.1.3/arch/x86/kernel/verify_cpu.S 2011-11-16 18:40:08.000000000 -0500
4994 +diff -urNp linux-3.1.4/arch/x86/kernel/verify_cpu.S linux-3.1.4/arch/x86/kernel/verify_cpu.S
4995 +--- linux-3.1.4/arch/x86/kernel/verify_cpu.S 2011-11-11 15:19:27.000000000 -0500
4996 ++++ linux-3.1.4/arch/x86/kernel/verify_cpu.S 2011-11-16 18:40:08.000000000 -0500
4997 @@ -20,6 +20,7 @@
4998 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
4999 * arch/x86/kernel/trampoline_64.S: secondary processor verification
5000 @@ -16480,9 +16940,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/verify_cpu.S linux-3.1.3/arch/x86/kernel/
5001 *
5002 * verify_cpu, returns the status of longmode and SSE in register %eax.
5003 * 0: Success 1: Failure
5004 -diff -urNp linux-3.1.3/arch/x86/kernel/vm86_32.c linux-3.1.3/arch/x86/kernel/vm86_32.c
5005 ---- linux-3.1.3/arch/x86/kernel/vm86_32.c 2011-11-11 15:19:27.000000000 -0500
5006 -+++ linux-3.1.3/arch/x86/kernel/vm86_32.c 2011-11-16 18:40:08.000000000 -0500
5007 +diff -urNp linux-3.1.4/arch/x86/kernel/vm86_32.c linux-3.1.4/arch/x86/kernel/vm86_32.c
5008 +--- linux-3.1.4/arch/x86/kernel/vm86_32.c 2011-11-11 15:19:27.000000000 -0500
5009 ++++ linux-3.1.4/arch/x86/kernel/vm86_32.c 2011-11-16 18:40:08.000000000 -0500
5010 @@ -41,6 +41,7 @@
5011 #include <linux/ptrace.h>
5012 #include <linux/audit.h>
5013 @@ -16547,9 +17007,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/vm86_32.c linux-3.1.3/arch/x86/kernel/vm8
5014 if (get_user(segoffs, intr_ptr))
5015 goto cannot_handle;
5016 if ((segoffs >> 16) == BIOSSEG)
5017 -diff -urNp linux-3.1.3/arch/x86/kernel/vmlinux.lds.S linux-3.1.3/arch/x86/kernel/vmlinux.lds.S
5018 ---- linux-3.1.3/arch/x86/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
5019 -+++ linux-3.1.3/arch/x86/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
5020 +diff -urNp linux-3.1.4/arch/x86/kernel/vmlinux.lds.S linux-3.1.4/arch/x86/kernel/vmlinux.lds.S
5021 +--- linux-3.1.4/arch/x86/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
5022 ++++ linux-3.1.4/arch/x86/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
5023 @@ -26,6 +26,13 @@
5024 #include <asm/page_types.h>
5025 #include <asm/cache.h>
5026 @@ -16810,9 +17270,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/vmlinux.lds.S linux-3.1.3/arch/x86/kernel
5027 "kernel image bigger than KERNEL_IMAGE_SIZE");
5028
5029 #ifdef CONFIG_SMP
5030 -diff -urNp linux-3.1.3/arch/x86/kernel/vsyscall_64.c linux-3.1.3/arch/x86/kernel/vsyscall_64.c
5031 ---- linux-3.1.3/arch/x86/kernel/vsyscall_64.c 2011-11-11 15:19:27.000000000 -0500
5032 -+++ linux-3.1.3/arch/x86/kernel/vsyscall_64.c 2011-11-16 18:39:07.000000000 -0500
5033 +diff -urNp linux-3.1.4/arch/x86/kernel/vsyscall_64.c linux-3.1.4/arch/x86/kernel/vsyscall_64.c
5034 +--- linux-3.1.4/arch/x86/kernel/vsyscall_64.c 2011-11-11 15:19:27.000000000 -0500
5035 ++++ linux-3.1.4/arch/x86/kernel/vsyscall_64.c 2011-11-16 18:39:07.000000000 -0500
5036 @@ -56,15 +56,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, v
5037 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
5038 };
5039 @@ -16861,9 +17321,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/vsyscall_64.c linux-3.1.3/arch/x86/kernel
5040 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
5041 (unsigned long)VSYSCALL_START);
5042
5043 -diff -urNp linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c
5044 ---- linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c 2011-11-11 15:19:27.000000000 -0500
5045 -+++ linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c 2011-11-16 18:39:07.000000000 -0500
5046 +diff -urNp linux-3.1.4/arch/x86/kernel/x8664_ksyms_64.c linux-3.1.4/arch/x86/kernel/x8664_ksyms_64.c
5047 +--- linux-3.1.4/arch/x86/kernel/x8664_ksyms_64.c 2011-11-11 15:19:27.000000000 -0500
5048 ++++ linux-3.1.4/arch/x86/kernel/x8664_ksyms_64.c 2011-11-16 18:39:07.000000000 -0500
5049 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
5050 EXPORT_SYMBOL(copy_user_generic_string);
5051 EXPORT_SYMBOL(copy_user_generic_unrolled);
5052 @@ -16873,9 +17333,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.1.3/arch/x86/ker
5053
5054 EXPORT_SYMBOL(copy_page);
5055 EXPORT_SYMBOL(clear_page);
5056 -diff -urNp linux-3.1.3/arch/x86/kernel/xsave.c linux-3.1.3/arch/x86/kernel/xsave.c
5057 ---- linux-3.1.3/arch/x86/kernel/xsave.c 2011-11-11 15:19:27.000000000 -0500
5058 -+++ linux-3.1.3/arch/x86/kernel/xsave.c 2011-11-16 18:39:07.000000000 -0500
5059 +diff -urNp linux-3.1.4/arch/x86/kernel/xsave.c linux-3.1.4/arch/x86/kernel/xsave.c
5060 +--- linux-3.1.4/arch/x86/kernel/xsave.c 2011-11-11 15:19:27.000000000 -0500
5061 ++++ linux-3.1.4/arch/x86/kernel/xsave.c 2011-11-16 18:39:07.000000000 -0500
5062 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
5063 fx_sw_user->xstate_size > fx_sw_user->extended_size)
5064 return -EINVAL;
5065 @@ -16903,9 +17363,9 @@ diff -urNp linux-3.1.3/arch/x86/kernel/xsave.c linux-3.1.3/arch/x86/kernel/xsave
5066 buf);
5067 if (unlikely(err)) {
5068 /*
5069 -diff -urNp linux-3.1.3/arch/x86/kvm/emulate.c linux-3.1.3/arch/x86/kvm/emulate.c
5070 ---- linux-3.1.3/arch/x86/kvm/emulate.c 2011-11-11 15:19:27.000000000 -0500
5071 -+++ linux-3.1.3/arch/x86/kvm/emulate.c 2011-11-16 18:39:07.000000000 -0500
5072 +diff -urNp linux-3.1.4/arch/x86/kvm/emulate.c linux-3.1.4/arch/x86/kvm/emulate.c
5073 +--- linux-3.1.4/arch/x86/kvm/emulate.c 2011-11-11 15:19:27.000000000 -0500
5074 ++++ linux-3.1.4/arch/x86/kvm/emulate.c 2011-11-16 18:39:07.000000000 -0500
5075 @@ -96,7 +96,7 @@
5076 #define Src2ImmByte (2<<29)
5077 #define Src2One (3<<29)
5078 @@ -16940,9 +17400,9 @@ diff -urNp linux-3.1.3/arch/x86/kvm/emulate.c linux-3.1.3/arch/x86/kvm/emulate.c
5079 switch ((_dst).bytes) { \
5080 case 1: \
5081 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
5082 -diff -urNp linux-3.1.3/arch/x86/kvm/lapic.c linux-3.1.3/arch/x86/kvm/lapic.c
5083 ---- linux-3.1.3/arch/x86/kvm/lapic.c 2011-11-11 15:19:27.000000000 -0500
5084 -+++ linux-3.1.3/arch/x86/kvm/lapic.c 2011-11-16 18:39:07.000000000 -0500
5085 +diff -urNp linux-3.1.4/arch/x86/kvm/lapic.c linux-3.1.4/arch/x86/kvm/lapic.c
5086 +--- linux-3.1.4/arch/x86/kvm/lapic.c 2011-11-11 15:19:27.000000000 -0500
5087 ++++ linux-3.1.4/arch/x86/kvm/lapic.c 2011-11-16 18:39:07.000000000 -0500
5088 @@ -53,7 +53,7 @@
5089 #define APIC_BUS_CYCLE_NS 1
5090
5091 @@ -16952,9 +17412,9 @@ diff -urNp linux-3.1.3/arch/x86/kvm/lapic.c linux-3.1.3/arch/x86/kvm/lapic.c
5092
5093 #define APIC_LVT_NUM 6
5094 /* 14 is the version for Xeon and Pentium 8.4.8*/
5095 -diff -urNp linux-3.1.3/arch/x86/kvm/mmu.c linux-3.1.3/arch/x86/kvm/mmu.c
5096 ---- linux-3.1.3/arch/x86/kvm/mmu.c 2011-11-11 15:19:27.000000000 -0500
5097 -+++ linux-3.1.3/arch/x86/kvm/mmu.c 2011-11-16 18:39:07.000000000 -0500
5098 +diff -urNp linux-3.1.4/arch/x86/kvm/mmu.c linux-3.1.4/arch/x86/kvm/mmu.c
5099 +--- linux-3.1.4/arch/x86/kvm/mmu.c 2011-11-11 15:19:27.000000000 -0500
5100 ++++ linux-3.1.4/arch/x86/kvm/mmu.c 2011-11-16 18:39:07.000000000 -0500
5101 @@ -3552,7 +3552,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
5102
5103 pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
5104 @@ -16973,9 +17433,9 @@ diff -urNp linux-3.1.3/arch/x86/kvm/mmu.c linux-3.1.3/arch/x86/kvm/mmu.c
5105 gentry = 0;
5106 kvm_mmu_free_some_pages(vcpu);
5107 ++vcpu->kvm->stat.mmu_pte_write;
5108 -diff -urNp linux-3.1.3/arch/x86/kvm/paging_tmpl.h linux-3.1.3/arch/x86/kvm/paging_tmpl.h
5109 ---- linux-3.1.3/arch/x86/kvm/paging_tmpl.h 2011-11-11 15:19:27.000000000 -0500
5110 -+++ linux-3.1.3/arch/x86/kvm/paging_tmpl.h 2011-11-16 19:40:44.000000000 -0500
5111 +diff -urNp linux-3.1.4/arch/x86/kvm/paging_tmpl.h linux-3.1.4/arch/x86/kvm/paging_tmpl.h
5112 +--- linux-3.1.4/arch/x86/kvm/paging_tmpl.h 2011-11-11 15:19:27.000000000 -0500
5113 ++++ linux-3.1.4/arch/x86/kvm/paging_tmpl.h 2011-11-16 19:40:44.000000000 -0500
5114 @@ -197,7 +197,7 @@ retry_walk:
5115 if (unlikely(kvm_is_error_hva(host_addr)))
5116 goto error;
5117 @@ -17003,9 +17463,9 @@ diff -urNp linux-3.1.3/arch/x86/kvm/paging_tmpl.h linux-3.1.3/arch/x86/kvm/pagin
5118
5119 spin_unlock(&vcpu->kvm->mmu_lock);
5120
5121 -diff -urNp linux-3.1.3/arch/x86/kvm/svm.c linux-3.1.3/arch/x86/kvm/svm.c
5122 ---- linux-3.1.3/arch/x86/kvm/svm.c 2011-11-11 15:19:27.000000000 -0500
5123 -+++ linux-3.1.3/arch/x86/kvm/svm.c 2011-11-16 18:39:07.000000000 -0500
5124 +diff -urNp linux-3.1.4/arch/x86/kvm/svm.c linux-3.1.4/arch/x86/kvm/svm.c
5125 +--- linux-3.1.4/arch/x86/kvm/svm.c 2011-11-11 15:19:27.000000000 -0500
5126 ++++ linux-3.1.4/arch/x86/kvm/svm.c 2011-11-16 18:39:07.000000000 -0500
5127 @@ -3381,7 +3381,11 @@ static void reload_tss(struct kvm_vcpu *
5128 int cpu = raw_smp_processor_id();
5129
5130 @@ -17029,9 +17489,9 @@ diff -urNp linux-3.1.3/arch/x86/kvm/svm.c linux-3.1.3/arch/x86/kvm/svm.c
5131 reload_tss(vcpu);
5132
5133 local_irq_disable();
5134 -diff -urNp linux-3.1.3/arch/x86/kvm/vmx.c linux-3.1.3/arch/x86/kvm/vmx.c
5135 ---- linux-3.1.3/arch/x86/kvm/vmx.c 2011-11-11 15:19:27.000000000 -0500
5136 -+++ linux-3.1.3/arch/x86/kvm/vmx.c 2011-11-16 18:39:07.000000000 -0500
5137 +diff -urNp linux-3.1.4/arch/x86/kvm/vmx.c linux-3.1.4/arch/x86/kvm/vmx.c
5138 +--- linux-3.1.4/arch/x86/kvm/vmx.c 2011-11-11 15:19:27.000000000 -0500
5139 ++++ linux-3.1.4/arch/x86/kvm/vmx.c 2011-11-16 18:39:07.000000000 -0500
5140 @@ -1251,7 +1251,11 @@ static void reload_tss(void)
5141 struct desc_struct *descs;
5142
5143 @@ -17110,9 +17570,9 @@ diff -urNp linux-3.1.3/arch/x86/kvm/vmx.c linux-3.1.3/arch/x86/kvm/vmx.c
5144 vmx->loaded_vmcs->launched = 1;
5145
5146 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
5147 -diff -urNp linux-3.1.3/arch/x86/kvm/x86.c linux-3.1.3/arch/x86/kvm/x86.c
5148 ---- linux-3.1.3/arch/x86/kvm/x86.c 2011-11-11 15:19:27.000000000 -0500
5149 -+++ linux-3.1.3/arch/x86/kvm/x86.c 2011-11-16 18:39:07.000000000 -0500
5150 +diff -urNp linux-3.1.4/arch/x86/kvm/x86.c linux-3.1.4/arch/x86/kvm/x86.c
5151 +--- linux-3.1.4/arch/x86/kvm/x86.c 2011-11-11 15:19:27.000000000 -0500
5152 ++++ linux-3.1.4/arch/x86/kvm/x86.c 2011-11-16 18:39:07.000000000 -0500
5153 @@ -1334,8 +1334,8 @@ static int xen_hvm_config(struct kvm_vcp
5154 {
5155 struct kvm *kvm = vcpu->kvm;
5156 @@ -17198,9 +17658,9 @@ diff -urNp linux-3.1.3/arch/x86/kvm/x86.c linux-3.1.3/arch/x86/kvm/x86.c
5157 {
5158 int r;
5159 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
5160 -diff -urNp linux-3.1.3/arch/x86/lguest/boot.c linux-3.1.3/arch/x86/lguest/boot.c
5161 ---- linux-3.1.3/arch/x86/lguest/boot.c 2011-11-11 15:19:27.000000000 -0500
5162 -+++ linux-3.1.3/arch/x86/lguest/boot.c 2011-11-16 18:39:07.000000000 -0500
5163 +diff -urNp linux-3.1.4/arch/x86/lguest/boot.c linux-3.1.4/arch/x86/lguest/boot.c
5164 +--- linux-3.1.4/arch/x86/lguest/boot.c 2011-11-11 15:19:27.000000000 -0500
5165 ++++ linux-3.1.4/arch/x86/lguest/boot.c 2011-11-16 18:39:07.000000000 -0500
5166 @@ -1184,9 +1184,10 @@ static __init int early_put_chars(u32 vt
5167 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
5168 * Launcher to reboot us.
5169 @@ -17213,9 +17673,9 @@ diff -urNp linux-3.1.3/arch/x86/lguest/boot.c linux-3.1.3/arch/x86/lguest/boot.c
5170 }
5171
5172 /*G:050
5173 -diff -urNp linux-3.1.3/arch/x86/lib/atomic64_32.c linux-3.1.3/arch/x86/lib/atomic64_32.c
5174 ---- linux-3.1.3/arch/x86/lib/atomic64_32.c 2011-11-11 15:19:27.000000000 -0500
5175 -+++ linux-3.1.3/arch/x86/lib/atomic64_32.c 2011-11-16 18:39:07.000000000 -0500
5176 +diff -urNp linux-3.1.4/arch/x86/lib/atomic64_32.c linux-3.1.4/arch/x86/lib/atomic64_32.c
5177 +--- linux-3.1.4/arch/x86/lib/atomic64_32.c 2011-11-11 15:19:27.000000000 -0500
5178 ++++ linux-3.1.4/arch/x86/lib/atomic64_32.c 2011-11-16 18:39:07.000000000 -0500
5179 @@ -8,18 +8,30 @@
5180
5181 long long atomic64_read_cx8(long long, const atomic64_t *v);
5182 @@ -17294,9 +17754,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/atomic64_32.c linux-3.1.3/arch/x86/lib/atomi
5183 long long atomic64_dec_if_positive_386(atomic64_t *v);
5184 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
5185 int atomic64_inc_not_zero_386(atomic64_t *v);
5186 -diff -urNp linux-3.1.3/arch/x86/lib/atomic64_386_32.S linux-3.1.3/arch/x86/lib/atomic64_386_32.S
5187 ---- linux-3.1.3/arch/x86/lib/atomic64_386_32.S 2011-11-11 15:19:27.000000000 -0500
5188 -+++ linux-3.1.3/arch/x86/lib/atomic64_386_32.S 2011-11-16 18:39:07.000000000 -0500
5189 +diff -urNp linux-3.1.4/arch/x86/lib/atomic64_386_32.S linux-3.1.4/arch/x86/lib/atomic64_386_32.S
5190 +--- linux-3.1.4/arch/x86/lib/atomic64_386_32.S 2011-11-11 15:19:27.000000000 -0500
5191 ++++ linux-3.1.4/arch/x86/lib/atomic64_386_32.S 2011-11-16 18:39:07.000000000 -0500
5192 @@ -48,6 +48,10 @@ BEGIN(read)
5193 movl (v), %eax
5194 movl 4(v), %edx
5195 @@ -17552,9 +18012,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/atomic64_386_32.S linux-3.1.3/arch/x86/lib/a
5196 js 1f
5197 movl %eax, (v)
5198 movl %edx, 4(v)
5199 -diff -urNp linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S
5200 ---- linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S 2011-11-11 15:19:27.000000000 -0500
5201 -+++ linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S 2011-11-16 18:39:07.000000000 -0500
5202 +diff -urNp linux-3.1.4/arch/x86/lib/atomic64_cx8_32.S linux-3.1.4/arch/x86/lib/atomic64_cx8_32.S
5203 +--- linux-3.1.4/arch/x86/lib/atomic64_cx8_32.S 2011-11-11 15:19:27.000000000 -0500
5204 ++++ linux-3.1.4/arch/x86/lib/atomic64_cx8_32.S 2011-11-16 18:39:07.000000000 -0500
5205 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
5206 CFI_STARTPROC
5207
5208 @@ -17776,9 +18236,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/atomic64_cx8_32.S linux-3.1.3/arch/x86/lib/a
5209 ret
5210 4:
5211 testl %edx, %edx
5212 -diff -urNp linux-3.1.3/arch/x86/lib/checksum_32.S linux-3.1.3/arch/x86/lib/checksum_32.S
5213 ---- linux-3.1.3/arch/x86/lib/checksum_32.S 2011-11-11 15:19:27.000000000 -0500
5214 -+++ linux-3.1.3/arch/x86/lib/checksum_32.S 2011-11-16 18:39:07.000000000 -0500
5215 +diff -urNp linux-3.1.4/arch/x86/lib/checksum_32.S linux-3.1.4/arch/x86/lib/checksum_32.S
5216 +--- linux-3.1.4/arch/x86/lib/checksum_32.S 2011-11-11 15:19:27.000000000 -0500
5217 ++++ linux-3.1.4/arch/x86/lib/checksum_32.S 2011-11-16 18:39:07.000000000 -0500
5218 @@ -28,7 +28,8 @@
5219 #include <linux/linkage.h>
5220 #include <asm/dwarf2.h>
5221 @@ -18023,9 +18483,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/checksum_32.S linux-3.1.3/arch/x86/lib/check
5222
5223 #undef ROUND
5224 #undef ROUND1
5225 -diff -urNp linux-3.1.3/arch/x86/lib/clear_page_64.S linux-3.1.3/arch/x86/lib/clear_page_64.S
5226 ---- linux-3.1.3/arch/x86/lib/clear_page_64.S 2011-11-11 15:19:27.000000000 -0500
5227 -+++ linux-3.1.3/arch/x86/lib/clear_page_64.S 2011-11-16 18:39:07.000000000 -0500
5228 +diff -urNp linux-3.1.4/arch/x86/lib/clear_page_64.S linux-3.1.4/arch/x86/lib/clear_page_64.S
5229 +--- linux-3.1.4/arch/x86/lib/clear_page_64.S 2011-11-11 15:19:27.000000000 -0500
5230 ++++ linux-3.1.4/arch/x86/lib/clear_page_64.S 2011-11-16 18:39:07.000000000 -0500
5231 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
5232 movl $4096/8,%ecx
5233 xorl %eax,%eax
5234 @@ -18059,9 +18519,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/clear_page_64.S linux-3.1.3/arch/x86/lib/cle
5235 1: .byte 0xeb /* jmp <disp8> */
5236 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
5237 2: .byte 0xeb /* jmp <disp8> */
5238 -diff -urNp linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S
5239 ---- linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S 2011-11-11 15:19:27.000000000 -0500
5240 -+++ linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S 2011-11-16 18:39:07.000000000 -0500
5241 +diff -urNp linux-3.1.4/arch/x86/lib/cmpxchg16b_emu.S linux-3.1.4/arch/x86/lib/cmpxchg16b_emu.S
5242 +--- linux-3.1.4/arch/x86/lib/cmpxchg16b_emu.S 2011-11-11 15:19:27.000000000 -0500
5243 ++++ linux-3.1.4/arch/x86/lib/cmpxchg16b_emu.S 2011-11-16 18:39:07.000000000 -0500
5244 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
5245
5246 popf
5247 @@ -18076,9 +18536,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/cmpxchg16b_emu.S linux-3.1.3/arch/x86/lib/cm
5248 ret
5249
5250 CFI_ENDPROC
5251 -diff -urNp linux-3.1.3/arch/x86/lib/copy_page_64.S linux-3.1.3/arch/x86/lib/copy_page_64.S
5252 ---- linux-3.1.3/arch/x86/lib/copy_page_64.S 2011-11-11 15:19:27.000000000 -0500
5253 -+++ linux-3.1.3/arch/x86/lib/copy_page_64.S 2011-11-16 18:39:07.000000000 -0500
5254 +diff -urNp linux-3.1.4/arch/x86/lib/copy_page_64.S linux-3.1.4/arch/x86/lib/copy_page_64.S
5255 +--- linux-3.1.4/arch/x86/lib/copy_page_64.S 2011-11-11 15:19:27.000000000 -0500
5256 ++++ linux-3.1.4/arch/x86/lib/copy_page_64.S 2011-12-02 17:38:47.000000000 -0500
5257 @@ -9,6 +9,7 @@ copy_page_c:
5258 CFI_STARTPROC
5259 movl $4096/8,%ecx
5260 @@ -18087,6 +18547,42 @@ diff -urNp linux-3.1.3/arch/x86/lib/copy_page_64.S linux-3.1.3/arch/x86/lib/copy
5261 ret
5262 CFI_ENDPROC
5263 ENDPROC(copy_page_c)
5264 +@@ -39,7 +40,7 @@ ENTRY(copy_page)
5265 + movq 16 (%rsi), %rdx
5266 + movq 24 (%rsi), %r8
5267 + movq 32 (%rsi), %r9
5268 +- movq 40 (%rsi), %r10
5269 ++ movq 40 (%rsi), %r13
5270 + movq 48 (%rsi), %r11
5271 + movq 56 (%rsi), %r12
5272 +
5273 +@@ -50,7 +51,7 @@ ENTRY(copy_page)
5274 + movq %rdx, 16 (%rdi)
5275 + movq %r8, 24 (%rdi)
5276 + movq %r9, 32 (%rdi)
5277 +- movq %r10, 40 (%rdi)
5278 ++ movq %r13, 40 (%rdi)
5279 + movq %r11, 48 (%rdi)
5280 + movq %r12, 56 (%rdi)
5281 +
5282 +@@ -69,7 +70,7 @@ ENTRY(copy_page)
5283 + movq 16 (%rsi), %rdx
5284 + movq 24 (%rsi), %r8
5285 + movq 32 (%rsi), %r9
5286 +- movq 40 (%rsi), %r10
5287 ++ movq 40 (%rsi), %r13
5288 + movq 48 (%rsi), %r11
5289 + movq 56 (%rsi), %r12
5290 +
5291 +@@ -78,7 +79,7 @@ ENTRY(copy_page)
5292 + movq %rdx, 16 (%rdi)
5293 + movq %r8, 24 (%rdi)
5294 + movq %r9, 32 (%rdi)
5295 +- movq %r10, 40 (%rdi)
5296 ++ movq %r13, 40 (%rdi)
5297 + movq %r11, 48 (%rdi)
5298 + movq %r12, 56 (%rdi)
5299 +
5300 @@ -95,6 +96,7 @@ ENTRY(copy_page)
5301 CFI_RESTORE r13
5302 addq $3*8,%rsp
5303 @@ -18104,9 +18600,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/copy_page_64.S linux-3.1.3/arch/x86/lib/copy
5304 1: .byte 0xeb /* jmp <disp8> */
5305 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
5306 2:
5307 -diff -urNp linux-3.1.3/arch/x86/lib/copy_user_64.S linux-3.1.3/arch/x86/lib/copy_user_64.S
5308 ---- linux-3.1.3/arch/x86/lib/copy_user_64.S 2011-11-11 15:19:27.000000000 -0500
5309 -+++ linux-3.1.3/arch/x86/lib/copy_user_64.S 2011-11-16 18:39:07.000000000 -0500
5310 +diff -urNp linux-3.1.4/arch/x86/lib/copy_user_64.S linux-3.1.4/arch/x86/lib/copy_user_64.S
5311 +--- linux-3.1.4/arch/x86/lib/copy_user_64.S 2011-11-11 15:19:27.000000000 -0500
5312 ++++ linux-3.1.4/arch/x86/lib/copy_user_64.S 2011-12-02 17:38:47.000000000 -0500
5313 @@ -16,6 +16,7 @@
5314 #include <asm/thread_info.h>
5315 #include <asm/cpufeature.h>
5316 @@ -18175,6 +18671,30 @@ diff -urNp linux-3.1.3/arch/x86/lib/copy_user_64.S linux-3.1.3/arch/x86/lib/copy
5317 ret
5318 CFI_ENDPROC
5319 ENDPROC(bad_from_user)
5320 +@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
5321 + jz 17f
5322 + 1: movq (%rsi),%r8
5323 + 2: movq 1*8(%rsi),%r9
5324 +-3: movq 2*8(%rsi),%r10
5325 ++3: movq 2*8(%rsi),%rax
5326 + 4: movq 3*8(%rsi),%r11
5327 + 5: movq %r8,(%rdi)
5328 + 6: movq %r9,1*8(%rdi)
5329 +-7: movq %r10,2*8(%rdi)
5330 ++7: movq %rax,2*8(%rdi)
5331 + 8: movq %r11,3*8(%rdi)
5332 + 9: movq 4*8(%rsi),%r8
5333 + 10: movq 5*8(%rsi),%r9
5334 +-11: movq 6*8(%rsi),%r10
5335 ++11: movq 6*8(%rsi),%rax
5336 + 12: movq 7*8(%rsi),%r11
5337 + 13: movq %r8,4*8(%rdi)
5338 + 14: movq %r9,5*8(%rdi)
5339 +-15: movq %r10,6*8(%rdi)
5340 ++15: movq %rax,6*8(%rdi)
5341 + 16: movq %r11,7*8(%rdi)
5342 + leaq 64(%rsi),%rsi
5343 + leaq 64(%rdi),%rdi
5344 @@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
5345 decl %ecx
5346 jnz 21b
5347 @@ -18199,9 +18719,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/copy_user_64.S linux-3.1.3/arch/x86/lib/copy
5348 ret
5349
5350 .section .fixup,"ax"
5351 -diff -urNp linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S
5352 ---- linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S 2011-11-11 15:19:27.000000000 -0500
5353 -+++ linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S 2011-11-16 18:39:07.000000000 -0500
5354 +diff -urNp linux-3.1.4/arch/x86/lib/copy_user_nocache_64.S linux-3.1.4/arch/x86/lib/copy_user_nocache_64.S
5355 +--- linux-3.1.4/arch/x86/lib/copy_user_nocache_64.S 2011-11-11 15:19:27.000000000 -0500
5356 ++++ linux-3.1.4/arch/x86/lib/copy_user_nocache_64.S 2011-12-02 17:38:47.000000000 -0500
5357 @@ -8,12 +8,14 @@
5358
5359 #include <linux/linkage.h>
5360 @@ -18233,6 +18753,30 @@ diff -urNp linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S linux-3.1.3/arch/x86/
5361 cmpl $8,%edx
5362 jb 20f /* less then 8 bytes, go to byte copy loop */
5363 ALIGN_DESTINATION
5364 +@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
5365 + jz 17f
5366 + 1: movq (%rsi),%r8
5367 + 2: movq 1*8(%rsi),%r9
5368 +-3: movq 2*8(%rsi),%r10
5369 ++3: movq 2*8(%rsi),%rax
5370 + 4: movq 3*8(%rsi),%r11
5371 + 5: movnti %r8,(%rdi)
5372 + 6: movnti %r9,1*8(%rdi)
5373 +-7: movnti %r10,2*8(%rdi)
5374 ++7: movnti %rax,2*8(%rdi)
5375 + 8: movnti %r11,3*8(%rdi)
5376 + 9: movq 4*8(%rsi),%r8
5377 + 10: movq 5*8(%rsi),%r9
5378 +-11: movq 6*8(%rsi),%r10
5379 ++11: movq 6*8(%rsi),%rax
5380 + 12: movq 7*8(%rsi),%r11
5381 + 13: movnti %r8,4*8(%rdi)
5382 + 14: movnti %r9,5*8(%rdi)
5383 +-15: movnti %r10,6*8(%rdi)
5384 ++15: movnti %rax,6*8(%rdi)
5385 + 16: movnti %r11,7*8(%rdi)
5386 + leaq 64(%rsi),%rsi
5387 + leaq 64(%rdi),%rdi
5388 @@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
5389 jnz 21b
5390 23: xorl %eax,%eax
5391 @@ -18241,9 +18785,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/copy_user_nocache_64.S linux-3.1.3/arch/x86/
5392 ret
5393
5394 .section .fixup,"ax"
5395 -diff -urNp linux-3.1.3/arch/x86/lib/csum-copy_64.S linux-3.1.3/arch/x86/lib/csum-copy_64.S
5396 ---- linux-3.1.3/arch/x86/lib/csum-copy_64.S 2011-11-11 15:19:27.000000000 -0500
5397 -+++ linux-3.1.3/arch/x86/lib/csum-copy_64.S 2011-11-16 18:39:07.000000000 -0500
5398 +diff -urNp linux-3.1.4/arch/x86/lib/csum-copy_64.S linux-3.1.4/arch/x86/lib/csum-copy_64.S
5399 +--- linux-3.1.4/arch/x86/lib/csum-copy_64.S 2011-11-11 15:19:27.000000000 -0500
5400 ++++ linux-3.1.4/arch/x86/lib/csum-copy_64.S 2011-12-02 17:38:47.000000000 -0500
5401 @@ -8,6 +8,7 @@
5402 #include <linux/linkage.h>
5403 #include <asm/dwarf2.h>
5404 @@ -18256,13 +18800,13 @@ diff -urNp linux-3.1.3/arch/x86/lib/csum-copy_64.S linux-3.1.3/arch/x86/lib/csum
5405 CFI_RESTORE rbp
5406 addq $7*8, %rsp
5407 CFI_ADJUST_CFA_OFFSET -7*8
5408 -+ pax_force_retaddr
5409 ++ pax_force_retaddr 0, 1
5410 ret
5411 CFI_RESTORE_STATE
5412
5413 -diff -urNp linux-3.1.3/arch/x86/lib/csum-wrappers_64.c linux-3.1.3/arch/x86/lib/csum-wrappers_64.c
5414 ---- linux-3.1.3/arch/x86/lib/csum-wrappers_64.c 2011-11-11 15:19:27.000000000 -0500
5415 -+++ linux-3.1.3/arch/x86/lib/csum-wrappers_64.c 2011-11-16 18:39:07.000000000 -0500
5416 +diff -urNp linux-3.1.4/arch/x86/lib/csum-wrappers_64.c linux-3.1.4/arch/x86/lib/csum-wrappers_64.c
5417 +--- linux-3.1.4/arch/x86/lib/csum-wrappers_64.c 2011-11-11 15:19:27.000000000 -0500
5418 ++++ linux-3.1.4/arch/x86/lib/csum-wrappers_64.c 2011-11-16 18:39:07.000000000 -0500
5419 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
5420 len -= 2;
5421 }
5422 @@ -18293,9 +18837,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/csum-wrappers_64.c linux-3.1.3/arch/x86/lib/
5423 len, isum, NULL, errp);
5424 }
5425 EXPORT_SYMBOL(csum_partial_copy_to_user);
5426 -diff -urNp linux-3.1.3/arch/x86/lib/getuser.S linux-3.1.3/arch/x86/lib/getuser.S
5427 ---- linux-3.1.3/arch/x86/lib/getuser.S 2011-11-11 15:19:27.000000000 -0500
5428 -+++ linux-3.1.3/arch/x86/lib/getuser.S 2011-11-16 18:39:07.000000000 -0500
5429 +diff -urNp linux-3.1.4/arch/x86/lib/getuser.S linux-3.1.4/arch/x86/lib/getuser.S
5430 +--- linux-3.1.4/arch/x86/lib/getuser.S 2011-11-11 15:19:27.000000000 -0500
5431 ++++ linux-3.1.4/arch/x86/lib/getuser.S 2011-11-16 18:39:07.000000000 -0500
5432 @@ -33,15 +33,38 @@
5433 #include <asm/asm-offsets.h>
5434 #include <asm/thread_info.h>
5435 @@ -18419,9 +18963,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/getuser.S linux-3.1.3/arch/x86/lib/getuser.S
5436 ret
5437 CFI_ENDPROC
5438 END(bad_get_user)
5439 -diff -urNp linux-3.1.3/arch/x86/lib/insn.c linux-3.1.3/arch/x86/lib/insn.c
5440 ---- linux-3.1.3/arch/x86/lib/insn.c 2011-11-11 15:19:27.000000000 -0500
5441 -+++ linux-3.1.3/arch/x86/lib/insn.c 2011-11-16 18:39:07.000000000 -0500
5442 +diff -urNp linux-3.1.4/arch/x86/lib/insn.c linux-3.1.4/arch/x86/lib/insn.c
5443 +--- linux-3.1.4/arch/x86/lib/insn.c 2011-11-11 15:19:27.000000000 -0500
5444 ++++ linux-3.1.4/arch/x86/lib/insn.c 2011-11-16 18:39:07.000000000 -0500
5445 @@ -21,6 +21,11 @@
5446 #include <linux/string.h>
5447 #include <asm/inat.h>
5448 @@ -18445,9 +18989,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/insn.c linux-3.1.3/arch/x86/lib/insn.c
5449 insn->x86_64 = x86_64 ? 1 : 0;
5450 insn->opnd_bytes = 4;
5451 if (x86_64)
5452 -diff -urNp linux-3.1.3/arch/x86/lib/iomap_copy_64.S linux-3.1.3/arch/x86/lib/iomap_copy_64.S
5453 ---- linux-3.1.3/arch/x86/lib/iomap_copy_64.S 2011-11-11 15:19:27.000000000 -0500
5454 -+++ linux-3.1.3/arch/x86/lib/iomap_copy_64.S 2011-11-16 18:39:07.000000000 -0500
5455 +diff -urNp linux-3.1.4/arch/x86/lib/iomap_copy_64.S linux-3.1.4/arch/x86/lib/iomap_copy_64.S
5456 +--- linux-3.1.4/arch/x86/lib/iomap_copy_64.S 2011-11-11 15:19:27.000000000 -0500
5457 ++++ linux-3.1.4/arch/x86/lib/iomap_copy_64.S 2011-11-16 18:39:07.000000000 -0500
5458 @@ -17,6 +17,7 @@
5459
5460 #include <linux/linkage.h>
5461 @@ -18464,9 +19008,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/iomap_copy_64.S linux-3.1.3/arch/x86/lib/iom
5462 ret
5463 CFI_ENDPROC
5464 ENDPROC(__iowrite32_copy)
5465 -diff -urNp linux-3.1.3/arch/x86/lib/memcpy_64.S linux-3.1.3/arch/x86/lib/memcpy_64.S
5466 ---- linux-3.1.3/arch/x86/lib/memcpy_64.S 2011-11-11 15:19:27.000000000 -0500
5467 -+++ linux-3.1.3/arch/x86/lib/memcpy_64.S 2011-11-16 18:39:07.000000000 -0500
5468 +diff -urNp linux-3.1.4/arch/x86/lib/memcpy_64.S linux-3.1.4/arch/x86/lib/memcpy_64.S
5469 +--- linux-3.1.4/arch/x86/lib/memcpy_64.S 2011-11-11 15:19:27.000000000 -0500
5470 ++++ linux-3.1.4/arch/x86/lib/memcpy_64.S 2011-12-02 17:38:47.000000000 -0500
5471 @@ -34,6 +34,7 @@
5472 rep movsq
5473 movl %edx, %ecx
5474 @@ -18483,9 +19027,48 @@ diff -urNp linux-3.1.3/arch/x86/lib/memcpy_64.S linux-3.1.3/arch/x86/lib/memcpy_
5475 ret
5476 .Lmemcpy_e_e:
5477 .previous
5478 -@@ -141,6 +143,7 @@ ENTRY(memcpy)
5479 +@@ -81,13 +83,13 @@ ENTRY(memcpy)
5480 + */
5481 + movq 0*8(%rsi), %r8
5482 + movq 1*8(%rsi), %r9
5483 +- movq 2*8(%rsi), %r10
5484 ++ movq 2*8(%rsi), %rcx
5485 + movq 3*8(%rsi), %r11
5486 + leaq 4*8(%rsi), %rsi
5487 +
5488 + movq %r8, 0*8(%rdi)
5489 + movq %r9, 1*8(%rdi)
5490 +- movq %r10, 2*8(%rdi)
5491 ++ movq %rcx, 2*8(%rdi)
5492 + movq %r11, 3*8(%rdi)
5493 + leaq 4*8(%rdi), %rdi
5494 + jae .Lcopy_forward_loop
5495 +@@ -110,12 +112,12 @@ ENTRY(memcpy)
5496 + subq $0x20, %rdx
5497 + movq -1*8(%rsi), %r8
5498 + movq -2*8(%rsi), %r9
5499 +- movq -3*8(%rsi), %r10
5500 ++ movq -3*8(%rsi), %rcx
5501 + movq -4*8(%rsi), %r11
5502 + leaq -4*8(%rsi), %rsi
5503 + movq %r8, -1*8(%rdi)
5504 + movq %r9, -2*8(%rdi)
5505 +- movq %r10, -3*8(%rdi)
5506 ++ movq %rcx, -3*8(%rdi)
5507 + movq %r11, -4*8(%rdi)
5508 + leaq -4*8(%rdi), %rdi
5509 + jae .Lcopy_backward_loop
5510 +@@ -135,12 +137,13 @@ ENTRY(memcpy)
5511 + */
5512 + movq 0*8(%rsi), %r8
5513 + movq 1*8(%rsi), %r9
5514 +- movq -2*8(%rsi, %rdx), %r10
5515 ++ movq -2*8(%rsi, %rdx), %rcx
5516 + movq -1*8(%rsi, %rdx), %r11
5517 + movq %r8, 0*8(%rdi)
5518 movq %r9, 1*8(%rdi)
5519 - movq %r10, -2*8(%rdi, %rdx)
5520 +- movq %r10, -2*8(%rdi, %rdx)
5521 ++ movq %rcx, -2*8(%rdi, %rdx)
5522 movq %r11, -1*8(%rdi, %rdx)
5523 + pax_force_retaddr
5524 retq
5525 @@ -18515,9 +19098,121 @@ diff -urNp linux-3.1.3/arch/x86/lib/memcpy_64.S linux-3.1.3/arch/x86/lib/memcpy_
5526 retq
5527 CFI_ENDPROC
5528 ENDPROC(memcpy)
5529 -diff -urNp linux-3.1.3/arch/x86/lib/memmove_64.S linux-3.1.3/arch/x86/lib/memmove_64.S
5530 ---- linux-3.1.3/arch/x86/lib/memmove_64.S 2011-11-11 15:19:27.000000000 -0500
5531 -+++ linux-3.1.3/arch/x86/lib/memmove_64.S 2011-11-16 18:39:07.000000000 -0500
5532 +diff -urNp linux-3.1.4/arch/x86/lib/memmove_64.S linux-3.1.4/arch/x86/lib/memmove_64.S
5533 +--- linux-3.1.4/arch/x86/lib/memmove_64.S 2011-11-11 15:19:27.000000000 -0500
5534 ++++ linux-3.1.4/arch/x86/lib/memmove_64.S 2011-12-02 17:38:47.000000000 -0500
5535 +@@ -61,13 +61,13 @@ ENTRY(memmove)
5536 + 5:
5537 + sub $0x20, %rdx
5538 + movq 0*8(%rsi), %r11
5539 +- movq 1*8(%rsi), %r10
5540 ++ movq 1*8(%rsi), %rcx
5541 + movq 2*8(%rsi), %r9
5542 + movq 3*8(%rsi), %r8
5543 + leaq 4*8(%rsi), %rsi
5544 +
5545 + movq %r11, 0*8(%rdi)
5546 +- movq %r10, 1*8(%rdi)
5547 ++ movq %rcx, 1*8(%rdi)
5548 + movq %r9, 2*8(%rdi)
5549 + movq %r8, 3*8(%rdi)
5550 + leaq 4*8(%rdi), %rdi
5551 +@@ -81,10 +81,10 @@ ENTRY(memmove)
5552 + 4:
5553 + movq %rdx, %rcx
5554 + movq -8(%rsi, %rdx), %r11
5555 +- lea -8(%rdi, %rdx), %r10
5556 ++ lea -8(%rdi, %rdx), %r9
5557 + shrq $3, %rcx
5558 + rep movsq
5559 +- movq %r11, (%r10)
5560 ++ movq %r11, (%r9)
5561 + jmp 13f
5562 + .Lmemmove_end_forward:
5563 +
5564 +@@ -95,14 +95,14 @@ ENTRY(memmove)
5565 + 7:
5566 + movq %rdx, %rcx
5567 + movq (%rsi), %r11
5568 +- movq %rdi, %r10
5569 ++ movq %rdi, %r9
5570 + leaq -8(%rsi, %rdx), %rsi
5571 + leaq -8(%rdi, %rdx), %rdi
5572 + shrq $3, %rcx
5573 + std
5574 + rep movsq
5575 + cld
5576 +- movq %r11, (%r10)
5577 ++ movq %r11, (%r9)
5578 + jmp 13f
5579 +
5580 + /*
5581 +@@ -127,13 +127,13 @@ ENTRY(memmove)
5582 + 8:
5583 + subq $0x20, %rdx
5584 + movq -1*8(%rsi), %r11
5585 +- movq -2*8(%rsi), %r10
5586 ++ movq -2*8(%rsi), %rcx
5587 + movq -3*8(%rsi), %r9
5588 + movq -4*8(%rsi), %r8
5589 + leaq -4*8(%rsi), %rsi
5590 +
5591 + movq %r11, -1*8(%rdi)
5592 +- movq %r10, -2*8(%rdi)
5593 ++ movq %rcx, -2*8(%rdi)
5594 + movq %r9, -3*8(%rdi)
5595 + movq %r8, -4*8(%rdi)
5596 + leaq -4*8(%rdi), %rdi
5597 +@@ -151,11 +151,11 @@ ENTRY(memmove)
5598 + * Move data from 16 bytes to 31 bytes.
5599 + */
5600 + movq 0*8(%rsi), %r11
5601 +- movq 1*8(%rsi), %r10
5602 ++ movq 1*8(%rsi), %rcx
5603 + movq -2*8(%rsi, %rdx), %r9
5604 + movq -1*8(%rsi, %rdx), %r8
5605 + movq %r11, 0*8(%rdi)
5606 +- movq %r10, 1*8(%rdi)
5607 ++ movq %rcx, 1*8(%rdi)
5608 + movq %r9, -2*8(%rdi, %rdx)
5609 + movq %r8, -1*8(%rdi, %rdx)
5610 + jmp 13f
5611 +@@ -167,9 +167,9 @@ ENTRY(memmove)
5612 + * Move data from 8 bytes to 15 bytes.
5613 + */
5614 + movq 0*8(%rsi), %r11
5615 +- movq -1*8(%rsi, %rdx), %r10
5616 ++ movq -1*8(%rsi, %rdx), %r9
5617 + movq %r11, 0*8(%rdi)
5618 +- movq %r10, -1*8(%rdi, %rdx)
5619 ++ movq %r9, -1*8(%rdi, %rdx)
5620 + jmp 13f
5621 + 10:
5622 + cmpq $4, %rdx
5623 +@@ -178,9 +178,9 @@ ENTRY(memmove)
5624 + * Move data from 4 bytes to 7 bytes.
5625 + */
5626 + movl (%rsi), %r11d
5627 +- movl -4(%rsi, %rdx), %r10d
5628 ++ movl -4(%rsi, %rdx), %r9d
5629 + movl %r11d, (%rdi)
5630 +- movl %r10d, -4(%rdi, %rdx)
5631 ++ movl %r9d, -4(%rdi, %rdx)
5632 + jmp 13f
5633 + 11:
5634 + cmp $2, %rdx
5635 +@@ -189,9 +189,9 @@ ENTRY(memmove)
5636 + * Move data from 2 bytes to 3 bytes.
5637 + */
5638 + movw (%rsi), %r11w
5639 +- movw -2(%rsi, %rdx), %r10w
5640 ++ movw -2(%rsi, %rdx), %r9w
5641 + movw %r11w, (%rdi)
5642 +- movw %r10w, -2(%rdi, %rdx)
5643 ++ movw %r9w, -2(%rdi, %rdx)
5644 + jmp 13f
5645 + 12:
5646 + cmp $1, %rdx
5647 @@ -202,6 +202,7 @@ ENTRY(memmove)
5648 movb (%rsi), %r11b
5649 movb %r11b, (%rdi)
5650 @@ -18534,9 +19229,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/memmove_64.S linux-3.1.3/arch/x86/lib/memmov
5651 retq
5652 .Lmemmove_end_forward_efs:
5653 .previous
5654 -diff -urNp linux-3.1.3/arch/x86/lib/memset_64.S linux-3.1.3/arch/x86/lib/memset_64.S
5655 ---- linux-3.1.3/arch/x86/lib/memset_64.S 2011-11-11 15:19:27.000000000 -0500
5656 -+++ linux-3.1.3/arch/x86/lib/memset_64.S 2011-11-16 18:39:07.000000000 -0500
5657 +diff -urNp linux-3.1.4/arch/x86/lib/memset_64.S linux-3.1.4/arch/x86/lib/memset_64.S
5658 +--- linux-3.1.4/arch/x86/lib/memset_64.S 2011-11-11 15:19:27.000000000 -0500
5659 ++++ linux-3.1.4/arch/x86/lib/memset_64.S 2011-12-02 17:38:47.000000000 -0500
5660 @@ -31,6 +31,7 @@
5661 movl %r8d,%ecx
5662 rep stosb
5663 @@ -18553,17 +19248,34 @@ diff -urNp linux-3.1.3/arch/x86/lib/memset_64.S linux-3.1.3/arch/x86/lib/memset_
5664 ret
5665 .Lmemset_e_e:
5666 .previous
5667 -@@ -121,6 +123,7 @@ ENTRY(__memset)
5668 +@@ -60,13 +62,13 @@
5669 + ENTRY(memset)
5670 + ENTRY(__memset)
5671 + CFI_STARTPROC
5672 +- movq %rdi,%r10
5673 + movq %rdx,%r11
5674 +
5675 + /* expand byte value */
5676 + movzbl %sil,%ecx
5677 + movabs $0x0101010101010101,%rax
5678 + mul %rcx /* with rax, clobbers rdx */
5679 ++ movq %rdi,%rdx
5680 +
5681 + /* align dst */
5682 + movl %edi,%r9d
5683 +@@ -120,7 +122,8 @@ ENTRY(__memset)
5684 + jnz .Lloop_1
5685
5686 .Lende:
5687 - movq %r10,%rax
5688 +- movq %r10,%rax
5689 ++ movq %rdx,%rax
5690 + pax_force_retaddr
5691 ret
5692
5693 CFI_RESTORE_STATE
5694 -diff -urNp linux-3.1.3/arch/x86/lib/mmx_32.c linux-3.1.3/arch/x86/lib/mmx_32.c
5695 ---- linux-3.1.3/arch/x86/lib/mmx_32.c 2011-11-11 15:19:27.000000000 -0500
5696 -+++ linux-3.1.3/arch/x86/lib/mmx_32.c 2011-11-16 18:39:07.000000000 -0500
5697 +diff -urNp linux-3.1.4/arch/x86/lib/mmx_32.c linux-3.1.4/arch/x86/lib/mmx_32.c
5698 +--- linux-3.1.4/arch/x86/lib/mmx_32.c 2011-11-11 15:19:27.000000000 -0500
5699 ++++ linux-3.1.4/arch/x86/lib/mmx_32.c 2011-11-16 18:39:07.000000000 -0500
5700 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
5701 {
5702 void *p;
5703 @@ -18879,9 +19591,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/mmx_32.c linux-3.1.3/arch/x86/lib/mmx_32.c
5704
5705 from += 64;
5706 to += 64;
5707 -diff -urNp linux-3.1.3/arch/x86/lib/msr-reg.S linux-3.1.3/arch/x86/lib/msr-reg.S
5708 ---- linux-3.1.3/arch/x86/lib/msr-reg.S 2011-11-11 15:19:27.000000000 -0500
5709 -+++ linux-3.1.3/arch/x86/lib/msr-reg.S 2011-11-16 18:39:07.000000000 -0500
5710 +diff -urNp linux-3.1.4/arch/x86/lib/msr-reg.S linux-3.1.4/arch/x86/lib/msr-reg.S
5711 +--- linux-3.1.4/arch/x86/lib/msr-reg.S 2011-11-11 15:19:27.000000000 -0500
5712 ++++ linux-3.1.4/arch/x86/lib/msr-reg.S 2011-12-02 17:38:47.000000000 -0500
5713 @@ -3,6 +3,7 @@
5714 #include <asm/dwarf2.h>
5715 #include <asm/asm.h>
5716 @@ -18890,17 +19602,43 @@ diff -urNp linux-3.1.3/arch/x86/lib/msr-reg.S linux-3.1.3/arch/x86/lib/msr-reg.S
5717
5718 #ifdef CONFIG_X86_64
5719 /*
5720 -@@ -37,6 +38,7 @@ ENTRY(native_\op\()_safe_regs)
5721 - movl %edi, 28(%r10)
5722 +@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
5723 + CFI_STARTPROC
5724 + pushq_cfi %rbx
5725 + pushq_cfi %rbp
5726 +- movq %rdi, %r10 /* Save pointer */
5727 ++ movq %rdi, %r9 /* Save pointer */
5728 + xorl %r11d, %r11d /* Return value */
5729 + movl (%rdi), %eax
5730 + movl 4(%rdi), %ecx
5731 +@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
5732 + movl 28(%rdi), %edi
5733 + CFI_REMEMBER_STATE
5734 + 1: \op
5735 +-2: movl %eax, (%r10)
5736 ++2: movl %eax, (%r9)
5737 + movl %r11d, %eax /* Return value */
5738 +- movl %ecx, 4(%r10)
5739 +- movl %edx, 8(%r10)
5740 +- movl %ebx, 12(%r10)
5741 +- movl %ebp, 20(%r10)
5742 +- movl %esi, 24(%r10)
5743 +- movl %edi, 28(%r10)
5744 ++ movl %ecx, 4(%r9)
5745 ++ movl %edx, 8(%r9)
5746 ++ movl %ebx, 12(%r9)
5747 ++ movl %ebp, 20(%r9)
5748 ++ movl %esi, 24(%r9)
5749 ++ movl %edi, 28(%r9)
5750 popq_cfi %rbp
5751 popq_cfi %rbx
5752 + pax_force_retaddr
5753 ret
5754 3:
5755 CFI_RESTORE_STATE
5756 -diff -urNp linux-3.1.3/arch/x86/lib/putuser.S linux-3.1.3/arch/x86/lib/putuser.S
5757 ---- linux-3.1.3/arch/x86/lib/putuser.S 2011-11-11 15:19:27.000000000 -0500
5758 -+++ linux-3.1.3/arch/x86/lib/putuser.S 2011-11-16 18:39:07.000000000 -0500
5759 +diff -urNp linux-3.1.4/arch/x86/lib/putuser.S linux-3.1.4/arch/x86/lib/putuser.S
5760 +--- linux-3.1.4/arch/x86/lib/putuser.S 2011-11-11 15:19:27.000000000 -0500
5761 ++++ linux-3.1.4/arch/x86/lib/putuser.S 2011-11-16 18:39:07.000000000 -0500
5762 @@ -15,7 +15,9 @@
5763 #include <asm/thread_info.h>
5764 #include <asm/errno.h>
5765 @@ -19040,9 +19778,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/putuser.S linux-3.1.3/arch/x86/lib/putuser.S
5766 #endif
5767 xor %eax,%eax
5768 EXIT
5769 -diff -urNp linux-3.1.3/arch/x86/lib/rwlock.S linux-3.1.3/arch/x86/lib/rwlock.S
5770 ---- linux-3.1.3/arch/x86/lib/rwlock.S 2011-11-11 15:19:27.000000000 -0500
5771 -+++ linux-3.1.3/arch/x86/lib/rwlock.S 2011-11-16 18:39:07.000000000 -0500
5772 +diff -urNp linux-3.1.4/arch/x86/lib/rwlock.S linux-3.1.4/arch/x86/lib/rwlock.S
5773 +--- linux-3.1.4/arch/x86/lib/rwlock.S 2011-11-11 15:19:27.000000000 -0500
5774 ++++ linux-3.1.4/arch/x86/lib/rwlock.S 2011-11-16 18:39:07.000000000 -0500
5775 @@ -23,6 +23,7 @@ ENTRY(__write_lock_failed)
5776 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
5777 jnz 0b
5778 @@ -19059,9 +19797,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/rwlock.S linux-3.1.3/arch/x86/lib/rwlock.S
5779 ret
5780 CFI_ENDPROC
5781 END(__read_lock_failed)
5782 -diff -urNp linux-3.1.3/arch/x86/lib/rwsem.S linux-3.1.3/arch/x86/lib/rwsem.S
5783 ---- linux-3.1.3/arch/x86/lib/rwsem.S 2011-11-11 15:19:27.000000000 -0500
5784 -+++ linux-3.1.3/arch/x86/lib/rwsem.S 2011-11-16 18:39:07.000000000 -0500
5785 +diff -urNp linux-3.1.4/arch/x86/lib/rwsem.S linux-3.1.4/arch/x86/lib/rwsem.S
5786 +--- linux-3.1.4/arch/x86/lib/rwsem.S 2011-11-11 15:19:27.000000000 -0500
5787 ++++ linux-3.1.4/arch/x86/lib/rwsem.S 2011-11-16 18:39:07.000000000 -0500
5788 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
5789 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
5790 CFI_RESTORE __ASM_REG(dx)
5791 @@ -19096,9 +19834,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/rwsem.S linux-3.1.3/arch/x86/lib/rwsem.S
5792 ret
5793 CFI_ENDPROC
5794 ENDPROC(call_rwsem_downgrade_wake)
5795 -diff -urNp linux-3.1.3/arch/x86/lib/thunk_64.S linux-3.1.3/arch/x86/lib/thunk_64.S
5796 ---- linux-3.1.3/arch/x86/lib/thunk_64.S 2011-11-11 15:19:27.000000000 -0500
5797 -+++ linux-3.1.3/arch/x86/lib/thunk_64.S 2011-11-16 18:39:07.000000000 -0500
5798 +diff -urNp linux-3.1.4/arch/x86/lib/thunk_64.S linux-3.1.4/arch/x86/lib/thunk_64.S
5799 +--- linux-3.1.4/arch/x86/lib/thunk_64.S 2011-11-11 15:19:27.000000000 -0500
5800 ++++ linux-3.1.4/arch/x86/lib/thunk_64.S 2011-11-16 18:39:07.000000000 -0500
5801 @@ -8,6 +8,7 @@
5802 #include <linux/linkage.h>
5803 #include <asm/dwarf2.h>
5804 @@ -19114,9 +19852,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/thunk_64.S linux-3.1.3/arch/x86/lib/thunk_64
5805 + pax_force_retaddr
5806 ret
5807 CFI_ENDPROC
5808 -diff -urNp linux-3.1.3/arch/x86/lib/usercopy_32.c linux-3.1.3/arch/x86/lib/usercopy_32.c
5809 ---- linux-3.1.3/arch/x86/lib/usercopy_32.c 2011-11-11 15:19:27.000000000 -0500
5810 -+++ linux-3.1.3/arch/x86/lib/usercopy_32.c 2011-11-16 18:39:07.000000000 -0500
5811 +diff -urNp linux-3.1.4/arch/x86/lib/usercopy_32.c linux-3.1.4/arch/x86/lib/usercopy_32.c
5812 +--- linux-3.1.4/arch/x86/lib/usercopy_32.c 2011-11-11 15:19:27.000000000 -0500
5813 ++++ linux-3.1.4/arch/x86/lib/usercopy_32.c 2011-11-16 18:39:07.000000000 -0500
5814 @@ -43,7 +43,7 @@ do { \
5815 __asm__ __volatile__( \
5816 " testl %1,%1\n" \
5817 @@ -19737,9 +20475,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/usercopy_32.c linux-3.1.3/arch/x86/lib/userc
5818 +}
5819 +EXPORT_SYMBOL(set_fs);
5820 +#endif
5821 -diff -urNp linux-3.1.3/arch/x86/lib/usercopy_64.c linux-3.1.3/arch/x86/lib/usercopy_64.c
5822 ---- linux-3.1.3/arch/x86/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
5823 -+++ linux-3.1.3/arch/x86/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
5824 +diff -urNp linux-3.1.4/arch/x86/lib/usercopy_64.c linux-3.1.4/arch/x86/lib/usercopy_64.c
5825 +--- linux-3.1.4/arch/x86/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
5826 ++++ linux-3.1.4/arch/x86/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
5827 @@ -42,6 +42,12 @@ long
5828 __strncpy_from_user(char *dst, const char __user *src, long count)
5829 {
5830 @@ -19798,9 +20536,9 @@ diff -urNp linux-3.1.3/arch/x86/lib/usercopy_64.c linux-3.1.3/arch/x86/lib/userc
5831 {
5832 char c;
5833 unsigned zero_len;
5834 -diff -urNp linux-3.1.3/arch/x86/Makefile linux-3.1.3/arch/x86/Makefile
5835 ---- linux-3.1.3/arch/x86/Makefile 2011-11-11 15:19:27.000000000 -0500
5836 -+++ linux-3.1.3/arch/x86/Makefile 2011-11-17 18:30:30.000000000 -0500
5837 +diff -urNp linux-3.1.4/arch/x86/Makefile linux-3.1.4/arch/x86/Makefile
5838 +--- linux-3.1.4/arch/x86/Makefile 2011-11-11 15:19:27.000000000 -0500
5839 ++++ linux-3.1.4/arch/x86/Makefile 2011-11-17 18:30:30.000000000 -0500
5840 @@ -46,6 +46,7 @@ else
5841 UTS_MACHINE := x86_64
5842 CHECKFLAGS += -D__x86_64__ -m64
5843 @@ -19822,9 +20560,9 @@ diff -urNp linux-3.1.3/arch/x86/Makefile linux-3.1.3/arch/x86/Makefile
5844 +
5845 +archprepare:
5846 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
5847 -diff -urNp linux-3.1.3/arch/x86/mm/extable.c linux-3.1.3/arch/x86/mm/extable.c
5848 ---- linux-3.1.3/arch/x86/mm/extable.c 2011-11-11 15:19:27.000000000 -0500
5849 -+++ linux-3.1.3/arch/x86/mm/extable.c 2011-11-16 18:39:07.000000000 -0500
5850 +diff -urNp linux-3.1.4/arch/x86/mm/extable.c linux-3.1.4/arch/x86/mm/extable.c
5851 +--- linux-3.1.4/arch/x86/mm/extable.c 2011-11-11 15:19:27.000000000 -0500
5852 ++++ linux-3.1.4/arch/x86/mm/extable.c 2011-11-16 18:39:07.000000000 -0500
5853 @@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
5854 const struct exception_table_entry *fixup;
5855
5856 @@ -19834,9 +20572,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/extable.c linux-3.1.3/arch/x86/mm/extable.c
5857 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
5858 extern u32 pnp_bios_is_utter_crap;
5859 pnp_bios_is_utter_crap = 1;
5860 -diff -urNp linux-3.1.3/arch/x86/mm/fault.c linux-3.1.3/arch/x86/mm/fault.c
5861 ---- linux-3.1.3/arch/x86/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
5862 -+++ linux-3.1.3/arch/x86/mm/fault.c 2011-11-16 20:43:50.000000000 -0500
5863 +diff -urNp linux-3.1.4/arch/x86/mm/fault.c linux-3.1.4/arch/x86/mm/fault.c
5864 +--- linux-3.1.4/arch/x86/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
5865 ++++ linux-3.1.4/arch/x86/mm/fault.c 2011-11-16 20:43:50.000000000 -0500
5866 @@ -13,11 +13,18 @@
5867 #include <linux/perf_event.h> /* perf_sw_event */
5868 #include <linux/hugetlb.h> /* hstate_index_to_shift */
5869 @@ -20512,9 +21250,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/fault.c linux-3.1.3/arch/x86/mm/fault.c
5870 +
5871 + return ret ? -EFAULT : 0;
5872 +}
5873 -diff -urNp linux-3.1.3/arch/x86/mm/gup.c linux-3.1.3/arch/x86/mm/gup.c
5874 ---- linux-3.1.3/arch/x86/mm/gup.c 2011-11-11 15:19:27.000000000 -0500
5875 -+++ linux-3.1.3/arch/x86/mm/gup.c 2011-11-16 18:39:07.000000000 -0500
5876 +diff -urNp linux-3.1.4/arch/x86/mm/gup.c linux-3.1.4/arch/x86/mm/gup.c
5877 +--- linux-3.1.4/arch/x86/mm/gup.c 2011-11-11 15:19:27.000000000 -0500
5878 ++++ linux-3.1.4/arch/x86/mm/gup.c 2011-11-16 18:39:07.000000000 -0500
5879 @@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long
5880 addr = start;
5881 len = (unsigned long) nr_pages << PAGE_SHIFT;
5882 @@ -20524,9 +21262,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/gup.c linux-3.1.3/arch/x86/mm/gup.c
5883 (void __user *)start, len)))
5884 return 0;
5885
5886 -diff -urNp linux-3.1.3/arch/x86/mm/highmem_32.c linux-3.1.3/arch/x86/mm/highmem_32.c
5887 ---- linux-3.1.3/arch/x86/mm/highmem_32.c 2011-11-11 15:19:27.000000000 -0500
5888 -+++ linux-3.1.3/arch/x86/mm/highmem_32.c 2011-11-16 18:39:07.000000000 -0500
5889 +diff -urNp linux-3.1.4/arch/x86/mm/highmem_32.c linux-3.1.4/arch/x86/mm/highmem_32.c
5890 +--- linux-3.1.4/arch/x86/mm/highmem_32.c 2011-11-11 15:19:27.000000000 -0500
5891 ++++ linux-3.1.4/arch/x86/mm/highmem_32.c 2011-11-16 18:39:07.000000000 -0500
5892 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
5893 idx = type + KM_TYPE_NR*smp_processor_id();
5894 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
5895 @@ -20538,9 +21276,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/highmem_32.c linux-3.1.3/arch/x86/mm/highmem_
5896
5897 return (void *)vaddr;
5898 }
5899 -diff -urNp linux-3.1.3/arch/x86/mm/hugetlbpage.c linux-3.1.3/arch/x86/mm/hugetlbpage.c
5900 ---- linux-3.1.3/arch/x86/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
5901 -+++ linux-3.1.3/arch/x86/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
5902 +diff -urNp linux-3.1.4/arch/x86/mm/hugetlbpage.c linux-3.1.4/arch/x86/mm/hugetlbpage.c
5903 +--- linux-3.1.4/arch/x86/mm/hugetlbpage.c 2011-11-11 15:19:27.000000000 -0500
5904 ++++ linux-3.1.4/arch/x86/mm/hugetlbpage.c 2011-11-16 18:39:07.000000000 -0500
5905 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
5906 struct hstate *h = hstate_file(file);
5907 struct mm_struct *mm = current->mm;
5908 @@ -20748,9 +21486,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/hugetlbpage.c linux-3.1.3/arch/x86/mm/hugetlb
5909 return addr;
5910 }
5911 if (mm->get_unmapped_area == arch_get_unmapped_area)
5912 -diff -urNp linux-3.1.3/arch/x86/mm/init_32.c linux-3.1.3/arch/x86/mm/init_32.c
5913 ---- linux-3.1.3/arch/x86/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
5914 -+++ linux-3.1.3/arch/x86/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
5915 +diff -urNp linux-3.1.4/arch/x86/mm/init_32.c linux-3.1.4/arch/x86/mm/init_32.c
5916 +--- linux-3.1.4/arch/x86/mm/init_32.c 2011-11-11 15:19:27.000000000 -0500
5917 ++++ linux-3.1.4/arch/x86/mm/init_32.c 2011-11-16 18:39:07.000000000 -0500
5918 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
5919 }
5920
5921 @@ -21025,9 +21763,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/init_32.c linux-3.1.3/arch/x86/mm/init_32.c
5922 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
5923 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
5924 size >> 10);
5925 -diff -urNp linux-3.1.3/arch/x86/mm/init_64.c linux-3.1.3/arch/x86/mm/init_64.c
5926 ---- linux-3.1.3/arch/x86/mm/init_64.c 2011-11-11 15:19:27.000000000 -0500
5927 -+++ linux-3.1.3/arch/x86/mm/init_64.c 2011-11-16 18:39:07.000000000 -0500
5928 +diff -urNp linux-3.1.4/arch/x86/mm/init_64.c linux-3.1.4/arch/x86/mm/init_64.c
5929 +--- linux-3.1.4/arch/x86/mm/init_64.c 2011-11-11 15:19:27.000000000 -0500
5930 ++++ linux-3.1.4/arch/x86/mm/init_64.c 2011-11-16 18:39:07.000000000 -0500
5931 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
5932 * around without checking the pgd every time.
5933 */
5934 @@ -21157,9 +21895,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/init_64.c linux-3.1.3/arch/x86/mm/init_64.c
5935 return "[vdso]";
5936 if (vma == &gate_vma)
5937 return "[vsyscall]";
5938 -diff -urNp linux-3.1.3/arch/x86/mm/init.c linux-3.1.3/arch/x86/mm/init.c
5939 ---- linux-3.1.3/arch/x86/mm/init.c 2011-11-11 15:19:27.000000000 -0500
5940 -+++ linux-3.1.3/arch/x86/mm/init.c 2011-11-17 18:31:28.000000000 -0500
5941 +diff -urNp linux-3.1.4/arch/x86/mm/init.c linux-3.1.4/arch/x86/mm/init.c
5942 +--- linux-3.1.4/arch/x86/mm/init.c 2011-11-11 15:19:27.000000000 -0500
5943 ++++ linux-3.1.4/arch/x86/mm/init.c 2011-11-17 18:31:28.000000000 -0500
5944 @@ -31,7 +31,7 @@ int direct_gbpages
5945 static void __init find_early_table_space(unsigned long end, int use_pse,
5946 int use_gbpages)
5947 @@ -21287,9 +22025,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/init.c linux-3.1.3/arch/x86/mm/init.c
5948 free_init_pages("unused kernel memory",
5949 (unsigned long)(&__init_begin),
5950 (unsigned long)(&__init_end));
5951 -diff -urNp linux-3.1.3/arch/x86/mm/iomap_32.c linux-3.1.3/arch/x86/mm/iomap_32.c
5952 ---- linux-3.1.3/arch/x86/mm/iomap_32.c 2011-11-11 15:19:27.000000000 -0500
5953 -+++ linux-3.1.3/arch/x86/mm/iomap_32.c 2011-11-16 18:39:07.000000000 -0500
5954 +diff -urNp linux-3.1.4/arch/x86/mm/iomap_32.c linux-3.1.4/arch/x86/mm/iomap_32.c
5955 +--- linux-3.1.4/arch/x86/mm/iomap_32.c 2011-11-11 15:19:27.000000000 -0500
5956 ++++ linux-3.1.4/arch/x86/mm/iomap_32.c 2011-11-16 18:39:07.000000000 -0500
5957 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
5958 type = kmap_atomic_idx_push();
5959 idx = type + KM_TYPE_NR * smp_processor_id();
5960 @@ -21302,9 +22040,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/iomap_32.c linux-3.1.3/arch/x86/mm/iomap_32.c
5961 arch_flush_lazy_mmu_mode();
5962
5963 return (void *)vaddr;
5964 -diff -urNp linux-3.1.3/arch/x86/mm/ioremap.c linux-3.1.3/arch/x86/mm/ioremap.c
5965 ---- linux-3.1.3/arch/x86/mm/ioremap.c 2011-11-11 15:19:27.000000000 -0500
5966 -+++ linux-3.1.3/arch/x86/mm/ioremap.c 2011-11-16 18:39:07.000000000 -0500
5967 +diff -urNp linux-3.1.4/arch/x86/mm/ioremap.c linux-3.1.4/arch/x86/mm/ioremap.c
5968 +--- linux-3.1.4/arch/x86/mm/ioremap.c 2011-11-11 15:19:27.000000000 -0500
5969 ++++ linux-3.1.4/arch/x86/mm/ioremap.c 2011-11-16 18:39:07.000000000 -0500
5970 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re
5971 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
5972 int is_ram = page_is_ram(pfn);
5973 @@ -21333,9 +22071,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/ioremap.c linux-3.1.3/arch/x86/mm/ioremap.c
5974
5975 /*
5976 * The boot-ioremap range spans multiple pmds, for which
5977 -diff -urNp linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c
5978 ---- linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-11 15:19:27.000000000 -0500
5979 -+++ linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-16 18:39:07.000000000 -0500
5980 +diff -urNp linux-3.1.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.1.4/arch/x86/mm/kmemcheck/kmemcheck.c
5981 +--- linux-3.1.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-11 15:19:27.000000000 -0500
5982 ++++ linux-3.1.4/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-16 18:39:07.000000000 -0500
5983 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
5984 * memory (e.g. tracked pages)? For now, we need this to avoid
5985 * invoking kmemcheck for PnP BIOS calls.
5986 @@ -21348,9 +22086,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.1.3/arch/x86/mm
5987 return false;
5988
5989 pte = kmemcheck_pte_lookup(address);
5990 -diff -urNp linux-3.1.3/arch/x86/mm/mmap.c linux-3.1.3/arch/x86/mm/mmap.c
5991 ---- linux-3.1.3/arch/x86/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
5992 -+++ linux-3.1.3/arch/x86/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
5993 +diff -urNp linux-3.1.4/arch/x86/mm/mmap.c linux-3.1.4/arch/x86/mm/mmap.c
5994 +--- linux-3.1.4/arch/x86/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
5995 ++++ linux-3.1.4/arch/x86/mm/mmap.c 2011-11-16 18:39:07.000000000 -0500
5996 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
5997 * Leave an at least ~128 MB hole with possible stack randomization.
5998 */
5999 @@ -21432,9 +22170,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/mmap.c linux-3.1.3/arch/x86/mm/mmap.c
6000 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6001 mm->unmap_area = arch_unmap_area_topdown;
6002 }
6003 -diff -urNp linux-3.1.3/arch/x86/mm/mmio-mod.c linux-3.1.3/arch/x86/mm/mmio-mod.c
6004 ---- linux-3.1.3/arch/x86/mm/mmio-mod.c 2011-11-11 15:19:27.000000000 -0500
6005 -+++ linux-3.1.3/arch/x86/mm/mmio-mod.c 2011-11-16 18:39:07.000000000 -0500
6006 +diff -urNp linux-3.1.4/arch/x86/mm/mmio-mod.c linux-3.1.4/arch/x86/mm/mmio-mod.c
6007 +--- linux-3.1.4/arch/x86/mm/mmio-mod.c 2011-11-11 15:19:27.000000000 -0500
6008 ++++ linux-3.1.4/arch/x86/mm/mmio-mod.c 2011-11-16 18:39:07.000000000 -0500
6009 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
6010 break;
6011 default:
6012 @@ -21462,9 +22200,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/mmio-mod.c linux-3.1.3/arch/x86/mm/mmio-mod.c
6013 };
6014 map.map_id = trace->id;
6015
6016 -diff -urNp linux-3.1.3/arch/x86/mm/pageattr.c linux-3.1.3/arch/x86/mm/pageattr.c
6017 ---- linux-3.1.3/arch/x86/mm/pageattr.c 2011-11-11 15:19:27.000000000 -0500
6018 -+++ linux-3.1.3/arch/x86/mm/pageattr.c 2011-11-16 18:39:07.000000000 -0500
6019 +diff -urNp linux-3.1.4/arch/x86/mm/pageattr.c linux-3.1.4/arch/x86/mm/pageattr.c
6020 +--- linux-3.1.4/arch/x86/mm/pageattr.c 2011-11-11 15:19:27.000000000 -0500
6021 ++++ linux-3.1.4/arch/x86/mm/pageattr.c 2011-11-16 18:39:07.000000000 -0500
6022 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection
6023 */
6024 #ifdef CONFIG_PCI_BIOS
6025 @@ -21549,9 +22287,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/pageattr.c linux-3.1.3/arch/x86/mm/pageattr.c
6026 }
6027
6028 static int
6029 -diff -urNp linux-3.1.3/arch/x86/mm/pageattr-test.c linux-3.1.3/arch/x86/mm/pageattr-test.c
6030 ---- linux-3.1.3/arch/x86/mm/pageattr-test.c 2011-11-11 15:19:27.000000000 -0500
6031 -+++ linux-3.1.3/arch/x86/mm/pageattr-test.c 2011-11-16 18:39:07.000000000 -0500
6032 +diff -urNp linux-3.1.4/arch/x86/mm/pageattr-test.c linux-3.1.4/arch/x86/mm/pageattr-test.c
6033 +--- linux-3.1.4/arch/x86/mm/pageattr-test.c 2011-11-11 15:19:27.000000000 -0500
6034 ++++ linux-3.1.4/arch/x86/mm/pageattr-test.c 2011-11-16 18:39:07.000000000 -0500
6035 @@ -36,7 +36,7 @@ enum {
6036
6037 static int pte_testbit(pte_t pte)
6038 @@ -21561,9 +22299,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/pageattr-test.c linux-3.1.3/arch/x86/mm/pagea
6039 }
6040
6041 struct split_state {
6042 -diff -urNp linux-3.1.3/arch/x86/mm/pat.c linux-3.1.3/arch/x86/mm/pat.c
6043 ---- linux-3.1.3/arch/x86/mm/pat.c 2011-11-11 15:19:27.000000000 -0500
6044 -+++ linux-3.1.3/arch/x86/mm/pat.c 2011-11-16 18:39:07.000000000 -0500
6045 +diff -urNp linux-3.1.4/arch/x86/mm/pat.c linux-3.1.4/arch/x86/mm/pat.c
6046 +--- linux-3.1.4/arch/x86/mm/pat.c 2011-11-11 15:19:27.000000000 -0500
6047 ++++ linux-3.1.4/arch/x86/mm/pat.c 2011-11-16 18:39:07.000000000 -0500
6048 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
6049
6050 if (!entry) {
6051 @@ -21611,9 +22349,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/pat.c linux-3.1.3/arch/x86/mm/pat.c
6052 cattr_name(want_flags),
6053 (unsigned long long)paddr,
6054 (unsigned long long)(paddr + size),
6055 -diff -urNp linux-3.1.3/arch/x86/mm/pf_in.c linux-3.1.3/arch/x86/mm/pf_in.c
6056 ---- linux-3.1.3/arch/x86/mm/pf_in.c 2011-11-11 15:19:27.000000000 -0500
6057 -+++ linux-3.1.3/arch/x86/mm/pf_in.c 2011-11-16 18:39:07.000000000 -0500
6058 +diff -urNp linux-3.1.4/arch/x86/mm/pf_in.c linux-3.1.4/arch/x86/mm/pf_in.c
6059 +--- linux-3.1.4/arch/x86/mm/pf_in.c 2011-11-11 15:19:27.000000000 -0500
6060 ++++ linux-3.1.4/arch/x86/mm/pf_in.c 2011-11-16 18:39:07.000000000 -0500
6061 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
6062 int i;
6063 enum reason_type rv = OTHERS;
6064 @@ -21659,9 +22397,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/pf_in.c linux-3.1.3/arch/x86/mm/pf_in.c
6065 p += skip_prefix(p, &prf);
6066 p += get_opcode(p, &opcode);
6067 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
6068 -diff -urNp linux-3.1.3/arch/x86/mm/pgtable_32.c linux-3.1.3/arch/x86/mm/pgtable_32.c
6069 ---- linux-3.1.3/arch/x86/mm/pgtable_32.c 2011-11-11 15:19:27.000000000 -0500
6070 -+++ linux-3.1.3/arch/x86/mm/pgtable_32.c 2011-11-16 18:39:07.000000000 -0500
6071 +diff -urNp linux-3.1.4/arch/x86/mm/pgtable_32.c linux-3.1.4/arch/x86/mm/pgtable_32.c
6072 +--- linux-3.1.4/arch/x86/mm/pgtable_32.c 2011-11-11 15:19:27.000000000 -0500
6073 ++++ linux-3.1.4/arch/x86/mm/pgtable_32.c 2011-11-16 18:39:07.000000000 -0500
6074 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
6075 return;
6076 }
6077 @@ -21676,9 +22414,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/pgtable_32.c linux-3.1.3/arch/x86/mm/pgtable_
6078
6079 /*
6080 * It's enough to flush this one mapping.
6081 -diff -urNp linux-3.1.3/arch/x86/mm/pgtable.c linux-3.1.3/arch/x86/mm/pgtable.c
6082 ---- linux-3.1.3/arch/x86/mm/pgtable.c 2011-11-11 15:19:27.000000000 -0500
6083 -+++ linux-3.1.3/arch/x86/mm/pgtable.c 2011-11-16 18:39:07.000000000 -0500
6084 +diff -urNp linux-3.1.4/arch/x86/mm/pgtable.c linux-3.1.4/arch/x86/mm/pgtable.c
6085 +--- linux-3.1.4/arch/x86/mm/pgtable.c 2011-11-11 15:19:27.000000000 -0500
6086 ++++ linux-3.1.4/arch/x86/mm/pgtable.c 2011-11-16 18:39:07.000000000 -0500
6087 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
6088 list_del(&page->lru);
6089 }
6090 @@ -21924,9 +22662,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/pgtable.c linux-3.1.3/arch/x86/mm/pgtable.c
6091 pgd_dtor(pgd);
6092 paravirt_pgd_free(mm, pgd);
6093 free_page((unsigned long)pgd);
6094 -diff -urNp linux-3.1.3/arch/x86/mm/setup_nx.c linux-3.1.3/arch/x86/mm/setup_nx.c
6095 ---- linux-3.1.3/arch/x86/mm/setup_nx.c 2011-11-11 15:19:27.000000000 -0500
6096 -+++ linux-3.1.3/arch/x86/mm/setup_nx.c 2011-11-16 18:39:07.000000000 -0500
6097 +diff -urNp linux-3.1.4/arch/x86/mm/setup_nx.c linux-3.1.4/arch/x86/mm/setup_nx.c
6098 +--- linux-3.1.4/arch/x86/mm/setup_nx.c 2011-11-11 15:19:27.000000000 -0500
6099 ++++ linux-3.1.4/arch/x86/mm/setup_nx.c 2011-11-16 18:39:07.000000000 -0500
6100 @@ -5,8 +5,10 @@
6101 #include <asm/pgtable.h>
6102 #include <asm/proto.h>
6103 @@ -21956,9 +22694,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/setup_nx.c linux-3.1.3/arch/x86/mm/setup_nx.c
6104 __supported_pte_mask &= ~_PAGE_NX;
6105 }
6106
6107 -diff -urNp linux-3.1.3/arch/x86/mm/tlb.c linux-3.1.3/arch/x86/mm/tlb.c
6108 ---- linux-3.1.3/arch/x86/mm/tlb.c 2011-11-11 15:19:27.000000000 -0500
6109 -+++ linux-3.1.3/arch/x86/mm/tlb.c 2011-11-16 18:39:07.000000000 -0500
6110 +diff -urNp linux-3.1.4/arch/x86/mm/tlb.c linux-3.1.4/arch/x86/mm/tlb.c
6111 +--- linux-3.1.4/arch/x86/mm/tlb.c 2011-11-11 15:19:27.000000000 -0500
6112 ++++ linux-3.1.4/arch/x86/mm/tlb.c 2011-11-16 18:39:07.000000000 -0500
6113 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
6114 BUG();
6115 cpumask_clear_cpu(cpu,
6116 @@ -21971,9 +22709,9 @@ diff -urNp linux-3.1.3/arch/x86/mm/tlb.c linux-3.1.3/arch/x86/mm/tlb.c
6117 }
6118 EXPORT_SYMBOL_GPL(leave_mm);
6119
6120 -diff -urNp linux-3.1.3/arch/x86/net/bpf_jit_comp.c linux-3.1.3/arch/x86/net/bpf_jit_comp.c
6121 ---- linux-3.1.3/arch/x86/net/bpf_jit_comp.c 2011-11-11 15:19:27.000000000 -0500
6122 -+++ linux-3.1.3/arch/x86/net/bpf_jit_comp.c 2011-11-20 19:21:53.000000000 -0500
6123 +diff -urNp linux-3.1.4/arch/x86/net/bpf_jit_comp.c linux-3.1.4/arch/x86/net/bpf_jit_comp.c
6124 +--- linux-3.1.4/arch/x86/net/bpf_jit_comp.c 2011-11-11 15:19:27.000000000 -0500
6125 ++++ linux-3.1.4/arch/x86/net/bpf_jit_comp.c 2011-11-20 19:21:53.000000000 -0500
6126 @@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void
6127 set_fs(old_fs);
6128 }
6129 @@ -22052,9 +22790,9 @@ diff -urNp linux-3.1.3/arch/x86/net/bpf_jit_comp.c linux-3.1.3/arch/x86/net/bpf_
6130 schedule_work(work);
6131 }
6132 }
6133 -diff -urNp linux-3.1.3/arch/x86/net/bpf_jit.S linux-3.1.3/arch/x86/net/bpf_jit.S
6134 ---- linux-3.1.3/arch/x86/net/bpf_jit.S 2011-11-11 15:19:27.000000000 -0500
6135 -+++ linux-3.1.3/arch/x86/net/bpf_jit.S 2011-11-16 18:39:07.000000000 -0500
6136 +diff -urNp linux-3.1.4/arch/x86/net/bpf_jit.S linux-3.1.4/arch/x86/net/bpf_jit.S
6137 +--- linux-3.1.4/arch/x86/net/bpf_jit.S 2011-11-11 15:19:27.000000000 -0500
6138 ++++ linux-3.1.4/arch/x86/net/bpf_jit.S 2011-11-16 18:39:07.000000000 -0500
6139 @@ -9,6 +9,7 @@
6140 */
6141 #include <linux/linkage.h>
6142 @@ -22132,9 +22870,9 @@ diff -urNp linux-3.1.3/arch/x86/net/bpf_jit.S linux-3.1.3/arch/x86/net/bpf_jit.S
6143 xchg %eax,%ebx
6144 + pax_force_retaddr
6145 ret
6146 -diff -urNp linux-3.1.3/arch/x86/oprofile/backtrace.c linux-3.1.3/arch/x86/oprofile/backtrace.c
6147 ---- linux-3.1.3/arch/x86/oprofile/backtrace.c 2011-11-11 15:19:27.000000000 -0500
6148 -+++ linux-3.1.3/arch/x86/oprofile/backtrace.c 2011-11-16 18:39:07.000000000 -0500
6149 +diff -urNp linux-3.1.4/arch/x86/oprofile/backtrace.c linux-3.1.4/arch/x86/oprofile/backtrace.c
6150 +--- linux-3.1.4/arch/x86/oprofile/backtrace.c 2011-11-11 15:19:27.000000000 -0500
6151 ++++ linux-3.1.4/arch/x86/oprofile/backtrace.c 2011-11-16 18:39:07.000000000 -0500
6152 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_fram
6153 struct stack_frame_ia32 *fp;
6154 unsigned long bytes;
6155 @@ -22167,9 +22905,9 @@ diff -urNp linux-3.1.3/arch/x86/oprofile/backtrace.c linux-3.1.3/arch/x86/oprofi
6156 unsigned long stack = kernel_stack_pointer(regs);
6157 if (depth)
6158 dump_trace(NULL, regs, (unsigned long *)stack, 0,
6159 -diff -urNp linux-3.1.3/arch/x86/pci/mrst.c linux-3.1.3/arch/x86/pci/mrst.c
6160 ---- linux-3.1.3/arch/x86/pci/mrst.c 2011-11-11 15:19:27.000000000 -0500
6161 -+++ linux-3.1.3/arch/x86/pci/mrst.c 2011-11-16 18:39:07.000000000 -0500
6162 +diff -urNp linux-3.1.4/arch/x86/pci/mrst.c linux-3.1.4/arch/x86/pci/mrst.c
6163 +--- linux-3.1.4/arch/x86/pci/mrst.c 2011-11-11 15:19:27.000000000 -0500
6164 ++++ linux-3.1.4/arch/x86/pci/mrst.c 2011-11-16 18:39:07.000000000 -0500
6165 @@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
6166 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
6167 pci_mmcfg_late_init();
6168 @@ -22181,9 +22919,9 @@ diff -urNp linux-3.1.3/arch/x86/pci/mrst.c linux-3.1.3/arch/x86/pci/mrst.c
6169 /* Continue with standard init */
6170 return 1;
6171 }
6172 -diff -urNp linux-3.1.3/arch/x86/pci/pcbios.c linux-3.1.3/arch/x86/pci/pcbios.c
6173 ---- linux-3.1.3/arch/x86/pci/pcbios.c 2011-11-11 15:19:27.000000000 -0500
6174 -+++ linux-3.1.3/arch/x86/pci/pcbios.c 2011-11-16 18:39:07.000000000 -0500
6175 +diff -urNp linux-3.1.4/arch/x86/pci/pcbios.c linux-3.1.4/arch/x86/pci/pcbios.c
6176 +--- linux-3.1.4/arch/x86/pci/pcbios.c 2011-11-11 15:19:27.000000000 -0500
6177 ++++ linux-3.1.4/arch/x86/pci/pcbios.c 2011-11-16 18:39:07.000000000 -0500
6178 @@ -79,50 +79,93 @@ union bios32 {
6179 static struct {
6180 unsigned long address;
6181 @@ -22488,9 +23226,9 @@ diff -urNp linux-3.1.3/arch/x86/pci/pcbios.c linux-3.1.3/arch/x86/pci/pcbios.c
6182 return !(ret & 0xff00);
6183 }
6184 EXPORT_SYMBOL(pcibios_set_irq_routing);
6185 -diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_32.c linux-3.1.3/arch/x86/platform/efi/efi_32.c
6186 ---- linux-3.1.3/arch/x86/platform/efi/efi_32.c 2011-11-11 15:19:27.000000000 -0500
6187 -+++ linux-3.1.3/arch/x86/platform/efi/efi_32.c 2011-11-16 18:39:07.000000000 -0500
6188 +diff -urNp linux-3.1.4/arch/x86/platform/efi/efi_32.c linux-3.1.4/arch/x86/platform/efi/efi_32.c
6189 +--- linux-3.1.4/arch/x86/platform/efi/efi_32.c 2011-11-11 15:19:27.000000000 -0500
6190 ++++ linux-3.1.4/arch/x86/platform/efi/efi_32.c 2011-11-16 18:39:07.000000000 -0500
6191 @@ -38,70 +38,56 @@
6192 */
6193
6194 @@ -22588,9 +23326,9 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_32.c linux-3.1.3/arch/x86/platf
6195
6196 /*
6197 * After the lock is released, the original page table is restored.
6198 -diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S
6199 ---- linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S 2011-11-11 15:19:27.000000000 -0500
6200 -+++ linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S 2011-11-16 18:39:07.000000000 -0500
6201 +diff -urNp linux-3.1.4/arch/x86/platform/efi/efi_stub_32.S linux-3.1.4/arch/x86/platform/efi/efi_stub_32.S
6202 +--- linux-3.1.4/arch/x86/platform/efi/efi_stub_32.S 2011-11-11 15:19:27.000000000 -0500
6203 ++++ linux-3.1.4/arch/x86/platform/efi/efi_stub_32.S 2011-11-16 18:39:07.000000000 -0500
6204 @@ -6,7 +6,9 @@
6205 */
6206
6207 @@ -22699,9 +23437,9 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_32.S linux-3.1.3/arch/x86/
6208 saved_return_addr:
6209 .long 0
6210 efi_rt_function_ptr:
6211 -diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S
6212 ---- linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S 2011-11-11 15:19:27.000000000 -0500
6213 -+++ linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S 2011-11-16 18:39:07.000000000 -0500
6214 +diff -urNp linux-3.1.4/arch/x86/platform/efi/efi_stub_64.S linux-3.1.4/arch/x86/platform/efi/efi_stub_64.S
6215 +--- linux-3.1.4/arch/x86/platform/efi/efi_stub_64.S 2011-11-11 15:19:27.000000000 -0500
6216 ++++ linux-3.1.4/arch/x86/platform/efi/efi_stub_64.S 2011-12-02 17:38:47.000000000 -0500
6217 @@ -7,6 +7,7 @@
6218 */
6219
6220 @@ -22714,7 +23452,7 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/
6221 call *%rdi
6222 addq $32, %rsp
6223 RESTORE_XMM
6224 -+ pax_force_retaddr
6225 ++ pax_force_retaddr 0, 1
6226 ret
6227 ENDPROC(efi_call0)
6228
6229 @@ -22722,7 +23460,7 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/
6230 call *%rdi
6231 addq $32, %rsp
6232 RESTORE_XMM
6233 -+ pax_force_retaddr
6234 ++ pax_force_retaddr 0, 1
6235 ret
6236 ENDPROC(efi_call1)
6237
6238 @@ -22730,7 +23468,7 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/
6239 call *%rdi
6240 addq $32, %rsp
6241 RESTORE_XMM
6242 -+ pax_force_retaddr
6243 ++ pax_force_retaddr 0, 1
6244 ret
6245 ENDPROC(efi_call2)
6246
6247 @@ -22738,7 +23476,7 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/
6248 call *%rdi
6249 addq $32, %rsp
6250 RESTORE_XMM
6251 -+ pax_force_retaddr
6252 ++ pax_force_retaddr 0, 1
6253 ret
6254 ENDPROC(efi_call3)
6255
6256 @@ -22746,7 +23484,7 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/
6257 call *%rdi
6258 addq $32, %rsp
6259 RESTORE_XMM
6260 -+ pax_force_retaddr
6261 ++ pax_force_retaddr 0, 1
6262 ret
6263 ENDPROC(efi_call4)
6264
6265 @@ -22754,7 +23492,7 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/
6266 call *%rdi
6267 addq $48, %rsp
6268 RESTORE_XMM
6269 -+ pax_force_retaddr
6270 ++ pax_force_retaddr 0, 1
6271 ret
6272 ENDPROC(efi_call5)
6273
6274 @@ -22762,12 +23500,12 @@ diff -urNp linux-3.1.3/arch/x86/platform/efi/efi_stub_64.S linux-3.1.3/arch/x86/
6275 call *%rdi
6276 addq $48, %rsp
6277 RESTORE_XMM
6278 -+ pax_force_retaddr
6279 ++ pax_force_retaddr 0, 1
6280 ret
6281 ENDPROC(efi_call6)
6282 -diff -urNp linux-3.1.3/arch/x86/platform/mrst/mrst.c linux-3.1.3/arch/x86/platform/mrst/mrst.c
6283 ---- linux-3.1.3/arch/x86/platform/mrst/mrst.c 2011-11-11 15:19:27.000000000 -0500
6284 -+++ linux-3.1.3/arch/x86/platform/mrst/mrst.c 2011-11-16 18:39:07.000000000 -0500
6285 +diff -urNp linux-3.1.4/arch/x86/platform/mrst/mrst.c linux-3.1.4/arch/x86/platform/mrst/mrst.c
6286 +--- linux-3.1.4/arch/x86/platform/mrst/mrst.c 2011-11-11 15:19:27.000000000 -0500
6287 ++++ linux-3.1.4/arch/x86/platform/mrst/mrst.c 2011-11-16 18:39:07.000000000 -0500
6288 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
6289 }
6290
6291 @@ -22787,9 +23525,9 @@ diff -urNp linux-3.1.3/arch/x86/platform/mrst/mrst.c linux-3.1.3/arch/x86/platfo
6292 }
6293
6294 /*
6295 -diff -urNp linux-3.1.3/arch/x86/platform/uv/tlb_uv.c linux-3.1.3/arch/x86/platform/uv/tlb_uv.c
6296 ---- linux-3.1.3/arch/x86/platform/uv/tlb_uv.c 2011-11-11 15:19:27.000000000 -0500
6297 -+++ linux-3.1.3/arch/x86/platform/uv/tlb_uv.c 2011-11-16 19:39:11.000000000 -0500
6298 +diff -urNp linux-3.1.4/arch/x86/platform/uv/tlb_uv.c linux-3.1.4/arch/x86/platform/uv/tlb_uv.c
6299 +--- linux-3.1.4/arch/x86/platform/uv/tlb_uv.c 2011-11-11 15:19:27.000000000 -0500
6300 ++++ linux-3.1.4/arch/x86/platform/uv/tlb_uv.c 2011-11-16 19:39:11.000000000 -0500
6301 @@ -377,6 +377,8 @@ static void reset_with_ipi(struct pnmask
6302 struct bau_control *smaster = bcp->socket_master;
6303 struct reset_args reset_args;
6304 @@ -22799,9 +23537,9 @@ diff -urNp linux-3.1.3/arch/x86/platform/uv/tlb_uv.c linux-3.1.3/arch/x86/platfo
6305 reset_args.sender = sender;
6306 cpus_clear(*mask);
6307 /* find a single cpu for each uvhub in this distribution mask */
6308 -diff -urNp linux-3.1.3/arch/x86/power/cpu.c linux-3.1.3/arch/x86/power/cpu.c
6309 ---- linux-3.1.3/arch/x86/power/cpu.c 2011-11-11 15:19:27.000000000 -0500
6310 -+++ linux-3.1.3/arch/x86/power/cpu.c 2011-11-16 18:39:07.000000000 -0500
6311 +diff -urNp linux-3.1.4/arch/x86/power/cpu.c linux-3.1.4/arch/x86/power/cpu.c
6312 +--- linux-3.1.4/arch/x86/power/cpu.c 2011-11-11 15:19:27.000000000 -0500
6313 ++++ linux-3.1.4/arch/x86/power/cpu.c 2011-11-16 18:39:07.000000000 -0500
6314 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
6315 static void fix_processor_context(void)
6316 {
6317 @@ -22821,9 +23559,9 @@ diff -urNp linux-3.1.3/arch/x86/power/cpu.c linux-3.1.3/arch/x86/power/cpu.c
6318
6319 syscall_init(); /* This sets MSR_*STAR and related */
6320 #endif
6321 -diff -urNp linux-3.1.3/arch/x86/vdso/Makefile linux-3.1.3/arch/x86/vdso/Makefile
6322 ---- linux-3.1.3/arch/x86/vdso/Makefile 2011-11-11 15:19:27.000000000 -0500
6323 -+++ linux-3.1.3/arch/x86/vdso/Makefile 2011-11-16 18:39:07.000000000 -0500
6324 +diff -urNp linux-3.1.4/arch/x86/vdso/Makefile linux-3.1.4/arch/x86/vdso/Makefile
6325 +--- linux-3.1.4/arch/x86/vdso/Makefile 2011-11-11 15:19:27.000000000 -0500
6326 ++++ linux-3.1.4/arch/x86/vdso/Makefile 2011-11-16 18:39:07.000000000 -0500
6327 @@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
6328 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
6329 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
6330 @@ -22833,9 +23571,9 @@ diff -urNp linux-3.1.3/arch/x86/vdso/Makefile linux-3.1.3/arch/x86/vdso/Makefile
6331 GCOV_PROFILE := n
6332
6333 #
6334 -diff -urNp linux-3.1.3/arch/x86/vdso/vdso32-setup.c linux-3.1.3/arch/x86/vdso/vdso32-setup.c
6335 ---- linux-3.1.3/arch/x86/vdso/vdso32-setup.c 2011-11-11 15:19:27.000000000 -0500
6336 -+++ linux-3.1.3/arch/x86/vdso/vdso32-setup.c 2011-11-16 18:39:07.000000000 -0500
6337 +diff -urNp linux-3.1.4/arch/x86/vdso/vdso32-setup.c linux-3.1.4/arch/x86/vdso/vdso32-setup.c
6338 +--- linux-3.1.4/arch/x86/vdso/vdso32-setup.c 2011-11-11 15:19:27.000000000 -0500
6339 ++++ linux-3.1.4/arch/x86/vdso/vdso32-setup.c 2011-11-16 18:39:07.000000000 -0500
6340 @@ -25,6 +25,7 @@
6341 #include <asm/tlbflush.h>
6342 #include <asm/vdso.h>
6343 @@ -22918,9 +23656,9 @@ diff -urNp linux-3.1.3/arch/x86/vdso/vdso32-setup.c linux-3.1.3/arch/x86/vdso/vd
6344 return &gate_vma;
6345 return NULL;
6346 }
6347 -diff -urNp linux-3.1.3/arch/x86/vdso/vma.c linux-3.1.3/arch/x86/vdso/vma.c
6348 ---- linux-3.1.3/arch/x86/vdso/vma.c 2011-11-11 15:19:27.000000000 -0500
6349 -+++ linux-3.1.3/arch/x86/vdso/vma.c 2011-11-16 18:39:07.000000000 -0500
6350 +diff -urNp linux-3.1.4/arch/x86/vdso/vma.c linux-3.1.4/arch/x86/vdso/vma.c
6351 +--- linux-3.1.4/arch/x86/vdso/vma.c 2011-11-11 15:19:27.000000000 -0500
6352 ++++ linux-3.1.4/arch/x86/vdso/vma.c 2011-11-16 18:39:07.000000000 -0500
6353 @@ -16,8 +16,6 @@
6354 #include <asm/vdso.h>
6355 #include <asm/page.h>
6356 @@ -22981,9 +23719,9 @@ diff -urNp linux-3.1.3/arch/x86/vdso/vma.c linux-3.1.3/arch/x86/vdso/vma.c
6357 - return 0;
6358 -}
6359 -__setup("vdso=", vdso_setup);
6360 -diff -urNp linux-3.1.3/arch/x86/xen/enlighten.c linux-3.1.3/arch/x86/xen/enlighten.c
6361 ---- linux-3.1.3/arch/x86/xen/enlighten.c 2011-11-26 19:57:27.000000000 -0500
6362 -+++ linux-3.1.3/arch/x86/xen/enlighten.c 2011-11-26 19:58:40.000000000 -0500
6363 +diff -urNp linux-3.1.4/arch/x86/xen/enlighten.c linux-3.1.4/arch/x86/xen/enlighten.c
6364 +--- linux-3.1.4/arch/x86/xen/enlighten.c 2011-11-26 19:57:27.000000000 -0500
6365 ++++ linux-3.1.4/arch/x86/xen/enlighten.c 2011-11-26 19:58:40.000000000 -0500
6366 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
6367
6368 struct shared_info xen_dummy_shared_info;
6369 @@ -23056,9 +23794,9 @@ diff -urNp linux-3.1.3/arch/x86/xen/enlighten.c linux-3.1.3/arch/x86/xen/enlight
6370 xen_smp_init();
6371
6372 #ifdef CONFIG_ACPI_NUMA
6373 -diff -urNp linux-3.1.3/arch/x86/xen/mmu.c linux-3.1.3/arch/x86/xen/mmu.c
6374 ---- linux-3.1.3/arch/x86/xen/mmu.c 2011-11-11 15:19:27.000000000 -0500
6375 -+++ linux-3.1.3/arch/x86/xen/mmu.c 2011-11-16 18:39:07.000000000 -0500
6376 +diff -urNp linux-3.1.4/arch/x86/xen/mmu.c linux-3.1.4/arch/x86/xen/mmu.c
6377 +--- linux-3.1.4/arch/x86/xen/mmu.c 2011-11-11 15:19:27.000000000 -0500
6378 ++++ linux-3.1.4/arch/x86/xen/mmu.c 2011-11-16 18:39:07.000000000 -0500
6379 @@ -1768,6 +1768,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
6380 convert_pfn_mfn(init_level4_pgt);
6381 convert_pfn_mfn(level3_ident_pgt);
6382 @@ -23095,9 +23833,9 @@ diff -urNp linux-3.1.3/arch/x86/xen/mmu.c linux-3.1.3/arch/x86/xen/mmu.c
6383
6384 .alloc_pud = xen_alloc_pmd_init,
6385 .release_pud = xen_release_pmd_init,
6386 -diff -urNp linux-3.1.3/arch/x86/xen/smp.c linux-3.1.3/arch/x86/xen/smp.c
6387 ---- linux-3.1.3/arch/x86/xen/smp.c 2011-11-11 15:19:27.000000000 -0500
6388 -+++ linux-3.1.3/arch/x86/xen/smp.c 2011-11-16 18:39:07.000000000 -0500
6389 +diff -urNp linux-3.1.4/arch/x86/xen/smp.c linux-3.1.4/arch/x86/xen/smp.c
6390 +--- linux-3.1.4/arch/x86/xen/smp.c 2011-11-11 15:19:27.000000000 -0500
6391 ++++ linux-3.1.4/arch/x86/xen/smp.c 2011-11-16 18:39:07.000000000 -0500
6392 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
6393 {
6394 BUG_ON(smp_processor_id() != 0);
6395 @@ -23142,9 +23880,9 @@ diff -urNp linux-3.1.3/arch/x86/xen/smp.c linux-3.1.3/arch/x86/xen/smp.c
6396 #endif
6397 xen_setup_runstate_info(cpu);
6398 xen_setup_timer(cpu);
6399 -diff -urNp linux-3.1.3/arch/x86/xen/xen-asm_32.S linux-3.1.3/arch/x86/xen/xen-asm_32.S
6400 ---- linux-3.1.3/arch/x86/xen/xen-asm_32.S 2011-11-11 15:19:27.000000000 -0500
6401 -+++ linux-3.1.3/arch/x86/xen/xen-asm_32.S 2011-11-16 18:39:07.000000000 -0500
6402 +diff -urNp linux-3.1.4/arch/x86/xen/xen-asm_32.S linux-3.1.4/arch/x86/xen/xen-asm_32.S
6403 +--- linux-3.1.4/arch/x86/xen/xen-asm_32.S 2011-11-11 15:19:27.000000000 -0500
6404 ++++ linux-3.1.4/arch/x86/xen/xen-asm_32.S 2011-11-16 18:39:07.000000000 -0500
6405 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
6406 ESP_OFFSET=4 # bytes pushed onto stack
6407
6408 @@ -23166,9 +23904,9 @@ diff -urNp linux-3.1.3/arch/x86/xen/xen-asm_32.S linux-3.1.3/arch/x86/xen/xen-as
6409 #else
6410 movl xen_vcpu, %eax
6411 #endif
6412 -diff -urNp linux-3.1.3/arch/x86/xen/xen-head.S linux-3.1.3/arch/x86/xen/xen-head.S
6413 ---- linux-3.1.3/arch/x86/xen/xen-head.S 2011-11-11 15:19:27.000000000 -0500
6414 -+++ linux-3.1.3/arch/x86/xen/xen-head.S 2011-11-16 18:39:07.000000000 -0500
6415 +diff -urNp linux-3.1.4/arch/x86/xen/xen-head.S linux-3.1.4/arch/x86/xen/xen-head.S
6416 +--- linux-3.1.4/arch/x86/xen/xen-head.S 2011-11-11 15:19:27.000000000 -0500
6417 ++++ linux-3.1.4/arch/x86/xen/xen-head.S 2011-11-16 18:39:07.000000000 -0500
6418 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
6419 #ifdef CONFIG_X86_32
6420 mov %esi,xen_start_info
6421 @@ -23187,9 +23925,9 @@ diff -urNp linux-3.1.3/arch/x86/xen/xen-head.S linux-3.1.3/arch/x86/xen/xen-head
6422 #else
6423 mov %rsi,xen_start_info
6424 mov $init_thread_union+THREAD_SIZE,%rsp
6425 -diff -urNp linux-3.1.3/arch/x86/xen/xen-ops.h linux-3.1.3/arch/x86/xen/xen-ops.h
6426 ---- linux-3.1.3/arch/x86/xen/xen-ops.h 2011-11-11 15:19:27.000000000 -0500
6427 -+++ linux-3.1.3/arch/x86/xen/xen-ops.h 2011-11-16 18:39:07.000000000 -0500
6428 +diff -urNp linux-3.1.4/arch/x86/xen/xen-ops.h linux-3.1.4/arch/x86/xen/xen-ops.h
6429 +--- linux-3.1.4/arch/x86/xen/xen-ops.h 2011-11-11 15:19:27.000000000 -0500
6430 ++++ linux-3.1.4/arch/x86/xen/xen-ops.h 2011-11-16 18:39:07.000000000 -0500
6431 @@ -10,8 +10,6 @@
6432 extern const char xen_hypervisor_callback[];
6433 extern const char xen_failsafe_callback[];
6434 @@ -23199,9 +23937,9 @@ diff -urNp linux-3.1.3/arch/x86/xen/xen-ops.h linux-3.1.3/arch/x86/xen/xen-ops.h
6435 struct trap_info;
6436 void xen_copy_trap_info(struct trap_info *traps);
6437
6438 -diff -urNp linux-3.1.3/block/blk-iopoll.c linux-3.1.3/block/blk-iopoll.c
6439 ---- linux-3.1.3/block/blk-iopoll.c 2011-11-11 15:19:27.000000000 -0500
6440 -+++ linux-3.1.3/block/blk-iopoll.c 2011-11-16 18:39:07.000000000 -0500
6441 +diff -urNp linux-3.1.4/block/blk-iopoll.c linux-3.1.4/block/blk-iopoll.c
6442 +--- linux-3.1.4/block/blk-iopoll.c 2011-11-11 15:19:27.000000000 -0500
6443 ++++ linux-3.1.4/block/blk-iopoll.c 2011-11-16 18:39:07.000000000 -0500
6444 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
6445 }
6446 EXPORT_SYMBOL(blk_iopoll_complete);
6447 @@ -23211,9 +23949,9 @@ diff -urNp linux-3.1.3/block/blk-iopoll.c linux-3.1.3/block/blk-iopoll.c
6448 {
6449 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
6450 int rearm = 0, budget = blk_iopoll_budget;
6451 -diff -urNp linux-3.1.3/block/blk-map.c linux-3.1.3/block/blk-map.c
6452 ---- linux-3.1.3/block/blk-map.c 2011-11-26 19:57:27.000000000 -0500
6453 -+++ linux-3.1.3/block/blk-map.c 2011-11-26 19:58:40.000000000 -0500
6454 +diff -urNp linux-3.1.4/block/blk-map.c linux-3.1.4/block/blk-map.c
6455 +--- linux-3.1.4/block/blk-map.c 2011-11-26 19:57:27.000000000 -0500
6456 ++++ linux-3.1.4/block/blk-map.c 2011-11-26 19:58:40.000000000 -0500
6457 @@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue
6458 if (!len || !kbuf)
6459 return -EINVAL;
6460 @@ -23223,9 +23961,9 @@ diff -urNp linux-3.1.3/block/blk-map.c linux-3.1.3/block/blk-map.c
6461 if (do_copy)
6462 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
6463 else
6464 -diff -urNp linux-3.1.3/block/blk-softirq.c linux-3.1.3/block/blk-softirq.c
6465 ---- linux-3.1.3/block/blk-softirq.c 2011-11-11 15:19:27.000000000 -0500
6466 -+++ linux-3.1.3/block/blk-softirq.c 2011-11-16 18:39:07.000000000 -0500
6467 +diff -urNp linux-3.1.4/block/blk-softirq.c linux-3.1.4/block/blk-softirq.c
6468 +--- linux-3.1.4/block/blk-softirq.c 2011-11-11 15:19:27.000000000 -0500
6469 ++++ linux-3.1.4/block/blk-softirq.c 2011-11-16 18:39:07.000000000 -0500
6470 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
6471 * Softirq action handler - move entries to local list and loop over them
6472 * while passing them to the queue registered handler.
6473 @@ -23235,9 +23973,9 @@ diff -urNp linux-3.1.3/block/blk-softirq.c linux-3.1.3/block/blk-softirq.c
6474 {
6475 struct list_head *cpu_list, local_list;
6476
6477 -diff -urNp linux-3.1.3/block/bsg.c linux-3.1.3/block/bsg.c
6478 ---- linux-3.1.3/block/bsg.c 2011-11-11 15:19:27.000000000 -0500
6479 -+++ linux-3.1.3/block/bsg.c 2011-11-16 18:39:07.000000000 -0500
6480 +diff -urNp linux-3.1.4/block/bsg.c linux-3.1.4/block/bsg.c
6481 +--- linux-3.1.4/block/bsg.c 2011-11-11 15:19:27.000000000 -0500
6482 ++++ linux-3.1.4/block/bsg.c 2011-11-16 18:39:07.000000000 -0500
6483 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
6484 struct sg_io_v4 *hdr, struct bsg_device *bd,
6485 fmode_t has_write_perm)
6486 @@ -23265,9 +24003,9 @@ diff -urNp linux-3.1.3/block/bsg.c linux-3.1.3/block/bsg.c
6487 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
6488 if (blk_verify_command(rq->cmd, has_write_perm))
6489 return -EPERM;
6490 -diff -urNp linux-3.1.3/block/compat_ioctl.c linux-3.1.3/block/compat_ioctl.c
6491 ---- linux-3.1.3/block/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
6492 -+++ linux-3.1.3/block/compat_ioctl.c 2011-11-16 18:39:07.000000000 -0500
6493 +diff -urNp linux-3.1.4/block/compat_ioctl.c linux-3.1.4/block/compat_ioctl.c
6494 +--- linux-3.1.4/block/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
6495 ++++ linux-3.1.4/block/compat_ioctl.c 2011-11-16 18:39:07.000000000 -0500
6496 @@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_
6497 err |= __get_user(f->spec1, &uf->spec1);
6498 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
6499 @@ -23277,9 +24015,9 @@ diff -urNp linux-3.1.3/block/compat_ioctl.c linux-3.1.3/block/compat_ioctl.c
6500 if (err) {
6501 err = -EFAULT;
6502 goto out;
6503 -diff -urNp linux-3.1.3/block/scsi_ioctl.c linux-3.1.3/block/scsi_ioctl.c
6504 ---- linux-3.1.3/block/scsi_ioctl.c 2011-11-11 15:19:27.000000000 -0500
6505 -+++ linux-3.1.3/block/scsi_ioctl.c 2011-11-16 18:39:07.000000000 -0500
6506 +diff -urNp linux-3.1.4/block/scsi_ioctl.c linux-3.1.4/block/scsi_ioctl.c
6507 +--- linux-3.1.4/block/scsi_ioctl.c 2011-11-11 15:19:27.000000000 -0500
6508 ++++ linux-3.1.4/block/scsi_ioctl.c 2011-11-16 18:39:07.000000000 -0500
6509 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
6510 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
6511 struct sg_io_hdr *hdr, fmode_t mode)
6512 @@ -23331,9 +24069,9 @@ diff -urNp linux-3.1.3/block/scsi_ioctl.c linux-3.1.3/block/scsi_ioctl.c
6513 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
6514 goto error;
6515
6516 -diff -urNp linux-3.1.3/crypto/cryptd.c linux-3.1.3/crypto/cryptd.c
6517 ---- linux-3.1.3/crypto/cryptd.c 2011-11-11 15:19:27.000000000 -0500
6518 -+++ linux-3.1.3/crypto/cryptd.c 2011-11-16 18:39:07.000000000 -0500
6519 +diff -urNp linux-3.1.4/crypto/cryptd.c linux-3.1.4/crypto/cryptd.c
6520 +--- linux-3.1.4/crypto/cryptd.c 2011-11-11 15:19:27.000000000 -0500
6521 ++++ linux-3.1.4/crypto/cryptd.c 2011-11-16 18:39:07.000000000 -0500
6522 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
6523
6524 struct cryptd_blkcipher_request_ctx {
6525 @@ -23352,9 +24090,9 @@ diff -urNp linux-3.1.3/crypto/cryptd.c linux-3.1.3/crypto/cryptd.c
6526
6527 static void cryptd_queue_worker(struct work_struct *work);
6528
6529 -diff -urNp linux-3.1.3/crypto/serpent.c linux-3.1.3/crypto/serpent.c
6530 ---- linux-3.1.3/crypto/serpent.c 2011-11-11 15:19:27.000000000 -0500
6531 -+++ linux-3.1.3/crypto/serpent.c 2011-11-16 18:40:10.000000000 -0500
6532 +diff -urNp linux-3.1.4/crypto/serpent.c linux-3.1.4/crypto/serpent.c
6533 +--- linux-3.1.4/crypto/serpent.c 2011-11-11 15:19:27.000000000 -0500
6534 ++++ linux-3.1.4/crypto/serpent.c 2011-11-16 18:40:10.000000000 -0500
6535 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
6536 u32 r0,r1,r2,r3,r4;
6537 int i;
6538 @@ -23364,9 +24102,9 @@ diff -urNp linux-3.1.3/crypto/serpent.c linux-3.1.3/crypto/serpent.c
6539 /* Copy key, add padding */
6540
6541 for (i = 0; i < keylen; ++i)
6542 -diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6543 ---- linux-3.1.3/Documentation/dontdiff 2011-11-11 15:19:27.000000000 -0500
6544 -+++ linux-3.1.3/Documentation/dontdiff 2011-11-16 18:39:07.000000000 -0500
6545 +diff -urNp linux-3.1.4/Documentation/dontdiff linux-3.1.4/Documentation/dontdiff
6546 +--- linux-3.1.4/Documentation/dontdiff 2011-11-11 15:19:27.000000000 -0500
6547 ++++ linux-3.1.4/Documentation/dontdiff 2011-12-02 17:38:47.000000000 -0500
6548 @@ -5,6 +5,7 @@
6549 *.cis
6550 *.cpio
6551 @@ -23375,7 +24113,15 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6552 *.dsp
6553 *.dvi
6554 *.elf
6555 -@@ -48,9 +49,11 @@
6556 +@@ -14,6 +15,7 @@
6557 + *.gcov
6558 + *.gen.S
6559 + *.gif
6560 ++*.gmo
6561 + *.grep
6562 + *.grp
6563 + *.gz
6564 +@@ -48,9 +50,11 @@
6565 *.tab.h
6566 *.tex
6567 *.ver
6568 @@ -23387,7 +24133,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6569 *_vga16.c
6570 *~
6571 \#*#
6572 -@@ -70,6 +73,7 @@ Kerntypes
6573 +@@ -70,6 +74,7 @@ Kerntypes
6574 Module.markers
6575 Module.symvers
6576 PENDING
6577 @@ -23395,7 +24141,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6578 SCCS
6579 System.map*
6580 TAGS
6581 -@@ -93,19 +97,24 @@ bounds.h
6582 +@@ -93,19 +98,24 @@ bounds.h
6583 bsetup
6584 btfixupprep
6585 build
6586 @@ -23420,7 +24166,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6587 conmakehash
6588 consolemap_deftbl.c*
6589 cpustr.h
6590 -@@ -119,6 +128,7 @@ dslm
6591 +@@ -119,6 +129,7 @@ dslm
6592 elf2ecoff
6593 elfconfig.h*
6594 evergreen_reg_safe.h
6595 @@ -23428,7 +24174,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6596 fixdep
6597 flask.h
6598 fore200e_mkfirm
6599 -@@ -126,12 +136,14 @@ fore200e_pca_fw.c*
6600 +@@ -126,12 +137,15 @@ fore200e_pca_fw.c*
6601 gconf
6602 gconf.glade.h
6603 gen-devlist
6604 @@ -23440,10 +24186,11 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6605 genksyms
6606 *_gray256.c
6607 +hash
6608 ++hid-example
6609 hpet_example
6610 hugepage-mmap
6611 hugepage-shm
6612 -@@ -146,7 +158,7 @@ int32.c
6613 +@@ -146,7 +160,7 @@ int32.c
6614 int4.c
6615 int8.c
6616 kallsyms
6617 @@ -23452,7 +24199,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6618 keywords.c
6619 ksym.c*
6620 ksym.h*
6621 -@@ -154,7 +166,6 @@ kxgettext
6622 +@@ -154,7 +168,6 @@ kxgettext
6623 lkc_defs.h
6624 lex.c
6625 lex.*.c
6626 @@ -23460,15 +24207,16 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6627 logo_*.c
6628 logo_*_clut224.c
6629 logo_*_mono.c
6630 -@@ -166,7 +177,6 @@ machtypes.h
6631 +@@ -166,14 +179,15 @@ machtypes.h
6632 map
6633 map_hugetlb
6634 maui_boot.h
6635 -media
6636 mconf
6637 ++mdp
6638 miboot*
6639 mk_elfconfig
6640 -@@ -174,6 +184,7 @@ mkboot
6641 + mkboot
6642 mkbugboot
6643 mkcpustr
6644 mkdep
6645 @@ -23476,7 +24224,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6646 mkprep
6647 mkregtable
6648 mktables
6649 -@@ -209,6 +220,7 @@ r300_reg_safe.h
6650 +@@ -209,6 +223,7 @@ r300_reg_safe.h
6651 r420_reg_safe.h
6652 r600_reg_safe.h
6653 recordmcount
6654 @@ -23484,7 +24232,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6655 relocs
6656 rlim_names.h
6657 rn50_reg_safe.h
6658 -@@ -219,6 +231,7 @@ setup
6659 +@@ -219,6 +234,7 @@ setup
6660 setup.bin
6661 setup.elf
6662 sImage
6663 @@ -23492,7 +24240,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6664 sm_tbl*
6665 split-include
6666 syscalltab.h
6667 -@@ -229,6 +242,7 @@ tftpboot.img
6668 +@@ -229,6 +245,7 @@ tftpboot.img
6669 timeconst.h
6670 times.h*
6671 trix_boot.h
6672 @@ -23500,7 +24248,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6673 utsrelease.h*
6674 vdso-syms.lds
6675 vdso.lds
6676 -@@ -246,7 +260,9 @@ vmlinux
6677 +@@ -246,7 +263,9 @@ vmlinux
6678 vmlinux-*
6679 vmlinux.aout
6680 vmlinux.bin.all
6681 @@ -23510,7 +24258,7 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6682 vmlinuz
6683 voffset.h
6684 vsyscall.lds
6685 -@@ -254,9 +270,11 @@ vsyscall_32.lds
6686 +@@ -254,9 +273,11 @@ vsyscall_32.lds
6687 wanxlfw.inc
6688 uImage
6689 unifdef
6690 @@ -23522,9 +24270,9 @@ diff -urNp linux-3.1.3/Documentation/dontdiff linux-3.1.3/Documentation/dontdiff
6691 zconf.hash.c
6692 +zconf.lex.c
6693 zoffset.h
6694 -diff -urNp linux-3.1.3/Documentation/kernel-parameters.txt linux-3.1.3/Documentation/kernel-parameters.txt
6695 ---- linux-3.1.3/Documentation/kernel-parameters.txt 2011-11-11 15:19:27.000000000 -0500
6696 -+++ linux-3.1.3/Documentation/kernel-parameters.txt 2011-11-16 18:39:07.000000000 -0500
6697 +diff -urNp linux-3.1.4/Documentation/kernel-parameters.txt linux-3.1.4/Documentation/kernel-parameters.txt
6698 +--- linux-3.1.4/Documentation/kernel-parameters.txt 2011-11-11 15:19:27.000000000 -0500
6699 ++++ linux-3.1.4/Documentation/kernel-parameters.txt 2011-11-16 18:39:07.000000000 -0500
6700 @@ -1898,6 +1898,13 @@ bytes respectively. Such letter suffixes
6701 the specified number of seconds. This is to be used if
6702 your oopses keep scrolling off the screen.
6703 @@ -23539,9 +24287,9 @@ diff -urNp linux-3.1.3/Documentation/kernel-parameters.txt linux-3.1.3/Documenta
6704 pcbit= [HW,ISDN]
6705
6706 pcd. [PARIDE]
6707 -diff -urNp linux-3.1.3/drivers/acpi/apei/cper.c linux-3.1.3/drivers/acpi/apei/cper.c
6708 ---- linux-3.1.3/drivers/acpi/apei/cper.c 2011-11-11 15:19:27.000000000 -0500
6709 -+++ linux-3.1.3/drivers/acpi/apei/cper.c 2011-11-16 18:39:07.000000000 -0500
6710 +diff -urNp linux-3.1.4/drivers/acpi/apei/cper.c linux-3.1.4/drivers/acpi/apei/cper.c
6711 +--- linux-3.1.4/drivers/acpi/apei/cper.c 2011-11-11 15:19:27.000000000 -0500
6712 ++++ linux-3.1.4/drivers/acpi/apei/cper.c 2011-11-16 18:39:07.000000000 -0500
6713 @@ -38,12 +38,12 @@
6714 */
6715 u64 cper_next_record_id(void)
6716 @@ -23559,9 +24307,9 @@ diff -urNp linux-3.1.3/drivers/acpi/apei/cper.c linux-3.1.3/drivers/acpi/apei/cp
6717 }
6718 EXPORT_SYMBOL_GPL(cper_next_record_id);
6719
6720 -diff -urNp linux-3.1.3/drivers/acpi/ec_sys.c linux-3.1.3/drivers/acpi/ec_sys.c
6721 ---- linux-3.1.3/drivers/acpi/ec_sys.c 2011-11-11 15:19:27.000000000 -0500
6722 -+++ linux-3.1.3/drivers/acpi/ec_sys.c 2011-11-16 18:39:07.000000000 -0500
6723 +diff -urNp linux-3.1.4/drivers/acpi/ec_sys.c linux-3.1.4/drivers/acpi/ec_sys.c
6724 +--- linux-3.1.4/drivers/acpi/ec_sys.c 2011-11-11 15:19:27.000000000 -0500
6725 ++++ linux-3.1.4/drivers/acpi/ec_sys.c 2011-11-16 18:39:07.000000000 -0500
6726 @@ -11,6 +11,7 @@
6727 #include <linux/kernel.h>
6728 #include <linux/acpi.h>
6729 @@ -23611,9 +24359,9 @@ diff -urNp linux-3.1.3/drivers/acpi/ec_sys.c linux-3.1.3/drivers/acpi/ec_sys.c
6730 err = ec_write(*off, byte_write);
6731 if (err)
6732 return err;
6733 -diff -urNp linux-3.1.3/drivers/acpi/proc.c linux-3.1.3/drivers/acpi/proc.c
6734 ---- linux-3.1.3/drivers/acpi/proc.c 2011-11-11 15:19:27.000000000 -0500
6735 -+++ linux-3.1.3/drivers/acpi/proc.c 2011-11-16 18:39:07.000000000 -0500
6736 +diff -urNp linux-3.1.4/drivers/acpi/proc.c linux-3.1.4/drivers/acpi/proc.c
6737 +--- linux-3.1.4/drivers/acpi/proc.c 2011-11-11 15:19:27.000000000 -0500
6738 ++++ linux-3.1.4/drivers/acpi/proc.c 2011-11-16 18:39:07.000000000 -0500
6739 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
6740 size_t count, loff_t * ppos)
6741 {
6742 @@ -23648,9 +24396,9 @@ diff -urNp linux-3.1.3/drivers/acpi/proc.c linux-3.1.3/drivers/acpi/proc.c
6743 if (device_can_wakeup(&dev->dev)) {
6744 bool enable = !device_may_wakeup(&dev->dev);
6745 device_set_wakeup_enable(&dev->dev, enable);
6746 -diff -urNp linux-3.1.3/drivers/acpi/processor_driver.c linux-3.1.3/drivers/acpi/processor_driver.c
6747 ---- linux-3.1.3/drivers/acpi/processor_driver.c 2011-11-11 15:19:27.000000000 -0500
6748 -+++ linux-3.1.3/drivers/acpi/processor_driver.c 2011-11-16 18:39:07.000000000 -0500
6749 +diff -urNp linux-3.1.4/drivers/acpi/processor_driver.c linux-3.1.4/drivers/acpi/processor_driver.c
6750 +--- linux-3.1.4/drivers/acpi/processor_driver.c 2011-11-11 15:19:27.000000000 -0500
6751 ++++ linux-3.1.4/drivers/acpi/processor_driver.c 2011-11-16 18:39:07.000000000 -0500
6752 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
6753 return 0;
6754 #endif
6755 @@ -23660,9 +24408,9 @@ diff -urNp linux-3.1.3/drivers/acpi/processor_driver.c linux-3.1.3/drivers/acpi/
6756
6757 /*
6758 * Buggy BIOS check
6759 -diff -urNp linux-3.1.3/drivers/ata/libata-core.c linux-3.1.3/drivers/ata/libata-core.c
6760 ---- linux-3.1.3/drivers/ata/libata-core.c 2011-11-11 15:19:27.000000000 -0500
6761 -+++ linux-3.1.3/drivers/ata/libata-core.c 2011-11-16 18:39:07.000000000 -0500
6762 +diff -urNp linux-3.1.4/drivers/ata/libata-core.c linux-3.1.4/drivers/ata/libata-core.c
6763 +--- linux-3.1.4/drivers/ata/libata-core.c 2011-11-11 15:19:27.000000000 -0500
6764 ++++ linux-3.1.4/drivers/ata/libata-core.c 2011-11-16 18:39:07.000000000 -0500
6765 @@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *
6766 struct ata_port *ap;
6767 unsigned int tag;
6768 @@ -23700,9 +24448,9 @@ diff -urNp linux-3.1.3/drivers/ata/libata-core.c linux-3.1.3/drivers/ata/libata-
6769 spin_unlock(&lock);
6770 }
6771
6772 -diff -urNp linux-3.1.3/drivers/ata/libata-eh.c linux-3.1.3/drivers/ata/libata-eh.c
6773 ---- linux-3.1.3/drivers/ata/libata-eh.c 2011-11-11 15:19:27.000000000 -0500
6774 -+++ linux-3.1.3/drivers/ata/libata-eh.c 2011-11-16 18:40:10.000000000 -0500
6775 +diff -urNp linux-3.1.4/drivers/ata/libata-eh.c linux-3.1.4/drivers/ata/libata-eh.c
6776 +--- linux-3.1.4/drivers/ata/libata-eh.c 2011-11-11 15:19:27.000000000 -0500
6777 ++++ linux-3.1.4/drivers/ata/libata-eh.c 2011-11-16 18:40:10.000000000 -0500
6778 @@ -2515,6 +2515,8 @@ void ata_eh_report(struct ata_port *ap)
6779 {
6780 struct ata_link *link;
6781 @@ -23712,9 +24460,9 @@ diff -urNp linux-3.1.3/drivers/ata/libata-eh.c linux-3.1.3/drivers/ata/libata-eh
6782 ata_for_each_link(link, ap, HOST_FIRST)
6783 ata_eh_link_report(link);
6784 }
6785 -diff -urNp linux-3.1.3/drivers/ata/pata_arasan_cf.c linux-3.1.3/drivers/ata/pata_arasan_cf.c
6786 ---- linux-3.1.3/drivers/ata/pata_arasan_cf.c 2011-11-11 15:19:27.000000000 -0500
6787 -+++ linux-3.1.3/drivers/ata/pata_arasan_cf.c 2011-11-16 18:39:07.000000000 -0500
6788 +diff -urNp linux-3.1.4/drivers/ata/pata_arasan_cf.c linux-3.1.4/drivers/ata/pata_arasan_cf.c
6789 +--- linux-3.1.4/drivers/ata/pata_arasan_cf.c 2011-11-11 15:19:27.000000000 -0500
6790 ++++ linux-3.1.4/drivers/ata/pata_arasan_cf.c 2011-11-16 18:39:07.000000000 -0500
6791 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
6792 /* Handle platform specific quirks */
6793 if (pdata->quirk) {
6794 @@ -23726,9 +24474,9 @@ diff -urNp linux-3.1.3/drivers/ata/pata_arasan_cf.c linux-3.1.3/drivers/ata/pata
6795 ap->pio_mask = 0;
6796 }
6797 if (pdata->quirk & CF_BROKEN_MWDMA)
6798 -diff -urNp linux-3.1.3/drivers/atm/adummy.c linux-3.1.3/drivers/atm/adummy.c
6799 ---- linux-3.1.3/drivers/atm/adummy.c 2011-11-11 15:19:27.000000000 -0500
6800 -+++ linux-3.1.3/drivers/atm/adummy.c 2011-11-16 18:39:07.000000000 -0500
6801 +diff -urNp linux-3.1.4/drivers/atm/adummy.c linux-3.1.4/drivers/atm/adummy.c
6802 +--- linux-3.1.4/drivers/atm/adummy.c 2011-11-11 15:19:27.000000000 -0500
6803 ++++ linux-3.1.4/drivers/atm/adummy.c 2011-11-16 18:39:07.000000000 -0500
6804 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct
6805 vcc->pop(vcc, skb);
6806 else
6807 @@ -23738,9 +24486,9 @@ diff -urNp linux-3.1.3/drivers/atm/adummy.c linux-3.1.3/drivers/atm/adummy.c
6808
6809 return 0;
6810 }
6811 -diff -urNp linux-3.1.3/drivers/atm/ambassador.c linux-3.1.3/drivers/atm/ambassador.c
6812 ---- linux-3.1.3/drivers/atm/ambassador.c 2011-11-11 15:19:27.000000000 -0500
6813 -+++ linux-3.1.3/drivers/atm/ambassador.c 2011-11-16 18:39:07.000000000 -0500
6814 +diff -urNp linux-3.1.4/drivers/atm/ambassador.c linux-3.1.4/drivers/atm/ambassador.c
6815 +--- linux-3.1.4/drivers/atm/ambassador.c 2011-11-11 15:19:27.000000000 -0500
6816 ++++ linux-3.1.4/drivers/atm/ambassador.c 2011-11-16 18:39:07.000000000 -0500
6817 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
6818 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
6819
6820 @@ -23777,9 +24525,9 @@ diff -urNp linux-3.1.3/drivers/atm/ambassador.c linux-3.1.3/drivers/atm/ambassad
6821 return -ENOMEM; // ?
6822 }
6823
6824 -diff -urNp linux-3.1.3/drivers/atm/atmtcp.c linux-3.1.3/drivers/atm/atmtcp.c
6825 ---- linux-3.1.3/drivers/atm/atmtcp.c 2011-11-11 15:19:27.000000000 -0500
6826 -+++ linux-3.1.3/drivers/atm/atmtcp.c 2011-11-16 18:39:07.000000000 -0500
6827 +diff -urNp linux-3.1.4/drivers/atm/atmtcp.c linux-3.1.4/drivers/atm/atmtcp.c
6828 +--- linux-3.1.4/drivers/atm/atmtcp.c 2011-11-11 15:19:27.000000000 -0500
6829 ++++ linux-3.1.4/drivers/atm/atmtcp.c 2011-11-16 18:39:07.000000000 -0500
6830 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc
6831 if (vcc->pop) vcc->pop(vcc,skb);
6832 else dev_kfree_skb(skb);
6833 @@ -23829,9 +24577,9 @@ diff -urNp linux-3.1.3/drivers/atm/atmtcp.c linux-3.1.3/drivers/atm/atmtcp.c
6834 done:
6835 if (vcc->pop) vcc->pop(vcc,skb);
6836 else dev_kfree_skb(skb);
6837 -diff -urNp linux-3.1.3/drivers/atm/eni.c linux-3.1.3/drivers/atm/eni.c
6838 ---- linux-3.1.3/drivers/atm/eni.c 2011-11-11 15:19:27.000000000 -0500
6839 -+++ linux-3.1.3/drivers/atm/eni.c 2011-11-16 18:39:07.000000000 -0500
6840 +diff -urNp linux-3.1.4/drivers/atm/eni.c linux-3.1.4/drivers/atm/eni.c
6841 +--- linux-3.1.4/drivers/atm/eni.c 2011-11-11 15:19:27.000000000 -0500
6842 ++++ linux-3.1.4/drivers/atm/eni.c 2011-11-16 18:39:07.000000000 -0500
6843 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
6844 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
6845 vcc->dev->number);
6846 @@ -23886,9 +24634,9 @@ diff -urNp linux-3.1.3/drivers/atm/eni.c linux-3.1.3/drivers/atm/eni.c
6847 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
6848 "UTP", "05?", "06?", "07?", /* 4- 7 */
6849 "TAXI","09?", "10?", "11?", /* 8-11 */
6850 -diff -urNp linux-3.1.3/drivers/atm/firestream.c linux-3.1.3/drivers/atm/firestream.c
6851 ---- linux-3.1.3/drivers/atm/firestream.c 2011-11-11 15:19:27.000000000 -0500
6852 -+++ linux-3.1.3/drivers/atm/firestream.c 2011-11-16 18:39:07.000000000 -0500
6853 +diff -urNp linux-3.1.4/drivers/atm/firestream.c linux-3.1.4/drivers/atm/firestream.c
6854 +--- linux-3.1.4/drivers/atm/firestream.c 2011-11-11 15:19:27.000000000 -0500
6855 ++++ linux-3.1.4/drivers/atm/firestream.c 2011-11-16 18:39:07.000000000 -0500
6856 @@ -750,7 +750,7 @@ static void process_txdone_queue (struct
6857 }
6858 }
6859 @@ -23922,9 +24670,9 @@ diff -urNp linux-3.1.3/drivers/atm/firestream.c linux-3.1.3/drivers/atm/firestre
6860 break;
6861 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
6862 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
6863 -diff -urNp linux-3.1.3/drivers/atm/fore200e.c linux-3.1.3/drivers/atm/fore200e.c
6864 ---- linux-3.1.3/drivers/atm/fore200e.c 2011-11-11 15:19:27.000000000 -0500
6865 -+++ linux-3.1.3/drivers/atm/fore200e.c 2011-11-16 18:39:07.000000000 -0500
6866 +diff -urNp linux-3.1.4/drivers/atm/fore200e.c linux-3.1.4/drivers/atm/fore200e.c
6867 +--- linux-3.1.4/drivers/atm/fore200e.c 2011-11-11 15:19:27.000000000 -0500
6868 ++++ linux-3.1.4/drivers/atm/fore200e.c 2011-11-16 18:39:07.000000000 -0500
6869 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
6870 #endif
6871 /* check error condition */
6872 @@ -23981,9 +24729,9 @@ diff -urNp linux-3.1.3/drivers/atm/fore200e.c linux-3.1.3/drivers/atm/fore200e.c
6873
6874 fore200e->tx_sat++;
6875 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
6876 -diff -urNp linux-3.1.3/drivers/atm/he.c linux-3.1.3/drivers/atm/he.c
6877 ---- linux-3.1.3/drivers/atm/he.c 2011-11-11 15:19:27.000000000 -0500
6878 -+++ linux-3.1.3/drivers/atm/he.c 2011-11-16 18:39:07.000000000 -0500
6879 +diff -urNp linux-3.1.4/drivers/atm/he.c linux-3.1.4/drivers/atm/he.c
6880 +--- linux-3.1.4/drivers/atm/he.c 2011-11-11 15:19:27.000000000 -0500
6881 ++++ linux-3.1.4/drivers/atm/he.c 2011-11-16 18:39:07.000000000 -0500
6882 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
6883
6884 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
6885 @@ -24065,9 +24813,9 @@ diff -urNp linux-3.1.3/drivers/atm/he.c linux-3.1.3/drivers/atm/he.c
6886
6887 return 0;
6888 }
6889 -diff -urNp linux-3.1.3/drivers/atm/horizon.c linux-3.1.3/drivers/atm/horizon.c
6890 ---- linux-3.1.3/drivers/atm/horizon.c 2011-11-11 15:19:27.000000000 -0500
6891 -+++ linux-3.1.3/drivers/atm/horizon.c 2011-11-16 18:39:07.000000000 -0500
6892 +diff -urNp linux-3.1.4/drivers/atm/horizon.c linux-3.1.4/drivers/atm/horizon.c
6893 +--- linux-3.1.4/drivers/atm/horizon.c 2011-11-11 15:19:27.000000000 -0500
6894 ++++ linux-3.1.4/drivers/atm/horizon.c 2011-11-16 18:39:07.000000000 -0500
6895 @@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev,
6896 {
6897 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
6898 @@ -24086,9 +24834,9 @@ diff -urNp linux-3.1.3/drivers/atm/horizon.c linux-3.1.3/drivers/atm/horizon.c
6899
6900 // free the skb
6901 hrz_kfree_skb (skb);
6902 -diff -urNp linux-3.1.3/drivers/atm/idt77252.c linux-3.1.3/drivers/atm/idt77252.c
6903 ---- linux-3.1.3/drivers/atm/idt77252.c 2011-11-11 15:19:27.000000000 -0500
6904 -+++ linux-3.1.3/drivers/atm/idt77252.c 2011-11-16 18:39:07.000000000 -0500
6905 +diff -urNp linux-3.1.4/drivers/atm/idt77252.c linux-3.1.4/drivers/atm/idt77252.c
6906 +--- linux-3.1.4/drivers/atm/idt77252.c 2011-11-11 15:19:27.000000000 -0500
6907 ++++ linux-3.1.4/drivers/atm/idt77252.c 2011-11-16 18:39:07.000000000 -0500
6908 @@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, str
6909 else
6910 dev_kfree_skb(skb);
6911 @@ -24243,9 +24991,9 @@ diff -urNp linux-3.1.3/drivers/atm/idt77252.c linux-3.1.3/drivers/atm/idt77252.c
6912 return -ENOMEM;
6913 }
6914 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
6915 -diff -urNp linux-3.1.3/drivers/atm/iphase.c linux-3.1.3/drivers/atm/iphase.c
6916 ---- linux-3.1.3/drivers/atm/iphase.c 2011-11-11 15:19:27.000000000 -0500
6917 -+++ linux-3.1.3/drivers/atm/iphase.c 2011-11-16 18:39:07.000000000 -0500
6918 +diff -urNp linux-3.1.4/drivers/atm/iphase.c linux-3.1.4/drivers/atm/iphase.c
6919 +--- linux-3.1.4/drivers/atm/iphase.c 2011-11-11 15:19:27.000000000 -0500
6920 ++++ linux-3.1.4/drivers/atm/iphase.c 2011-11-16 18:39:07.000000000 -0500
6921 @@ -1121,7 +1121,7 @@ static int rx_pkt(struct atm_dev *dev)
6922 status = (u_short) (buf_desc_ptr->desc_mode);
6923 if (status & (RX_CER | RX_PTE | RX_OFL))
6924 @@ -24342,9 +25090,9 @@ diff -urNp linux-3.1.3/drivers/atm/iphase.c linux-3.1.3/drivers/atm/iphase.c
6925 if (iavcc->vc_desc_cnt > 10) {
6926 vcc->tx_quota = vcc->tx_quota * 3 / 4;
6927 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
6928 -diff -urNp linux-3.1.3/drivers/atm/lanai.c linux-3.1.3/drivers/atm/lanai.c
6929 ---- linux-3.1.3/drivers/atm/lanai.c 2011-11-11 15:19:27.000000000 -0500
6930 -+++ linux-3.1.3/drivers/atm/lanai.c 2011-11-16 18:39:07.000000000 -0500
6931 +diff -urNp linux-3.1.4/drivers/atm/lanai.c linux-3.1.4/drivers/atm/lanai.c
6932 +--- linux-3.1.4/drivers/atm/lanai.c 2011-11-11 15:19:27.000000000 -0500
6933 ++++ linux-3.1.4/drivers/atm/lanai.c 2011-11-16 18:39:07.000000000 -0500
6934 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
6935 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
6936 lanai_endtx(lanai, lvcc);
6937 @@ -24399,9 +25147,9 @@ diff -urNp linux-3.1.3/drivers/atm/lanai.c linux-3.1.3/drivers/atm/lanai.c
6938 lvcc->stats.x.aal5.service_rxcrc++;
6939 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
6940 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
6941 -diff -urNp linux-3.1.3/drivers/atm/nicstar.c linux-3.1.3/drivers/atm/nicstar.c
6942 ---- linux-3.1.3/drivers/atm/nicstar.c 2011-11-11 15:19:27.000000000 -0500
6943 -+++ linux-3.1.3/drivers/atm/nicstar.c 2011-11-16 18:39:07.000000000 -0500
6944 +diff -urNp linux-3.1.4/drivers/atm/nicstar.c linux-3.1.4/drivers/atm/nicstar.c
6945 +--- linux-3.1.4/drivers/atm/nicstar.c 2011-11-11 15:19:27.000000000 -0500
6946 ++++ linux-3.1.4/drivers/atm/nicstar.c 2011-11-16 18:39:07.000000000 -0500
6947 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc,
6948 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
6949 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
6950 @@ -24603,9 +25351,9 @@ diff -urNp linux-3.1.3/drivers/atm/nicstar.c linux-3.1.3/drivers/atm/nicstar.c
6951 }
6952 }
6953
6954 -diff -urNp linux-3.1.3/drivers/atm/solos-pci.c linux-3.1.3/drivers/atm/solos-pci.c
6955 ---- linux-3.1.3/drivers/atm/solos-pci.c 2011-11-11 15:19:27.000000000 -0500
6956 -+++ linux-3.1.3/drivers/atm/solos-pci.c 2011-11-16 18:40:10.000000000 -0500
6957 +diff -urNp linux-3.1.4/drivers/atm/solos-pci.c linux-3.1.4/drivers/atm/solos-pci.c
6958 +--- linux-3.1.4/drivers/atm/solos-pci.c 2011-11-11 15:19:27.000000000 -0500
6959 ++++ linux-3.1.4/drivers/atm/solos-pci.c 2011-11-16 18:40:10.000000000 -0500
6960 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
6961 }
6962 atm_charge(vcc, skb->truesize);
6963 @@ -24633,9 +25381,9 @@ diff -urNp linux-3.1.3/drivers/atm/solos-pci.c linux-3.1.3/drivers/atm/solos-pci
6964 solos_pop(vcc, oldskb);
6965 } else
6966 dev_kfree_skb_irq(oldskb);
6967 -diff -urNp linux-3.1.3/drivers/atm/suni.c linux-3.1.3/drivers/atm/suni.c
6968 ---- linux-3.1.3/drivers/atm/suni.c 2011-11-11 15:19:27.000000000 -0500
6969 -+++ linux-3.1.3/drivers/atm/suni.c 2011-11-16 18:39:07.000000000 -0500
6970 +diff -urNp linux-3.1.4/drivers/atm/suni.c linux-3.1.4/drivers/atm/suni.c
6971 +--- linux-3.1.4/drivers/atm/suni.c 2011-11-11 15:19:27.000000000 -0500
6972 ++++ linux-3.1.4/drivers/atm/suni.c 2011-11-16 18:39:07.000000000 -0500
6973 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
6974
6975
6976 @@ -24647,9 +25395,9 @@ diff -urNp linux-3.1.3/drivers/atm/suni.c linux-3.1.3/drivers/atm/suni.c
6977
6978
6979 static void suni_hz(unsigned long from_timer)
6980 -diff -urNp linux-3.1.3/drivers/atm/uPD98402.c linux-3.1.3/drivers/atm/uPD98402.c
6981 ---- linux-3.1.3/drivers/atm/uPD98402.c 2011-11-11 15:19:27.000000000 -0500
6982 -+++ linux-3.1.3/drivers/atm/uPD98402.c 2011-11-16 18:39:07.000000000 -0500
6983 +diff -urNp linux-3.1.4/drivers/atm/uPD98402.c linux-3.1.4/drivers/atm/uPD98402.c
6984 +--- linux-3.1.4/drivers/atm/uPD98402.c 2011-11-11 15:19:27.000000000 -0500
6985 ++++ linux-3.1.4/drivers/atm/uPD98402.c 2011-11-16 18:39:07.000000000 -0500
6986 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
6987 struct sonet_stats tmp;
6988 int error = 0;
6989 @@ -24694,9 +25442,9 @@ diff -urNp linux-3.1.3/drivers/atm/uPD98402.c linux-3.1.3/drivers/atm/uPD98402.c
6990 return 0;
6991 }
6992
6993 -diff -urNp linux-3.1.3/drivers/atm/zatm.c linux-3.1.3/drivers/atm/zatm.c
6994 ---- linux-3.1.3/drivers/atm/zatm.c 2011-11-11 15:19:27.000000000 -0500
6995 -+++ linux-3.1.3/drivers/atm/zatm.c 2011-11-16 18:39:07.000000000 -0500
6996 +diff -urNp linux-3.1.4/drivers/atm/zatm.c linux-3.1.4/drivers/atm/zatm.c
6997 +--- linux-3.1.4/drivers/atm/zatm.c 2011-11-11 15:19:27.000000000 -0500
6998 ++++ linux-3.1.4/drivers/atm/zatm.c 2011-11-16 18:39:07.000000000 -0500
6999 @@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
7000 }
7001 if (!size) {
7002 @@ -24724,9 +25472,9 @@ diff -urNp linux-3.1.3/drivers/atm/zatm.c linux-3.1.3/drivers/atm/zatm.c
7003 wake_up(&zatm_vcc->tx_wait);
7004 }
7005
7006 -diff -urNp linux-3.1.3/drivers/base/devtmpfs.c linux-3.1.3/drivers/base/devtmpfs.c
7007 ---- linux-3.1.3/drivers/base/devtmpfs.c 2011-11-11 15:19:27.000000000 -0500
7008 -+++ linux-3.1.3/drivers/base/devtmpfs.c 2011-11-16 18:39:07.000000000 -0500
7009 +diff -urNp linux-3.1.4/drivers/base/devtmpfs.c linux-3.1.4/drivers/base/devtmpfs.c
7010 +--- linux-3.1.4/drivers/base/devtmpfs.c 2011-11-11 15:19:27.000000000 -0500
7011 ++++ linux-3.1.4/drivers/base/devtmpfs.c 2011-11-16 18:39:07.000000000 -0500
7012 @@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
7013 if (!thread)
7014 return 0;
7015 @@ -24736,9 +25484,9 @@ diff -urNp linux-3.1.3/drivers/base/devtmpfs.c linux-3.1.3/drivers/base/devtmpfs
7016 if (err)
7017 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
7018 else
7019 -diff -urNp linux-3.1.3/drivers/base/power/wakeup.c linux-3.1.3/drivers/base/power/wakeup.c
7020 ---- linux-3.1.3/drivers/base/power/wakeup.c 2011-11-11 15:19:27.000000000 -0500
7021 -+++ linux-3.1.3/drivers/base/power/wakeup.c 2011-11-16 18:39:07.000000000 -0500
7022 +diff -urNp linux-3.1.4/drivers/base/power/wakeup.c linux-3.1.4/drivers/base/power/wakeup.c
7023 +--- linux-3.1.4/drivers/base/power/wakeup.c 2011-11-11 15:19:27.000000000 -0500
7024 ++++ linux-3.1.4/drivers/base/power/wakeup.c 2011-11-16 18:39:07.000000000 -0500
7025 @@ -29,14 +29,14 @@ bool events_check_enabled;
7026 * They need to be modified together atomically, so it's better to use one
7027 * atomic variable to hold them both.
7028 @@ -24774,9 +25522,9 @@ diff -urNp linux-3.1.3/drivers/base/power/wakeup.c linux-3.1.3/drivers/base/powe
7029 }
7030
7031 /**
7032 -diff -urNp linux-3.1.3/drivers/block/cciss.c linux-3.1.3/drivers/block/cciss.c
7033 ---- linux-3.1.3/drivers/block/cciss.c 2011-11-11 15:19:27.000000000 -0500
7034 -+++ linux-3.1.3/drivers/block/cciss.c 2011-11-16 18:40:10.000000000 -0500
7035 +diff -urNp linux-3.1.4/drivers/block/cciss.c linux-3.1.4/drivers/block/cciss.c
7036 +--- linux-3.1.4/drivers/block/cciss.c 2011-11-11 15:19:27.000000000 -0500
7037 ++++ linux-3.1.4/drivers/block/cciss.c 2011-11-16 18:40:10.000000000 -0500
7038 @@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
7039 int err;
7040 u32 cp;
7041 @@ -24900,9 +25648,9 @@ diff -urNp linux-3.1.3/drivers/block/cciss.c linux-3.1.3/drivers/block/cciss.c
7042 free_irq(h->intr[PERF_MODE_INT], h);
7043 }
7044
7045 -diff -urNp linux-3.1.3/drivers/block/cciss.h linux-3.1.3/drivers/block/cciss.h
7046 ---- linux-3.1.3/drivers/block/cciss.h 2011-11-11 15:19:27.000000000 -0500
7047 -+++ linux-3.1.3/drivers/block/cciss.h 2011-11-16 18:39:07.000000000 -0500
7048 +diff -urNp linux-3.1.4/drivers/block/cciss.h linux-3.1.4/drivers/block/cciss.h
7049 +--- linux-3.1.4/drivers/block/cciss.h 2011-11-11 15:19:27.000000000 -0500
7050 ++++ linux-3.1.4/drivers/block/cciss.h 2011-11-16 18:39:07.000000000 -0500
7051 @@ -100,7 +100,7 @@ struct ctlr_info
7052 /* information about each logical volume */
7053 drive_info_struct *drv[CISS_MAX_LUN];
7054 @@ -24912,9 +25660,9 @@ diff -urNp linux-3.1.3/drivers/block/cciss.h linux-3.1.3/drivers/block/cciss.h
7055
7056 /* queue and queue Info */
7057 struct list_head reqQ;
7058 -diff -urNp linux-3.1.3/drivers/block/cpqarray.c linux-3.1.3/drivers/block/cpqarray.c
7059 ---- linux-3.1.3/drivers/block/cpqarray.c 2011-11-11 15:19:27.000000000 -0500
7060 -+++ linux-3.1.3/drivers/block/cpqarray.c 2011-11-16 18:40:10.000000000 -0500
7061 +diff -urNp linux-3.1.4/drivers/block/cpqarray.c linux-3.1.4/drivers/block/cpqarray.c
7062 +--- linux-3.1.4/drivers/block/cpqarray.c 2011-11-11 15:19:27.000000000 -0500
7063 ++++ linux-3.1.4/drivers/block/cpqarray.c 2011-11-16 18:40:10.000000000 -0500
7064 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
7065 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
7066 goto Enomem4;
7067 @@ -25040,9 +25788,9 @@ diff -urNp linux-3.1.3/drivers/block/cpqarray.c linux-3.1.3/drivers/block/cpqarr
7068 if (done == 0) {
7069 udelay(10); /* a short fixed delay */
7070 } else
7071 -diff -urNp linux-3.1.3/drivers/block/cpqarray.h linux-3.1.3/drivers/block/cpqarray.h
7072 ---- linux-3.1.3/drivers/block/cpqarray.h 2011-11-11 15:19:27.000000000 -0500
7073 -+++ linux-3.1.3/drivers/block/cpqarray.h 2011-11-16 18:39:07.000000000 -0500
7074 +diff -urNp linux-3.1.4/drivers/block/cpqarray.h linux-3.1.4/drivers/block/cpqarray.h
7075 +--- linux-3.1.4/drivers/block/cpqarray.h 2011-11-11 15:19:27.000000000 -0500
7076 ++++ linux-3.1.4/drivers/block/cpqarray.h 2011-11-16 18:39:07.000000000 -0500
7077 @@ -99,7 +99,7 @@ struct ctlr_info {
7078 drv_info_t drv[NWD];
7079 struct proc_dir_entry *proc;
7080 @@ -25052,9 +25800,9 @@ diff -urNp linux-3.1.3/drivers/block/cpqarray.h linux-3.1.3/drivers/block/cpqarr
7081
7082 cmdlist_t *reqQ;
7083 cmdlist_t *cmpQ;
7084 -diff -urNp linux-3.1.3/drivers/block/DAC960.c linux-3.1.3/drivers/block/DAC960.c
7085 ---- linux-3.1.3/drivers/block/DAC960.c 2011-11-11 15:19:27.000000000 -0500
7086 -+++ linux-3.1.3/drivers/block/DAC960.c 2011-11-16 18:40:10.000000000 -0500
7087 +diff -urNp linux-3.1.4/drivers/block/DAC960.c linux-3.1.4/drivers/block/DAC960.c
7088 +--- linux-3.1.4/drivers/block/DAC960.c 2011-11-11 15:19:27.000000000 -0500
7089 ++++ linux-3.1.4/drivers/block/DAC960.c 2011-11-16 18:40:10.000000000 -0500
7090 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
7091 unsigned long flags;
7092 int Channel, TargetID;
7093 @@ -25064,9 +25812,9 @@ diff -urNp linux-3.1.3/drivers/block/DAC960.c linux-3.1.3/drivers/block/DAC960.c
7094 if (!init_dma_loaf(Controller->PCIDevice, &local_dma,
7095 DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
7096 sizeof(DAC960_SCSI_Inquiry_T) +
7097 -diff -urNp linux-3.1.3/drivers/block/drbd/drbd_int.h linux-3.1.3/drivers/block/drbd/drbd_int.h
7098 ---- linux-3.1.3/drivers/block/drbd/drbd_int.h 2011-11-11 15:19:27.000000000 -0500
7099 -+++ linux-3.1.3/drivers/block/drbd/drbd_int.h 2011-11-16 18:39:07.000000000 -0500
7100 +diff -urNp linux-3.1.4/drivers/block/drbd/drbd_int.h linux-3.1.4/drivers/block/drbd/drbd_int.h
7101 +--- linux-3.1.4/drivers/block/drbd/drbd_int.h 2011-11-11 15:19:27.000000000 -0500
7102 ++++ linux-3.1.4/drivers/block/drbd/drbd_int.h 2011-11-16 18:39:07.000000000 -0500
7103 @@ -737,7 +737,7 @@ struct drbd_request;
7104 struct drbd_epoch {
7105 struct list_head list;
7106 @@ -25124,9 +25872,9 @@ diff -urNp linux-3.1.3/drivers/block/drbd/drbd_int.h linux-3.1.3/drivers/block/d
7107 }
7108
7109 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
7110 -diff -urNp linux-3.1.3/drivers/block/drbd/drbd_main.c linux-3.1.3/drivers/block/drbd/drbd_main.c
7111 ---- linux-3.1.3/drivers/block/drbd/drbd_main.c 2011-11-11 15:19:27.000000000 -0500
7112 -+++ linux-3.1.3/drivers/block/drbd/drbd_main.c 2011-11-16 18:39:07.000000000 -0500
7113 +diff -urNp linux-3.1.4/drivers/block/drbd/drbd_main.c linux-3.1.4/drivers/block/drbd/drbd_main.c
7114 +--- linux-3.1.4/drivers/block/drbd/drbd_main.c 2011-11-11 15:19:27.000000000 -0500
7115 ++++ linux-3.1.4/drivers/block/drbd/drbd_main.c 2011-11-16 18:39:07.000000000 -0500
7116 @@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
7117 p.sector = sector;
7118 p.block_id = block_id;
7119 @@ -25165,9 +25913,9 @@ diff -urNp linux-3.1.3/drivers/block/drbd/drbd_main.c linux-3.1.3/drivers/block/
7120 mdev->al_writ_cnt =
7121 mdev->bm_writ_cnt =
7122 mdev->read_cnt =
7123 -diff -urNp linux-3.1.3/drivers/block/drbd/drbd_nl.c linux-3.1.3/drivers/block/drbd/drbd_nl.c
7124 ---- linux-3.1.3/drivers/block/drbd/drbd_nl.c 2011-11-11 15:19:27.000000000 -0500
7125 -+++ linux-3.1.3/drivers/block/drbd/drbd_nl.c 2011-11-16 18:39:07.000000000 -0500
7126 +diff -urNp linux-3.1.4/drivers/block/drbd/drbd_nl.c linux-3.1.4/drivers/block/drbd/drbd_nl.c
7127 +--- linux-3.1.4/drivers/block/drbd/drbd_nl.c 2011-11-11 15:19:27.000000000 -0500
7128 ++++ linux-3.1.4/drivers/block/drbd/drbd_nl.c 2011-11-16 18:39:07.000000000 -0500
7129 @@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
7130 module_put(THIS_MODULE);
7131 }
7132 @@ -25213,9 +25961,9 @@ diff -urNp linux-3.1.3/drivers/block/drbd/drbd_nl.c linux-3.1.3/drivers/block/dr
7133 cn_reply->ack = 0; /* not used here. */
7134 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
7135 (int)((char *)tl - (char *)reply->tag_list);
7136 -diff -urNp linux-3.1.3/drivers/block/drbd/drbd_receiver.c linux-3.1.3/drivers/block/drbd/drbd_receiver.c
7137 ---- linux-3.1.3/drivers/block/drbd/drbd_receiver.c 2011-11-11 15:19:27.000000000 -0500
7138 -+++ linux-3.1.3/drivers/block/drbd/drbd_receiver.c 2011-11-16 18:39:07.000000000 -0500
7139 +diff -urNp linux-3.1.4/drivers/block/drbd/drbd_receiver.c linux-3.1.4/drivers/block/drbd/drbd_receiver.c
7140 +--- linux-3.1.4/drivers/block/drbd/drbd_receiver.c 2011-11-11 15:19:27.000000000 -0500
7141 ++++ linux-3.1.4/drivers/block/drbd/drbd_receiver.c 2011-11-16 18:39:07.000000000 -0500
7142 @@ -894,7 +894,7 @@ retry:
7143 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
7144 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
7145 @@ -25301,9 +26049,9 @@ diff -urNp linux-3.1.3/drivers/block/drbd/drbd_receiver.c linux-3.1.3/drivers/bl
7146 D_ASSERT(list_empty(&mdev->current_epoch->list));
7147 }
7148
7149 -diff -urNp linux-3.1.3/drivers/block/loop.c linux-3.1.3/drivers/block/loop.c
7150 ---- linux-3.1.3/drivers/block/loop.c 2011-11-11 15:19:27.000000000 -0500
7151 -+++ linux-3.1.3/drivers/block/loop.c 2011-11-16 18:39:07.000000000 -0500
7152 +diff -urNp linux-3.1.4/drivers/block/loop.c linux-3.1.4/drivers/block/loop.c
7153 +--- linux-3.1.4/drivers/block/loop.c 2011-11-11 15:19:27.000000000 -0500
7154 ++++ linux-3.1.4/drivers/block/loop.c 2011-11-16 18:39:07.000000000 -0500
7155 @@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil
7156 mm_segment_t old_fs = get_fs();
7157
7158 @@ -25313,9 +26061,9 @@ diff -urNp linux-3.1.3/drivers/block/loop.c linux-3.1.3/drivers/block/loop.c
7159 set_fs(old_fs);
7160 if (likely(bw == len))
7161 return 0;
7162 -diff -urNp linux-3.1.3/drivers/block/nbd.c linux-3.1.3/drivers/block/nbd.c
7163 ---- linux-3.1.3/drivers/block/nbd.c 2011-11-11 15:19:27.000000000 -0500
7164 -+++ linux-3.1.3/drivers/block/nbd.c 2011-11-16 18:40:10.000000000 -0500
7165 +diff -urNp linux-3.1.4/drivers/block/nbd.c linux-3.1.4/drivers/block/nbd.c
7166 +--- linux-3.1.4/drivers/block/nbd.c 2011-11-11 15:19:27.000000000 -0500
7167 ++++ linux-3.1.4/drivers/block/nbd.c 2011-11-16 18:40:10.000000000 -0500
7168 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
7169 struct kvec iov;
7170 sigset_t blocked, oldset;
7171 @@ -25334,9 +26082,9 @@ diff -urNp linux-3.1.3/drivers/block/nbd.c linux-3.1.3/drivers/block/nbd.c
7172 switch (cmd) {
7173 case NBD_DISCONNECT: {
7174 struct request sreq;
7175 -diff -urNp linux-3.1.3/drivers/char/agp/frontend.c linux-3.1.3/drivers/char/agp/frontend.c
7176 ---- linux-3.1.3/drivers/char/agp/frontend.c 2011-11-11 15:19:27.000000000 -0500
7177 -+++ linux-3.1.3/drivers/char/agp/frontend.c 2011-11-16 18:39:07.000000000 -0500
7178 +diff -urNp linux-3.1.4/drivers/char/agp/frontend.c linux-3.1.4/drivers/char/agp/frontend.c
7179 +--- linux-3.1.4/drivers/char/agp/frontend.c 2011-11-11 15:19:27.000000000 -0500
7180 ++++ linux-3.1.4/drivers/char/agp/frontend.c 2011-11-16 18:39:07.000000000 -0500
7181 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
7182 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
7183 return -EFAULT;
7184 @@ -25346,9 +26094,9 @@ diff -urNp linux-3.1.3/drivers/char/agp/frontend.c linux-3.1.3/drivers/char/agp/
7185 return -EFAULT;
7186
7187 client = agp_find_client_by_pid(reserve.pid);
7188 -diff -urNp linux-3.1.3/drivers/char/briq_panel.c linux-3.1.3/drivers/char/briq_panel.c
7189 ---- linux-3.1.3/drivers/char/briq_panel.c 2011-11-11 15:19:27.000000000 -0500
7190 -+++ linux-3.1.3/drivers/char/briq_panel.c 2011-11-16 18:40:10.000000000 -0500
7191 +diff -urNp linux-3.1.4/drivers/char/briq_panel.c linux-3.1.4/drivers/char/briq_panel.c
7192 +--- linux-3.1.4/drivers/char/briq_panel.c 2011-11-11 15:19:27.000000000 -0500
7193 ++++ linux-3.1.4/drivers/char/briq_panel.c 2011-11-16 18:40:10.000000000 -0500
7194 @@ -9,6 +9,7 @@
7195 #include <linux/types.h>
7196 #include <linux/errno.h>
7197 @@ -25390,9 +26138,9 @@ diff -urNp linux-3.1.3/drivers/char/briq_panel.c linux-3.1.3/drivers/char/briq_p
7198
7199 return len;
7200 }
7201 -diff -urNp linux-3.1.3/drivers/char/genrtc.c linux-3.1.3/drivers/char/genrtc.c
7202 ---- linux-3.1.3/drivers/char/genrtc.c 2011-11-11 15:19:27.000000000 -0500
7203 -+++ linux-3.1.3/drivers/char/genrtc.c 2011-11-16 18:40:10.000000000 -0500
7204 +diff -urNp linux-3.1.4/drivers/char/genrtc.c linux-3.1.4/drivers/char/genrtc.c
7205 +--- linux-3.1.4/drivers/char/genrtc.c 2011-11-11 15:19:27.000000000 -0500
7206 ++++ linux-3.1.4/drivers/char/genrtc.c 2011-11-16 18:40:10.000000000 -0500
7207 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
7208 switch (cmd) {
7209
7210 @@ -25401,9 +26149,9 @@ diff -urNp linux-3.1.3/drivers/char/genrtc.c linux-3.1.3/drivers/char/genrtc.c
7211 if (get_rtc_pll(&pll))
7212 return -EINVAL;
7213 else
7214 -diff -urNp linux-3.1.3/drivers/char/hpet.c linux-3.1.3/drivers/char/hpet.c
7215 ---- linux-3.1.3/drivers/char/hpet.c 2011-11-11 15:19:27.000000000 -0500
7216 -+++ linux-3.1.3/drivers/char/hpet.c 2011-11-16 18:39:07.000000000 -0500
7217 +diff -urNp linux-3.1.4/drivers/char/hpet.c linux-3.1.4/drivers/char/hpet.c
7218 +--- linux-3.1.4/drivers/char/hpet.c 2011-11-11 15:19:27.000000000 -0500
7219 ++++ linux-3.1.4/drivers/char/hpet.c 2011-11-16 18:39:07.000000000 -0500
7220 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
7221 }
7222
7223 @@ -25413,9 +26161,9 @@ diff -urNp linux-3.1.3/drivers/char/hpet.c linux-3.1.3/drivers/char/hpet.c
7224 struct hpet_info *info)
7225 {
7226 struct hpet_timer __iomem *timer;
7227 -diff -urNp linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c
7228 ---- linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c 2011-11-11 15:19:27.000000000 -0500
7229 -+++ linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c 2011-11-16 18:40:10.000000000 -0500
7230 +diff -urNp linux-3.1.4/drivers/char/ipmi/ipmi_msghandler.c linux-3.1.4/drivers/char/ipmi/ipmi_msghandler.c
7231 +--- linux-3.1.4/drivers/char/ipmi/ipmi_msghandler.c 2011-11-11 15:19:27.000000000 -0500
7232 ++++ linux-3.1.4/drivers/char/ipmi/ipmi_msghandler.c 2011-11-16 18:40:10.000000000 -0500
7233 @@ -415,7 +415,7 @@ struct ipmi_smi {
7234 struct proc_dir_entry *proc_dir;
7235 char proc_dir_name[10];
7236 @@ -25455,9 +26203,9 @@ diff -urNp linux-3.1.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.1.3/drivers/c
7237 si = (struct ipmi_system_interface_addr *) &addr;
7238 si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
7239 si->channel = IPMI_BMC_CHANNEL;
7240 -diff -urNp linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c
7241 ---- linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c 2011-11-11 15:19:27.000000000 -0500
7242 -+++ linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c 2011-11-16 18:39:07.000000000 -0500
7243 +diff -urNp linux-3.1.4/drivers/char/ipmi/ipmi_si_intf.c linux-3.1.4/drivers/char/ipmi/ipmi_si_intf.c
7244 +--- linux-3.1.4/drivers/char/ipmi/ipmi_si_intf.c 2011-11-11 15:19:27.000000000 -0500
7245 ++++ linux-3.1.4/drivers/char/ipmi/ipmi_si_intf.c 2011-11-16 18:39:07.000000000 -0500
7246 @@ -277,7 +277,7 @@ struct smi_info {
7247 unsigned char slave_addr;
7248
7249 @@ -25488,9 +26236,9 @@ diff -urNp linux-3.1.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.1.3/drivers/char
7250
7251 new_smi->interrupt_disabled = 1;
7252 atomic_set(&new_smi->stop_operation, 0);
7253 -diff -urNp linux-3.1.3/drivers/char/Kconfig linux-3.1.3/drivers/char/Kconfig
7254 ---- linux-3.1.3/drivers/char/Kconfig 2011-11-11 15:19:27.000000000 -0500
7255 -+++ linux-3.1.3/drivers/char/Kconfig 2011-11-16 18:40:10.000000000 -0500
7256 +diff -urNp linux-3.1.4/drivers/char/Kconfig linux-3.1.4/drivers/char/Kconfig
7257 +--- linux-3.1.4/drivers/char/Kconfig 2011-11-11 15:19:27.000000000 -0500
7258 ++++ linux-3.1.4/drivers/char/Kconfig 2011-11-16 18:40:10.000000000 -0500
7259 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
7260
7261 config DEVKMEM
7262 @@ -25509,9 +26257,9 @@ diff -urNp linux-3.1.3/drivers/char/Kconfig linux-3.1.3/drivers/char/Kconfig
7263 default y
7264
7265 source "drivers/s390/char/Kconfig"
7266 -diff -urNp linux-3.1.3/drivers/char/mbcs.c linux-3.1.3/drivers/char/mbcs.c
7267 ---- linux-3.1.3/drivers/char/mbcs.c 2011-11-11 15:19:27.000000000 -0500
7268 -+++ linux-3.1.3/drivers/char/mbcs.c 2011-11-16 18:39:07.000000000 -0500
7269 +diff -urNp linux-3.1.4/drivers/char/mbcs.c linux-3.1.4/drivers/char/mbcs.c
7270 +--- linux-3.1.4/drivers/char/mbcs.c 2011-11-11 15:19:27.000000000 -0500
7271 ++++ linux-3.1.4/drivers/char/mbcs.c 2011-11-16 18:39:07.000000000 -0500
7272 @@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de
7273 return 0;
7274 }
7275 @@ -25521,9 +26269,9 @@ diff -urNp linux-3.1.3/drivers/char/mbcs.c linux-3.1.3/drivers/char/mbcs.c
7276 {
7277 .part_num = MBCS_PART_NUM,
7278 .mfg_num = MBCS_MFG_NUM,
7279 -diff -urNp linux-3.1.3/drivers/char/mem.c linux-3.1.3/drivers/char/mem.c
7280 ---- linux-3.1.3/drivers/char/mem.c 2011-11-11 15:19:27.000000000 -0500
7281 -+++ linux-3.1.3/drivers/char/mem.c 2011-11-17 18:31:56.000000000 -0500
7282 +diff -urNp linux-3.1.4/drivers/char/mem.c linux-3.1.4/drivers/char/mem.c
7283 +--- linux-3.1.4/drivers/char/mem.c 2011-11-11 15:19:27.000000000 -0500
7284 ++++ linux-3.1.4/drivers/char/mem.c 2011-11-17 18:31:56.000000000 -0500
7285 @@ -18,6 +18,7 @@
7286 #include <linux/raw.h>
7287 #include <linux/tty.h>
7288 @@ -25656,9 +26404,9 @@ diff -urNp linux-3.1.3/drivers/char/mem.c linux-3.1.3/drivers/char/mem.c
7289 };
7290
7291 static int memory_open(struct inode *inode, struct file *filp)
7292 -diff -urNp linux-3.1.3/drivers/char/nvram.c linux-3.1.3/drivers/char/nvram.c
7293 ---- linux-3.1.3/drivers/char/nvram.c 2011-11-11 15:19:27.000000000 -0500
7294 -+++ linux-3.1.3/drivers/char/nvram.c 2011-11-16 18:39:07.000000000 -0500
7295 +diff -urNp linux-3.1.4/drivers/char/nvram.c linux-3.1.4/drivers/char/nvram.c
7296 +--- linux-3.1.4/drivers/char/nvram.c 2011-11-11 15:19:27.000000000 -0500
7297 ++++ linux-3.1.4/drivers/char/nvram.c 2011-11-16 18:39:07.000000000 -0500
7298 @@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *f
7299
7300 spin_unlock_irq(&rtc_lock);
7301 @@ -25668,9 +26416,9 @@ diff -urNp linux-3.1.3/drivers/char/nvram.c linux-3.1.3/drivers/char/nvram.c
7302 return -EFAULT;
7303
7304 *ppos = i;
7305 -diff -urNp linux-3.1.3/drivers/char/random.c linux-3.1.3/drivers/char/random.c
7306 ---- linux-3.1.3/drivers/char/random.c 2011-11-11 15:19:27.000000000 -0500
7307 -+++ linux-3.1.3/drivers/char/random.c 2011-11-16 18:40:10.000000000 -0500
7308 +diff -urNp linux-3.1.4/drivers/char/random.c linux-3.1.4/drivers/char/random.c
7309 +--- linux-3.1.4/drivers/char/random.c 2011-11-11 15:19:27.000000000 -0500
7310 ++++ linux-3.1.4/drivers/char/random.c 2011-11-16 18:40:10.000000000 -0500
7311 @@ -261,8 +261,13 @@
7312 /*
7313 * Configuration information
7314 @@ -25721,9 +26469,9 @@ diff -urNp linux-3.1.3/drivers/char/random.c linux-3.1.3/drivers/char/random.c
7315 static int max_write_thresh = INPUT_POOL_WORDS * 32;
7316 static char sysctl_bootid[16];
7317
7318 -diff -urNp linux-3.1.3/drivers/char/sonypi.c linux-3.1.3/drivers/char/sonypi.c
7319 ---- linux-3.1.3/drivers/char/sonypi.c 2011-11-11 15:19:27.000000000 -0500
7320 -+++ linux-3.1.3/drivers/char/sonypi.c 2011-11-16 18:39:07.000000000 -0500
7321 +diff -urNp linux-3.1.4/drivers/char/sonypi.c linux-3.1.4/drivers/char/sonypi.c
7322 +--- linux-3.1.4/drivers/char/sonypi.c 2011-11-11 15:19:27.000000000 -0500
7323 ++++ linux-3.1.4/drivers/char/sonypi.c 2011-11-16 18:39:07.000000000 -0500
7324 @@ -55,6 +55,7 @@
7325 #include <asm/uaccess.h>
7326 #include <asm/io.h>
7327 @@ -25762,9 +26510,9 @@ diff -urNp linux-3.1.3/drivers/char/sonypi.c linux-3.1.3/drivers/char/sonypi.c
7328 mutex_unlock(&sonypi_device.lock);
7329
7330 return 0;
7331 -diff -urNp linux-3.1.3/drivers/char/tpm/tpm_bios.c linux-3.1.3/drivers/char/tpm/tpm_bios.c
7332 ---- linux-3.1.3/drivers/char/tpm/tpm_bios.c 2011-11-11 15:19:27.000000000 -0500
7333 -+++ linux-3.1.3/drivers/char/tpm/tpm_bios.c 2011-11-16 18:39:07.000000000 -0500
7334 +diff -urNp linux-3.1.4/drivers/char/tpm/tpm_bios.c linux-3.1.4/drivers/char/tpm/tpm_bios.c
7335 +--- linux-3.1.4/drivers/char/tpm/tpm_bios.c 2011-11-11 15:19:27.000000000 -0500
7336 ++++ linux-3.1.4/drivers/char/tpm/tpm_bios.c 2011-11-16 18:39:07.000000000 -0500
7337 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
7338 event = addr;
7339
7340 @@ -25808,9 +26556,9 @@ diff -urNp linux-3.1.3/drivers/char/tpm/tpm_bios.c linux-3.1.3/drivers/char/tpm/
7341
7342 acpi_os_unmap_memory(virt, len);
7343 return 0;
7344 -diff -urNp linux-3.1.3/drivers/char/tpm/tpm.c linux-3.1.3/drivers/char/tpm/tpm.c
7345 ---- linux-3.1.3/drivers/char/tpm/tpm.c 2011-11-11 15:19:27.000000000 -0500
7346 -+++ linux-3.1.3/drivers/char/tpm/tpm.c 2011-11-16 18:40:10.000000000 -0500
7347 +diff -urNp linux-3.1.4/drivers/char/tpm/tpm.c linux-3.1.4/drivers/char/tpm/tpm.c
7348 +--- linux-3.1.4/drivers/char/tpm/tpm.c 2011-11-11 15:19:27.000000000 -0500
7349 ++++ linux-3.1.4/drivers/char/tpm/tpm.c 2011-11-16 18:40:10.000000000 -0500
7350 @@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c
7351 chip->vendor.req_complete_val)
7352 goto out_recv;
7353 @@ -25829,9 +26577,9 @@ diff -urNp linux-3.1.3/drivers/char/tpm/tpm.c linux-3.1.3/drivers/char/tpm/tpm.c
7354 tpm_cmd.header.in = tpm_readpubek_header;
7355 err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
7356 "attempting to read the PUBEK");
7357 -diff -urNp linux-3.1.3/drivers/char/virtio_console.c linux-3.1.3/drivers/char/virtio_console.c
7358 ---- linux-3.1.3/drivers/char/virtio_console.c 2011-11-11 15:19:27.000000000 -0500
7359 -+++ linux-3.1.3/drivers/char/virtio_console.c 2011-11-16 18:39:07.000000000 -0500
7360 +diff -urNp linux-3.1.4/drivers/char/virtio_console.c linux-3.1.4/drivers/char/virtio_console.c
7361 +--- linux-3.1.4/drivers/char/virtio_console.c 2011-11-11 15:19:27.000000000 -0500
7362 ++++ linux-3.1.4/drivers/char/virtio_console.c 2011-11-16 18:39:07.000000000 -0500
7363 @@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port
7364 if (to_user) {
7365 ssize_t ret;
7366 @@ -25850,9 +26598,9 @@ diff -urNp linux-3.1.3/drivers/char/virtio_console.c linux-3.1.3/drivers/char/vi
7367 }
7368
7369 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
7370 -diff -urNp linux-3.1.3/drivers/crypto/hifn_795x.c linux-3.1.3/drivers/crypto/hifn_795x.c
7371 ---- linux-3.1.3/drivers/crypto/hifn_795x.c 2011-11-11 15:19:27.000000000 -0500
7372 -+++ linux-3.1.3/drivers/crypto/hifn_795x.c 2011-11-16 18:40:10.000000000 -0500
7373 +diff -urNp linux-3.1.4/drivers/crypto/hifn_795x.c linux-3.1.4/drivers/crypto/hifn_795x.c
7374 +--- linux-3.1.4/drivers/crypto/hifn_795x.c 2011-11-11 15:19:27.000000000 -0500
7375 ++++ linux-3.1.4/drivers/crypto/hifn_795x.c 2011-11-16 18:40:10.000000000 -0500
7376 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device
7377 0xCA, 0x34, 0x2B, 0x2E};
7378 struct scatterlist sg;
7379 @@ -25862,9 +26610,9 @@ diff -urNp linux-3.1.3/drivers/crypto/hifn_795x.c linux-3.1.3/drivers/crypto/hif
7380 memset(src, 0, sizeof(src));
7381 memset(ctx.key, 0, sizeof(ctx.key));
7382
7383 -diff -urNp linux-3.1.3/drivers/crypto/padlock-aes.c linux-3.1.3/drivers/crypto/padlock-aes.c
7384 ---- linux-3.1.3/drivers/crypto/padlock-aes.c 2011-11-11 15:19:27.000000000 -0500
7385 -+++ linux-3.1.3/drivers/crypto/padlock-aes.c 2011-11-16 18:40:10.000000000 -0500
7386 +diff -urNp linux-3.1.4/drivers/crypto/padlock-aes.c linux-3.1.4/drivers/crypto/padlock-aes.c
7387 +--- linux-3.1.4/drivers/crypto/padlock-aes.c 2011-11-11 15:19:27.000000000 -0500
7388 ++++ linux-3.1.4/drivers/crypto/padlock-aes.c 2011-11-16 18:40:10.000000000 -0500
7389 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
7390 struct crypto_aes_ctx gen_aes;
7391 int cpu;
7392 @@ -25874,9 +26622,9 @@ diff -urNp linux-3.1.3/drivers/crypto/padlock-aes.c linux-3.1.3/drivers/crypto/p
7393 if (key_len % 8) {
7394 *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
7395 return -EINVAL;
7396 -diff -urNp linux-3.1.3/drivers/edac/amd64_edac.c linux-3.1.3/drivers/edac/amd64_edac.c
7397 ---- linux-3.1.3/drivers/edac/amd64_edac.c 2011-11-11 15:19:27.000000000 -0500
7398 -+++ linux-3.1.3/drivers/edac/amd64_edac.c 2011-11-16 18:39:07.000000000 -0500
7399 +diff -urNp linux-3.1.4/drivers/edac/amd64_edac.c linux-3.1.4/drivers/edac/amd64_edac.c
7400 +--- linux-3.1.4/drivers/edac/amd64_edac.c 2011-11-11 15:19:27.000000000 -0500
7401 ++++ linux-3.1.4/drivers/edac/amd64_edac.c 2011-11-16 18:39:07.000000000 -0500
7402 @@ -2670,7 +2670,7 @@ static void __devexit amd64_remove_one_i
7403 * PCI core identifies what devices are on a system during boot, and then
7404 * inquiry this table to see if this driver is for a given device found.
7405 @@ -25886,9 +26634,9 @@ diff -urNp linux-3.1.3/drivers/edac/amd64_edac.c linux-3.1.3/drivers/edac/amd64_
7406 {
7407 .vendor = PCI_VENDOR_ID_AMD,
7408 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
7409 -diff -urNp linux-3.1.3/drivers/edac/amd76x_edac.c linux-3.1.3/drivers/edac/amd76x_edac.c
7410 ---- linux-3.1.3/drivers/edac/amd76x_edac.c 2011-11-11 15:19:27.000000000 -0500
7411 -+++ linux-3.1.3/drivers/edac/amd76x_edac.c 2011-11-16 18:39:07.000000000 -0500
7412 +diff -urNp linux-3.1.4/drivers/edac/amd76x_edac.c linux-3.1.4/drivers/edac/amd76x_edac.c
7413 +--- linux-3.1.4/drivers/edac/amd76x_edac.c 2011-11-11 15:19:27.000000000 -0500
7414 ++++ linux-3.1.4/drivers/edac/amd76x_edac.c 2011-11-16 18:39:07.000000000 -0500
7415 @@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(
7416 edac_mc_free(mci);
7417 }
7418 @@ -25898,9 +26646,9 @@ diff -urNp linux-3.1.3/drivers/edac/amd76x_edac.c linux-3.1.3/drivers/edac/amd76
7419 {
7420 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7421 AMD762},
7422 -diff -urNp linux-3.1.3/drivers/edac/e752x_edac.c linux-3.1.3/drivers/edac/e752x_edac.c
7423 ---- linux-3.1.3/drivers/edac/e752x_edac.c 2011-11-11 15:19:27.000000000 -0500
7424 -+++ linux-3.1.3/drivers/edac/e752x_edac.c 2011-11-16 18:39:07.000000000 -0500
7425 +diff -urNp linux-3.1.4/drivers/edac/e752x_edac.c linux-3.1.4/drivers/edac/e752x_edac.c
7426 +--- linux-3.1.4/drivers/edac/e752x_edac.c 2011-11-11 15:19:27.000000000 -0500
7427 ++++ linux-3.1.4/drivers/edac/e752x_edac.c 2011-11-16 18:39:07.000000000 -0500
7428 @@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s
7429 edac_mc_free(mci);
7430 }
7431 @@ -25910,9 +26658,9 @@ diff -urNp linux-3.1.3/drivers/edac/e752x_edac.c linux-3.1.3/drivers/edac/e752x_
7432 {
7433 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7434 E7520},
7435 -diff -urNp linux-3.1.3/drivers/edac/e7xxx_edac.c linux-3.1.3/drivers/edac/e7xxx_edac.c
7436 ---- linux-3.1.3/drivers/edac/e7xxx_edac.c 2011-11-11 15:19:27.000000000 -0500
7437 -+++ linux-3.1.3/drivers/edac/e7xxx_edac.c 2011-11-16 18:39:07.000000000 -0500
7438 +diff -urNp linux-3.1.4/drivers/edac/e7xxx_edac.c linux-3.1.4/drivers/edac/e7xxx_edac.c
7439 +--- linux-3.1.4/drivers/edac/e7xxx_edac.c 2011-11-11 15:19:27.000000000 -0500
7440 ++++ linux-3.1.4/drivers/edac/e7xxx_edac.c 2011-11-16 18:39:07.000000000 -0500
7441 @@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s
7442 edac_mc_free(mci);
7443 }
7444 @@ -25922,9 +26670,9 @@ diff -urNp linux-3.1.3/drivers/edac/e7xxx_edac.c linux-3.1.3/drivers/edac/e7xxx_
7445 {
7446 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7447 E7205},
7448 -diff -urNp linux-3.1.3/drivers/edac/edac_pci_sysfs.c linux-3.1.3/drivers/edac/edac_pci_sysfs.c
7449 ---- linux-3.1.3/drivers/edac/edac_pci_sysfs.c 2011-11-11 15:19:27.000000000 -0500
7450 -+++ linux-3.1.3/drivers/edac/edac_pci_sysfs.c 2011-11-16 18:39:07.000000000 -0500
7451 +diff -urNp linux-3.1.4/drivers/edac/edac_pci_sysfs.c linux-3.1.4/drivers/edac/edac_pci_sysfs.c
7452 +--- linux-3.1.4/drivers/edac/edac_pci_sysfs.c 2011-11-11 15:19:27.000000000 -0500
7453 ++++ linux-3.1.4/drivers/edac/edac_pci_sysfs.c 2011-11-16 18:39:07.000000000 -0500
7454 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log
7455 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
7456 static int edac_pci_poll_msec = 1000; /* one second workq period */
7457 @@ -26008,9 +26756,9 @@ diff -urNp linux-3.1.3/drivers/edac/edac_pci_sysfs.c linux-3.1.3/drivers/edac/ed
7458 panic("EDAC: PCI Parity Error");
7459 }
7460 }
7461 -diff -urNp linux-3.1.3/drivers/edac/i3000_edac.c linux-3.1.3/drivers/edac/i3000_edac.c
7462 ---- linux-3.1.3/drivers/edac/i3000_edac.c 2011-11-11 15:19:27.000000000 -0500
7463 -+++ linux-3.1.3/drivers/edac/i3000_edac.c 2011-11-16 18:39:07.000000000 -0500
7464 +diff -urNp linux-3.1.4/drivers/edac/i3000_edac.c linux-3.1.4/drivers/edac/i3000_edac.c
7465 +--- linux-3.1.4/drivers/edac/i3000_edac.c 2011-11-11 15:19:27.000000000 -0500
7466 ++++ linux-3.1.4/drivers/edac/i3000_edac.c 2011-11-16 18:39:07.000000000 -0500
7467 @@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s
7468 edac_mc_free(mci);
7469 }
7470 @@ -26020,9 +26768,9 @@ diff -urNp linux-3.1.3/drivers/edac/i3000_edac.c linux-3.1.3/drivers/edac/i3000_
7471 {
7472 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7473 I3000},
7474 -diff -urNp linux-3.1.3/drivers/edac/i3200_edac.c linux-3.1.3/drivers/edac/i3200_edac.c
7475 ---- linux-3.1.3/drivers/edac/i3200_edac.c 2011-11-11 15:19:27.000000000 -0500
7476 -+++ linux-3.1.3/drivers/edac/i3200_edac.c 2011-11-16 18:39:07.000000000 -0500
7477 +diff -urNp linux-3.1.4/drivers/edac/i3200_edac.c linux-3.1.4/drivers/edac/i3200_edac.c
7478 +--- linux-3.1.4/drivers/edac/i3200_edac.c 2011-11-11 15:19:27.000000000 -0500
7479 ++++ linux-3.1.4/drivers/edac/i3200_edac.c 2011-11-16 18:39:07.000000000 -0500
7480 @@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s
7481 edac_mc_free(mci);
7482 }
7483 @@ -26032,9 +26780,9 @@ diff -urNp linux-3.1.3/drivers/edac/i3200_edac.c linux-3.1.3/drivers/edac/i3200_
7484 {
7485 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7486 I3200},
7487 -diff -urNp linux-3.1.3/drivers/edac/i5000_edac.c linux-3.1.3/drivers/edac/i5000_edac.c
7488 ---- linux-3.1.3/drivers/edac/i5000_edac.c 2011-11-11 15:19:27.000000000 -0500
7489 -+++ linux-3.1.3/drivers/edac/i5000_edac.c 2011-11-16 18:39:07.000000000 -0500
7490 +diff -urNp linux-3.1.4/drivers/edac/i5000_edac.c linux-3.1.4/drivers/edac/i5000_edac.c
7491 +--- linux-3.1.4/drivers/edac/i5000_edac.c 2011-11-11 15:19:27.000000000 -0500
7492 ++++ linux-3.1.4/drivers/edac/i5000_edac.c 2011-11-16 18:39:07.000000000 -0500
7493 @@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s
7494 *
7495 * The "E500P" device is the first device supported.
7496 @@ -26044,9 +26792,9 @@ diff -urNp linux-3.1.3/drivers/edac/i5000_edac.c linux-3.1.3/drivers/edac/i5000_
7497 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
7498 .driver_data = I5000P},
7499
7500 -diff -urNp linux-3.1.3/drivers/edac/i5100_edac.c linux-3.1.3/drivers/edac/i5100_edac.c
7501 ---- linux-3.1.3/drivers/edac/i5100_edac.c 2011-11-11 15:19:27.000000000 -0500
7502 -+++ linux-3.1.3/drivers/edac/i5100_edac.c 2011-11-16 18:39:07.000000000 -0500
7503 +diff -urNp linux-3.1.4/drivers/edac/i5100_edac.c linux-3.1.4/drivers/edac/i5100_edac.c
7504 +--- linux-3.1.4/drivers/edac/i5100_edac.c 2011-11-11 15:19:27.000000000 -0500
7505 ++++ linux-3.1.4/drivers/edac/i5100_edac.c 2011-11-16 18:39:07.000000000 -0500
7506 @@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s
7507 edac_mc_free(mci);
7508 }
7509 @@ -26056,9 +26804,9 @@ diff -urNp linux-3.1.3/drivers/edac/i5100_edac.c linux-3.1.3/drivers/edac/i5100_
7510 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
7511 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
7512 { 0, }
7513 -diff -urNp linux-3.1.3/drivers/edac/i5400_edac.c linux-3.1.3/drivers/edac/i5400_edac.c
7514 ---- linux-3.1.3/drivers/edac/i5400_edac.c 2011-11-11 15:19:27.000000000 -0500
7515 -+++ linux-3.1.3/drivers/edac/i5400_edac.c 2011-11-16 18:39:07.000000000 -0500
7516 +diff -urNp linux-3.1.4/drivers/edac/i5400_edac.c linux-3.1.4/drivers/edac/i5400_edac.c
7517 +--- linux-3.1.4/drivers/edac/i5400_edac.c 2011-11-11 15:19:27.000000000 -0500
7518 ++++ linux-3.1.4/drivers/edac/i5400_edac.c 2011-11-16 18:39:07.000000000 -0500
7519 @@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s
7520 *
7521 * The "E500P" device is the first device supported.
7522 @@ -26068,9 +26816,9 @@ diff -urNp linux-3.1.3/drivers/edac/i5400_edac.c linux-3.1.3/drivers/edac/i5400_
7523 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
7524 {0,} /* 0 terminated list. */
7525 };
7526 -diff -urNp linux-3.1.3/drivers/edac/i7300_edac.c linux-3.1.3/drivers/edac/i7300_edac.c
7527 ---- linux-3.1.3/drivers/edac/i7300_edac.c 2011-11-11 15:19:27.000000000 -0500
7528 -+++ linux-3.1.3/drivers/edac/i7300_edac.c 2011-11-16 18:39:07.000000000 -0500
7529 +diff -urNp linux-3.1.4/drivers/edac/i7300_edac.c linux-3.1.4/drivers/edac/i7300_edac.c
7530 +--- linux-3.1.4/drivers/edac/i7300_edac.c 2011-11-11 15:19:27.000000000 -0500
7531 ++++ linux-3.1.4/drivers/edac/i7300_edac.c 2011-11-16 18:39:07.000000000 -0500
7532 @@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s
7533 *
7534 * Has only 8086:360c PCI ID
7535 @@ -26080,9 +26828,9 @@ diff -urNp linux-3.1.3/drivers/edac/i7300_edac.c linux-3.1.3/drivers/edac/i7300_
7536 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
7537 {0,} /* 0 terminated list. */
7538 };
7539 -diff -urNp linux-3.1.3/drivers/edac/i7core_edac.c linux-3.1.3/drivers/edac/i7core_edac.c
7540 ---- linux-3.1.3/drivers/edac/i7core_edac.c 2011-11-11 15:19:27.000000000 -0500
7541 -+++ linux-3.1.3/drivers/edac/i7core_edac.c 2011-11-16 18:39:07.000000000 -0500
7542 +diff -urNp linux-3.1.4/drivers/edac/i7core_edac.c linux-3.1.4/drivers/edac/i7core_edac.c
7543 +--- linux-3.1.4/drivers/edac/i7core_edac.c 2011-11-11 15:19:27.000000000 -0500
7544 ++++ linux-3.1.4/drivers/edac/i7core_edac.c 2011-11-16 18:39:07.000000000 -0500
7545 @@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev
7546 /*
7547 * pci_device_id table for which devices we are looking for
7548 @@ -26092,9 +26840,9 @@ diff -urNp linux-3.1.3/drivers/edac/i7core_edac.c linux-3.1.3/drivers/edac/i7cor
7549 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
7550 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
7551 {0,} /* 0 terminated list. */
7552 -diff -urNp linux-3.1.3/drivers/edac/i82443bxgx_edac.c linux-3.1.3/drivers/edac/i82443bxgx_edac.c
7553 ---- linux-3.1.3/drivers/edac/i82443bxgx_edac.c 2011-11-11 15:19:27.000000000 -0500
7554 -+++ linux-3.1.3/drivers/edac/i82443bxgx_edac.c 2011-11-16 18:39:07.000000000 -0500
7555 +diff -urNp linux-3.1.4/drivers/edac/i82443bxgx_edac.c linux-3.1.4/drivers/edac/i82443bxgx_edac.c
7556 +--- linux-3.1.4/drivers/edac/i82443bxgx_edac.c 2011-11-11 15:19:27.000000000 -0500
7557 ++++ linux-3.1.4/drivers/edac/i82443bxgx_edac.c 2011-11-16 18:39:07.000000000 -0500
7558 @@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_
7559
7560 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
7561 @@ -26104,9 +26852,9 @@ diff -urNp linux-3.1.3/drivers/edac/i82443bxgx_edac.c linux-3.1.3/drivers/edac/i
7562 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
7563 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
7564 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
7565 -diff -urNp linux-3.1.3/drivers/edac/i82860_edac.c linux-3.1.3/drivers/edac/i82860_edac.c
7566 ---- linux-3.1.3/drivers/edac/i82860_edac.c 2011-11-11 15:19:27.000000000 -0500
7567 -+++ linux-3.1.3/drivers/edac/i82860_edac.c 2011-11-16 18:39:07.000000000 -0500
7568 +diff -urNp linux-3.1.4/drivers/edac/i82860_edac.c linux-3.1.4/drivers/edac/i82860_edac.c
7569 +--- linux-3.1.4/drivers/edac/i82860_edac.c 2011-11-11 15:19:27.000000000 -0500
7570 ++++ linux-3.1.4/drivers/edac/i82860_edac.c 2011-11-16 18:39:07.000000000 -0500
7571 @@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(
7572 edac_mc_free(mci);
7573 }
7574 @@ -26116,9 +26864,9 @@ diff -urNp linux-3.1.3/drivers/edac/i82860_edac.c linux-3.1.3/drivers/edac/i8286
7575 {
7576 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7577 I82860},
7578 -diff -urNp linux-3.1.3/drivers/edac/i82875p_edac.c linux-3.1.3/drivers/edac/i82875p_edac.c
7579 ---- linux-3.1.3/drivers/edac/i82875p_edac.c 2011-11-11 15:19:27.000000000 -0500
7580 -+++ linux-3.1.3/drivers/edac/i82875p_edac.c 2011-11-16 18:39:07.000000000 -0500
7581 +diff -urNp linux-3.1.4/drivers/edac/i82875p_edac.c linux-3.1.4/drivers/edac/i82875p_edac.c
7582 +--- linux-3.1.4/drivers/edac/i82875p_edac.c 2011-11-11 15:19:27.000000000 -0500
7583 ++++ linux-3.1.4/drivers/edac/i82875p_edac.c 2011-11-16 18:39:07.000000000 -0500
7584 @@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one
7585 edac_mc_free(mci);
7586 }
7587 @@ -26128,9 +26876,9 @@ diff -urNp linux-3.1.3/drivers/edac/i82875p_edac.c linux-3.1.3/drivers/edac/i828
7588 {
7589 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7590 I82875P},
7591 -diff -urNp linux-3.1.3/drivers/edac/i82975x_edac.c linux-3.1.3/drivers/edac/i82975x_edac.c
7592 ---- linux-3.1.3/drivers/edac/i82975x_edac.c 2011-11-11 15:19:27.000000000 -0500
7593 -+++ linux-3.1.3/drivers/edac/i82975x_edac.c 2011-11-16 18:39:07.000000000 -0500
7594 +diff -urNp linux-3.1.4/drivers/edac/i82975x_edac.c linux-3.1.4/drivers/edac/i82975x_edac.c
7595 +--- linux-3.1.4/drivers/edac/i82975x_edac.c 2011-11-11 15:19:27.000000000 -0500
7596 ++++ linux-3.1.4/drivers/edac/i82975x_edac.c 2011-11-16 18:39:07.000000000 -0500
7597 @@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one
7598 edac_mc_free(mci);
7599 }
7600 @@ -26140,9 +26888,9 @@ diff -urNp linux-3.1.3/drivers/edac/i82975x_edac.c linux-3.1.3/drivers/edac/i829
7601 {
7602 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7603 I82975X
7604 -diff -urNp linux-3.1.3/drivers/edac/mce_amd.h linux-3.1.3/drivers/edac/mce_amd.h
7605 ---- linux-3.1.3/drivers/edac/mce_amd.h 2011-11-11 15:19:27.000000000 -0500
7606 -+++ linux-3.1.3/drivers/edac/mce_amd.h 2011-11-16 18:39:07.000000000 -0500
7607 +diff -urNp linux-3.1.4/drivers/edac/mce_amd.h linux-3.1.4/drivers/edac/mce_amd.h
7608 +--- linux-3.1.4/drivers/edac/mce_amd.h 2011-11-11 15:19:27.000000000 -0500
7609 ++++ linux-3.1.4/drivers/edac/mce_amd.h 2011-11-16 18:39:07.000000000 -0500
7610 @@ -83,7 +83,7 @@ struct amd_decoder_ops {
7611 bool (*dc_mce)(u16, u8);
7612 bool (*ic_mce)(u16, u8);
7613 @@ -26152,9 +26900,9 @@ diff -urNp linux-3.1.3/drivers/edac/mce_amd.h linux-3.1.3/drivers/edac/mce_amd.h
7614
7615 void amd_report_gart_errors(bool);
7616 void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
7617 -diff -urNp linux-3.1.3/drivers/edac/r82600_edac.c linux-3.1.3/drivers/edac/r82600_edac.c
7618 ---- linux-3.1.3/drivers/edac/r82600_edac.c 2011-11-11 15:19:27.000000000 -0500
7619 -+++ linux-3.1.3/drivers/edac/r82600_edac.c 2011-11-16 18:39:07.000000000 -0500
7620 +diff -urNp linux-3.1.4/drivers/edac/r82600_edac.c linux-3.1.4/drivers/edac/r82600_edac.c
7621 +--- linux-3.1.4/drivers/edac/r82600_edac.c 2011-11-11 15:19:27.000000000 -0500
7622 ++++ linux-3.1.4/drivers/edac/r82600_edac.c 2011-11-16 18:39:07.000000000 -0500
7623 @@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(
7624 edac_mc_free(mci);
7625 }
7626 @@ -26164,9 +26912,9 @@ diff -urNp linux-3.1.3/drivers/edac/r82600_edac.c linux-3.1.3/drivers/edac/r8260
7627 {
7628 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
7629 },
7630 -diff -urNp linux-3.1.3/drivers/edac/x38_edac.c linux-3.1.3/drivers/edac/x38_edac.c
7631 ---- linux-3.1.3/drivers/edac/x38_edac.c 2011-11-11 15:19:27.000000000 -0500
7632 -+++ linux-3.1.3/drivers/edac/x38_edac.c 2011-11-16 18:39:07.000000000 -0500
7633 +diff -urNp linux-3.1.4/drivers/edac/x38_edac.c linux-3.1.4/drivers/edac/x38_edac.c
7634 +--- linux-3.1.4/drivers/edac/x38_edac.c 2011-11-11 15:19:27.000000000 -0500
7635 ++++ linux-3.1.4/drivers/edac/x38_edac.c 2011-11-16 18:39:07.000000000 -0500
7636 @@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str
7637 edac_mc_free(mci);
7638 }
7639 @@ -26176,9 +26924,9 @@ diff -urNp linux-3.1.3/drivers/edac/x38_edac.c linux-3.1.3/drivers/edac/x38_edac
7640 {
7641 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
7642 X38},
7643 -diff -urNp linux-3.1.3/drivers/firewire/core-card.c linux-3.1.3/drivers/firewire/core-card.c
7644 ---- linux-3.1.3/drivers/firewire/core-card.c 2011-11-11 15:19:27.000000000 -0500
7645 -+++ linux-3.1.3/drivers/firewire/core-card.c 2011-11-16 18:39:07.000000000 -0500
7646 +diff -urNp linux-3.1.4/drivers/firewire/core-card.c linux-3.1.4/drivers/firewire/core-card.c
7647 +--- linux-3.1.4/drivers/firewire/core-card.c 2011-11-11 15:19:27.000000000 -0500
7648 ++++ linux-3.1.4/drivers/firewire/core-card.c 2011-11-16 18:39:07.000000000 -0500
7649 @@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
7650
7651 void fw_core_remove_card(struct fw_card *card)
7652 @@ -26188,9 +26936,9 @@ diff -urNp linux-3.1.3/drivers/firewire/core-card.c linux-3.1.3/drivers/firewire
7653
7654 card->driver->update_phy_reg(card, 4,
7655 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
7656 -diff -urNp linux-3.1.3/drivers/firewire/core-cdev.c linux-3.1.3/drivers/firewire/core-cdev.c
7657 ---- linux-3.1.3/drivers/firewire/core-cdev.c 2011-11-11 15:19:27.000000000 -0500
7658 -+++ linux-3.1.3/drivers/firewire/core-cdev.c 2011-11-16 18:39:07.000000000 -0500
7659 +diff -urNp linux-3.1.4/drivers/firewire/core-cdev.c linux-3.1.4/drivers/firewire/core-cdev.c
7660 +--- linux-3.1.4/drivers/firewire/core-cdev.c 2011-11-11 15:19:27.000000000 -0500
7661 ++++ linux-3.1.4/drivers/firewire/core-cdev.c 2011-11-16 18:39:07.000000000 -0500
7662 @@ -1331,8 +1331,7 @@ static int init_iso_resource(struct clie
7663 int ret;
7664
7665 @@ -26201,9 +26949,9 @@ diff -urNp linux-3.1.3/drivers/firewire/core-cdev.c linux-3.1.3/drivers/firewire
7666 return -EINVAL;
7667
7668 r = kmalloc(sizeof(*r), GFP_KERNEL);
7669 -diff -urNp linux-3.1.3/drivers/firewire/core.h linux-3.1.3/drivers/firewire/core.h
7670 ---- linux-3.1.3/drivers/firewire/core.h 2011-11-11 15:19:27.000000000 -0500
7671 -+++ linux-3.1.3/drivers/firewire/core.h 2011-11-16 18:39:07.000000000 -0500
7672 +diff -urNp linux-3.1.4/drivers/firewire/core.h linux-3.1.4/drivers/firewire/core.h
7673 +--- linux-3.1.4/drivers/firewire/core.h 2011-11-11 15:19:27.000000000 -0500
7674 ++++ linux-3.1.4/drivers/firewire/core.h 2011-11-16 18:39:07.000000000 -0500
7675 @@ -101,6 +101,7 @@ struct fw_card_driver {
7676
7677 int (*stop_iso)(struct fw_iso_context *ctx);
7678 @@ -26212,9 +26960,9 @@ diff -urNp linux-3.1.3/drivers/firewire/core.h linux-3.1.3/drivers/firewire/core
7679
7680 void fw_card_initialize(struct fw_card *card,
7681 const struct fw_card_driver *driver, struct device *device);
7682 -diff -urNp linux-3.1.3/drivers/firewire/core-transaction.c linux-3.1.3/drivers/firewire/core-transaction.c
7683 ---- linux-3.1.3/drivers/firewire/core-transaction.c 2011-11-11 15:19:27.000000000 -0500
7684 -+++ linux-3.1.3/drivers/firewire/core-transaction.c 2011-11-16 18:40:10.000000000 -0500
7685 +diff -urNp linux-3.1.4/drivers/firewire/core-transaction.c linux-3.1.4/drivers/firewire/core-transaction.c
7686 +--- linux-3.1.4/drivers/firewire/core-transaction.c 2011-11-11 15:19:27.000000000 -0500
7687 ++++ linux-3.1.4/drivers/firewire/core-transaction.c 2011-11-16 18:40:10.000000000 -0500
7688 @@ -37,6 +37,7 @@
7689 #include <linux/timer.h>
7690 #include <linux/types.h>
7691 @@ -26232,9 +26980,9 @@ diff -urNp linux-3.1.3/drivers/firewire/core-transaction.c linux-3.1.3/drivers/f
7692 init_timer_on_stack(&t.split_timeout_timer);
7693 init_completion(&d.done);
7694 d.payload = payload;
7695 -diff -urNp linux-3.1.3/drivers/firmware/dmi_scan.c linux-3.1.3/drivers/firmware/dmi_scan.c
7696 ---- linux-3.1.3/drivers/firmware/dmi_scan.c 2011-11-11 15:19:27.000000000 -0500
7697 -+++ linux-3.1.3/drivers/firmware/dmi_scan.c 2011-11-16 18:39:07.000000000 -0500
7698 +diff -urNp linux-3.1.4/drivers/firmware/dmi_scan.c linux-3.1.4/drivers/firmware/dmi_scan.c
7699 +--- linux-3.1.4/drivers/firmware/dmi_scan.c 2011-11-11 15:19:27.000000000 -0500
7700 ++++ linux-3.1.4/drivers/firmware/dmi_scan.c 2011-11-16 18:39:07.000000000 -0500
7701 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
7702 }
7703 }
7704 @@ -26256,9 +27004,9 @@ diff -urNp linux-3.1.3/drivers/firmware/dmi_scan.c linux-3.1.3/drivers/firmware/
7705
7706 iounmap(buf);
7707 return 0;
7708 -diff -urNp linux-3.1.3/drivers/gpio/gpio-vr41xx.c linux-3.1.3/drivers/gpio/gpio-vr41xx.c
7709 ---- linux-3.1.3/drivers/gpio/gpio-vr41xx.c 2011-11-11 15:19:27.000000000 -0500
7710 -+++ linux-3.1.3/drivers/gpio/gpio-vr41xx.c 2011-11-16 18:39:07.000000000 -0500
7711 +diff -urNp linux-3.1.4/drivers/gpio/gpio-vr41xx.c linux-3.1.4/drivers/gpio/gpio-vr41xx.c
7712 +--- linux-3.1.4/drivers/gpio/gpio-vr41xx.c 2011-11-11 15:19:27.000000000 -0500
7713 ++++ linux-3.1.4/drivers/gpio/gpio-vr41xx.c 2011-11-16 18:39:07.000000000 -0500
7714 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
7715 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
7716 maskl, pendl, maskh, pendh);
7717 @@ -26268,9 +27016,9 @@ diff -urNp linux-3.1.3/drivers/gpio/gpio-vr41xx.c linux-3.1.3/drivers/gpio/gpio-
7718
7719 return -EINVAL;
7720 }
7721 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_crtc.c linux-3.1.3/drivers/gpu/drm/drm_crtc.c
7722 ---- linux-3.1.3/drivers/gpu/drm/drm_crtc.c 2011-11-11 15:19:27.000000000 -0500
7723 -+++ linux-3.1.3/drivers/gpu/drm/drm_crtc.c 2011-11-16 18:39:07.000000000 -0500
7724 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_crtc.c linux-3.1.4/drivers/gpu/drm/drm_crtc.c
7725 +--- linux-3.1.4/drivers/gpu/drm/drm_crtc.c 2011-11-11 15:19:27.000000000 -0500
7726 ++++ linux-3.1.4/drivers/gpu/drm/drm_crtc.c 2011-11-16 18:39:07.000000000 -0500
7727 @@ -1374,7 +1374,7 @@ int drm_mode_getconnector(struct drm_dev
7728 */
7729 if ((out_resp->count_modes >= mode_count) && mode_count) {
7730 @@ -26363,9 +27111,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_crtc.c linux-3.1.3/drivers/gpu/drm/dr
7731 if (copy_to_user(blob_ptr, blob->data, blob->length)){
7732 ret = -EFAULT;
7733 goto done;
7734 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c
7735 ---- linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 15:19:27.000000000 -0500
7736 -+++ linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c 2011-11-16 18:40:10.000000000 -0500
7737 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_crtc_helper.c linux-3.1.4/drivers/gpu/drm/drm_crtc_helper.c
7738 +--- linux-3.1.4/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 15:19:27.000000000 -0500
7739 ++++ linux-3.1.4/drivers/gpu/drm/drm_crtc_helper.c 2011-11-16 18:40:10.000000000 -0500
7740 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
7741 struct drm_crtc *tmp;
7742 int crtc_mask = 1;
7743 @@ -26384,9 +27132,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.1.3/drivers/gpu
7744 crtc->enabled = drm_helper_crtc_in_use(crtc);
7745 if (!crtc->enabled)
7746 return true;
7747 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_drv.c linux-3.1.3/drivers/gpu/drm/drm_drv.c
7748 ---- linux-3.1.3/drivers/gpu/drm/drm_drv.c 2011-11-11 15:19:27.000000000 -0500
7749 -+++ linux-3.1.3/drivers/gpu/drm/drm_drv.c 2011-11-16 18:39:07.000000000 -0500
7750 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_drv.c linux-3.1.4/drivers/gpu/drm/drm_drv.c
7751 +--- linux-3.1.4/drivers/gpu/drm/drm_drv.c 2011-11-11 15:19:27.000000000 -0500
7752 ++++ linux-3.1.4/drivers/gpu/drm/drm_drv.c 2011-11-16 18:39:07.000000000 -0500
7753 @@ -307,7 +307,7 @@ module_exit(drm_core_exit);
7754 /**
7755 * Copy and IOCTL return string to user space
7756 @@ -26405,9 +27153,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_drv.c linux-3.1.3/drivers/gpu/drm/drm
7757 ++file_priv->ioctl_count;
7758
7759 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
7760 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_fops.c linux-3.1.3/drivers/gpu/drm/drm_fops.c
7761 ---- linux-3.1.3/drivers/gpu/drm/drm_fops.c 2011-11-11 15:19:27.000000000 -0500
7762 -+++ linux-3.1.3/drivers/gpu/drm/drm_fops.c 2011-11-16 18:39:07.000000000 -0500
7763 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_fops.c linux-3.1.4/drivers/gpu/drm/drm_fops.c
7764 +--- linux-3.1.4/drivers/gpu/drm/drm_fops.c 2011-11-11 15:19:27.000000000 -0500
7765 ++++ linux-3.1.4/drivers/gpu/drm/drm_fops.c 2011-11-16 18:39:07.000000000 -0500
7766 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
7767 }
7768
7769 @@ -26457,9 +27205,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_fops.c linux-3.1.3/drivers/gpu/drm/dr
7770 if (atomic_read(&dev->ioctl_count)) {
7771 DRM_ERROR("Device busy: %d\n",
7772 atomic_read(&dev->ioctl_count));
7773 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_global.c linux-3.1.3/drivers/gpu/drm/drm_global.c
7774 ---- linux-3.1.3/drivers/gpu/drm/drm_global.c 2011-11-11 15:19:27.000000000 -0500
7775 -+++ linux-3.1.3/drivers/gpu/drm/drm_global.c 2011-11-16 18:39:07.000000000 -0500
7776 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_global.c linux-3.1.4/drivers/gpu/drm/drm_global.c
7777 +--- linux-3.1.4/drivers/gpu/drm/drm_global.c 2011-11-11 15:19:27.000000000 -0500
7778 ++++ linux-3.1.4/drivers/gpu/drm/drm_global.c 2011-11-16 18:39:07.000000000 -0500
7779 @@ -36,7 +36,7 @@
7780 struct drm_global_item {
7781 struct mutex mutex;
7782 @@ -26517,9 +27265,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_global.c linux-3.1.3/drivers/gpu/drm/
7783 ref->release(ref);
7784 item->object = NULL;
7785 }
7786 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_info.c linux-3.1.3/drivers/gpu/drm/drm_info.c
7787 ---- linux-3.1.3/drivers/gpu/drm/drm_info.c 2011-11-11 15:19:27.000000000 -0500
7788 -+++ linux-3.1.3/drivers/gpu/drm/drm_info.c 2011-11-16 18:40:10.000000000 -0500
7789 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_info.c linux-3.1.4/drivers/gpu/drm/drm_info.c
7790 +--- linux-3.1.4/drivers/gpu/drm/drm_info.c 2011-11-11 15:19:27.000000000 -0500
7791 ++++ linux-3.1.4/drivers/gpu/drm/drm_info.c 2011-11-16 18:40:10.000000000 -0500
7792 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
7793 struct drm_local_map *map;
7794 struct drm_map_list *r_list;
7795 @@ -26560,9 +27308,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_info.c linux-3.1.3/drivers/gpu/drm/dr
7796
7797 #if defined(__i386__)
7798 pgprot = pgprot_val(vma->vm_page_prot);
7799 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_ioc32.c linux-3.1.3/drivers/gpu/drm/drm_ioc32.c
7800 ---- linux-3.1.3/drivers/gpu/drm/drm_ioc32.c 2011-11-11 15:19:27.000000000 -0500
7801 -+++ linux-3.1.3/drivers/gpu/drm/drm_ioc32.c 2011-11-16 18:39:07.000000000 -0500
7802 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_ioc32.c linux-3.1.4/drivers/gpu/drm/drm_ioc32.c
7803 +--- linux-3.1.4/drivers/gpu/drm/drm_ioc32.c 2011-11-11 15:19:27.000000000 -0500
7804 ++++ linux-3.1.4/drivers/gpu/drm/drm_ioc32.c 2011-11-16 18:39:07.000000000 -0500
7805 @@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi
7806 request = compat_alloc_user_space(nbytes);
7807 if (!access_ok(VERIFY_WRITE, request, nbytes))
7808 @@ -26581,9 +27329,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_ioc32.c linux-3.1.3/drivers/gpu/drm/d
7809
7810 if (__put_user(count, &request->count)
7811 || __put_user(list, &request->list))
7812 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_ioctl.c linux-3.1.3/drivers/gpu/drm/drm_ioctl.c
7813 ---- linux-3.1.3/drivers/gpu/drm/drm_ioctl.c 2011-11-11 15:19:27.000000000 -0500
7814 -+++ linux-3.1.3/drivers/gpu/drm/drm_ioctl.c 2011-11-16 18:39:07.000000000 -0500
7815 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_ioctl.c linux-3.1.4/drivers/gpu/drm/drm_ioctl.c
7816 +--- linux-3.1.4/drivers/gpu/drm/drm_ioctl.c 2011-11-11 15:19:27.000000000 -0500
7817 ++++ linux-3.1.4/drivers/gpu/drm/drm_ioctl.c 2011-11-16 18:39:07.000000000 -0500
7818 @@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev,
7819 stats->data[i].value =
7820 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
7821 @@ -26593,9 +27341,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_ioctl.c linux-3.1.3/drivers/gpu/drm/d
7822 stats->data[i].type = dev->types[i];
7823 }
7824
7825 -diff -urNp linux-3.1.3/drivers/gpu/drm/drm_lock.c linux-3.1.3/drivers/gpu/drm/drm_lock.c
7826 ---- linux-3.1.3/drivers/gpu/drm/drm_lock.c 2011-11-11 15:19:27.000000000 -0500
7827 -+++ linux-3.1.3/drivers/gpu/drm/drm_lock.c 2011-11-16 18:39:07.000000000 -0500
7828 +diff -urNp linux-3.1.4/drivers/gpu/drm/drm_lock.c linux-3.1.4/drivers/gpu/drm/drm_lock.c
7829 +--- linux-3.1.4/drivers/gpu/drm/drm_lock.c 2011-11-11 15:19:27.000000000 -0500
7830 ++++ linux-3.1.4/drivers/gpu/drm/drm_lock.c 2011-11-16 18:39:07.000000000 -0500
7831 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
7832 if (drm_lock_take(&master->lock, lock->context)) {
7833 master->lock.file_priv = file_priv;
7834 @@ -26614,9 +27362,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/drm_lock.c linux-3.1.3/drivers/gpu/drm/dr
7835
7836 if (drm_lock_free(&master->lock, lock->context)) {
7837 /* FIXME: Should really bail out here. */
7838 -diff -urNp linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c
7839 ---- linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c 2011-11-11 15:19:27.000000000 -0500
7840 -+++ linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c 2011-11-16 18:39:07.000000000 -0500
7841 +diff -urNp linux-3.1.4/drivers/gpu/drm/i810/i810_dma.c linux-3.1.4/drivers/gpu/drm/i810/i810_dma.c
7842 +--- linux-3.1.4/drivers/gpu/drm/i810/i810_dma.c 2011-11-11 15:19:27.000000000 -0500
7843 ++++ linux-3.1.4/drivers/gpu/drm/i810/i810_dma.c 2011-11-16 18:39:07.000000000 -0500
7844 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
7845 dma->buflist[vertex->idx],
7846 vertex->discard, vertex->used);
7847 @@ -26639,9 +27387,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i810/i810_dma.c linux-3.1.3/drivers/gpu/d
7848 sarea_priv->last_enqueue = dev_priv->counter - 1;
7849 sarea_priv->last_dispatch = (int)hw_status[5];
7850
7851 -diff -urNp linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h
7852 ---- linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h 2011-11-11 15:19:27.000000000 -0500
7853 -+++ linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h 2011-11-16 18:39:07.000000000 -0500
7854 +diff -urNp linux-3.1.4/drivers/gpu/drm/i810/i810_drv.h linux-3.1.4/drivers/gpu/drm/i810/i810_drv.h
7855 +--- linux-3.1.4/drivers/gpu/drm/i810/i810_drv.h 2011-11-11 15:19:27.000000000 -0500
7856 ++++ linux-3.1.4/drivers/gpu/drm/i810/i810_drv.h 2011-11-16 18:39:07.000000000 -0500
7857 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
7858 int page_flipping;
7859
7860 @@ -26653,9 +27401,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i810/i810_drv.h linux-3.1.3/drivers/gpu/d
7861
7862 int front_offset;
7863 } drm_i810_private_t;
7864 -diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c
7865 ---- linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-11 15:19:27.000000000 -0500
7866 -+++ linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-16 18:39:07.000000000 -0500
7867 +diff -urNp linux-3.1.4/drivers/gpu/drm/i915/i915_debugfs.c linux-3.1.4/drivers/gpu/drm/i915/i915_debugfs.c
7868 +--- linux-3.1.4/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-11 15:19:27.000000000 -0500
7869 ++++ linux-3.1.4/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-16 18:39:07.000000000 -0500
7870 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
7871 I915_READ(GTIMR));
7872 }
7873 @@ -26674,9 +27422,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.1.3/drivers/g
7874
7875 mutex_unlock(&dev->struct_mutex);
7876
7877 -diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c
7878 ---- linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c 2011-11-11 15:19:27.000000000 -0500
7879 -+++ linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c 2011-11-16 18:39:07.000000000 -0500
7880 +diff -urNp linux-3.1.4/drivers/gpu/drm/i915/i915_dma.c linux-3.1.4/drivers/gpu/drm/i915/i915_dma.c
7881 +--- linux-3.1.4/drivers/gpu/drm/i915/i915_dma.c 2011-11-11 15:19:27.000000000 -0500
7882 ++++ linux-3.1.4/drivers/gpu/drm/i915/i915_dma.c 2011-11-16 18:39:07.000000000 -0500
7883 @@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s
7884 bool can_switch;
7885
7886 @@ -26686,9 +27434,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_dma.c linux-3.1.3/drivers/gpu/d
7887 spin_unlock(&dev->count_lock);
7888 return can_switch;
7889 }
7890 -diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h
7891 ---- linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h 2011-11-11 15:19:27.000000000 -0500
7892 -+++ linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h 2011-11-16 18:39:07.000000000 -0500
7893 +diff -urNp linux-3.1.4/drivers/gpu/drm/i915/i915_drv.h linux-3.1.4/drivers/gpu/drm/i915/i915_drv.h
7894 +--- linux-3.1.4/drivers/gpu/drm/i915/i915_drv.h 2011-11-11 15:19:27.000000000 -0500
7895 ++++ linux-3.1.4/drivers/gpu/drm/i915/i915_drv.h 2011-11-16 18:39:07.000000000 -0500
7896 @@ -222,7 +222,7 @@ struct drm_i915_display_funcs {
7897 /* render clock increase/decrease */
7898 /* display clock increase/decrease */
7899 @@ -26725,9 +27473,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_drv.h linux-3.1.3/drivers/gpu/d
7900 {
7901 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
7902 }
7903 -diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
7904 ---- linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-11 15:19:27.000000000 -0500
7905 -+++ linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-16 18:39:07.000000000 -0500
7906 +diff -urNp linux-3.1.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.1.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
7907 +--- linux-3.1.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-11 15:19:27.000000000 -0500
7908 ++++ linux-3.1.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-16 18:39:07.000000000 -0500
7909 @@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
7910 i915_gem_clflush_object(obj);
7911
7912 @@ -26737,9 +27485,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.1.3/dr
7913
7914 /* The actual obj->write_domain will be updated with
7915 * pending_write_domain after we emit the accumulated flush for all
7916 -diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c
7917 ---- linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c 2011-11-11 15:19:27.000000000 -0500
7918 -+++ linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c 2011-11-16 18:39:07.000000000 -0500
7919 +diff -urNp linux-3.1.4/drivers/gpu/drm/i915/i915_irq.c linux-3.1.4/drivers/gpu/drm/i915/i915_irq.c
7920 +--- linux-3.1.4/drivers/gpu/drm/i915/i915_irq.c 2011-11-11 15:19:27.000000000 -0500
7921 ++++ linux-3.1.4/drivers/gpu/drm/i915/i915_irq.c 2011-11-16 18:39:07.000000000 -0500
7922 @@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler
7923 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
7924 struct drm_i915_master_private *master_priv;
7925 @@ -26785,9 +27533,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i915/i915_irq.c linux-3.1.3/drivers/gpu/d
7926
7927 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
7928 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
7929 -diff -urNp linux-3.1.3/drivers/gpu/drm/i915/intel_display.c linux-3.1.3/drivers/gpu/drm/i915/intel_display.c
7930 ---- linux-3.1.3/drivers/gpu/drm/i915/intel_display.c 2011-11-26 19:57:29.000000000 -0500
7931 -+++ linux-3.1.3/drivers/gpu/drm/i915/intel_display.c 2011-11-26 20:00:43.000000000 -0500
7932 +diff -urNp linux-3.1.4/drivers/gpu/drm/i915/intel_display.c linux-3.1.4/drivers/gpu/drm/i915/intel_display.c
7933 +--- linux-3.1.4/drivers/gpu/drm/i915/intel_display.c 2011-11-26 19:57:29.000000000 -0500
7934 ++++ linux-3.1.4/drivers/gpu/drm/i915/intel_display.c 2011-11-26 20:00:43.000000000 -0500
7935 @@ -2205,7 +2205,7 @@ intel_pipe_set_base(struct drm_crtc *crt
7936
7937 wait_event(dev_priv->pending_flip_queue,
7938 @@ -26833,9 +27581,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/i915/intel_display.c linux-3.1.3/drivers/
7939 cleanup_objs:
7940 drm_gem_object_unreference(&work->old_fb_obj->base);
7941 drm_gem_object_unreference(&obj->base);
7942 -diff -urNp linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h
7943 ---- linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h 2011-11-11 15:19:27.000000000 -0500
7944 -+++ linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h 2011-11-16 18:39:07.000000000 -0500
7945 +diff -urNp linux-3.1.4/drivers/gpu/drm/mga/mga_drv.h linux-3.1.4/drivers/gpu/drm/mga/mga_drv.h
7946 +--- linux-3.1.4/drivers/gpu/drm/mga/mga_drv.h 2011-11-11 15:19:27.000000000 -0500
7947 ++++ linux-3.1.4/drivers/gpu/drm/mga/mga_drv.h 2011-11-16 18:39:07.000000000 -0500
7948 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
7949 u32 clear_cmd;
7950 u32 maccess;
7951 @@ -26848,9 +27596,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/mga/mga_drv.h linux-3.1.3/drivers/gpu/drm
7952 u32 next_fence_to_post;
7953
7954 unsigned int fb_cpp;
7955 -diff -urNp linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c
7956 ---- linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c 2011-11-11 15:19:27.000000000 -0500
7957 -+++ linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c 2011-11-16 18:39:07.000000000 -0500
7958 +diff -urNp linux-3.1.4/drivers/gpu/drm/mga/mga_irq.c linux-3.1.4/drivers/gpu/drm/mga/mga_irq.c
7959 +--- linux-3.1.4/drivers/gpu/drm/mga/mga_irq.c 2011-11-11 15:19:27.000000000 -0500
7960 ++++ linux-3.1.4/drivers/gpu/drm/mga/mga_irq.c 2011-11-16 18:39:07.000000000 -0500
7961 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
7962 if (crtc != 0)
7963 return 0;
7964 @@ -26887,9 +27635,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/mga/mga_irq.c linux-3.1.3/drivers/gpu/drm
7965 - *sequence) <= (1 << 23)));
7966
7967 *sequence = cur_fence;
7968 -diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c
7969 ---- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-11 15:19:27.000000000 -0500
7970 -+++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-16 18:39:07.000000000 -0500
7971 +diff -urNp linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_bios.c
7972 +--- linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-11 15:19:27.000000000 -0500
7973 ++++ linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-16 18:39:07.000000000 -0500
7974 @@ -201,7 +201,7 @@ struct methods {
7975 const char desc[8];
7976 void (*loadbios)(struct drm_device *, uint8_t *);
7977 @@ -26908,9 +27656,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.1.3/driver
7978
7979 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
7980
7981 -diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h
7982 ---- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-11 15:19:27.000000000 -0500
7983 -+++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-16 18:39:07.000000000 -0500
7984 +diff -urNp linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_drv.h
7985 +--- linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-11 15:19:27.000000000 -0500
7986 ++++ linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-16 18:39:07.000000000 -0500
7987 @@ -238,7 +238,7 @@ struct nouveau_channel {
7988 struct list_head pending;
7989 uint32_t sequence;
7990 @@ -26963,9 +27711,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.1.3/drivers
7991 } ttm;
7992
7993 struct {
7994 -diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c
7995 ---- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-26 19:57:27.000000000 -0500
7996 -+++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-26 20:00:06.000000000 -0500
7997 +diff -urNp linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_fence.c
7998 +--- linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-26 19:57:27.000000000 -0500
7999 ++++ linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-26 20:00:06.000000000 -0500
8000 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
8001 if (USE_REFCNT(dev))
8002 sequence = nvchan_rd32(chan, 0x48);
8003 @@ -26984,9 +27732,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.1.3/drive
8004 return 0;
8005 }
8006
8007 -diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c
8008 ---- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-11 15:19:27.000000000 -0500
8009 -+++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-16 18:39:07.000000000 -0500
8010 +diff -urNp linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_gem.c
8011 +--- linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-11 15:19:27.000000000 -0500
8012 ++++ linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-16 18:39:07.000000000 -0500
8013 @@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *ch
8014 int trycnt = 0;
8015 int ret, i;
8016 @@ -26996,9 +27744,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.1.3/drivers
8017 retry:
8018 if (++trycnt > 100000) {
8019 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
8020 -diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c
8021 ---- linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-11 15:19:27.000000000 -0500
8022 -+++ linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-16 18:39:07.000000000 -0500
8023 +diff -urNp linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_state.c
8024 +--- linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-11 15:19:27.000000000 -0500
8025 ++++ linux-3.1.4/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-16 18:39:07.000000000 -0500
8026 @@ -496,7 +496,7 @@ static bool nouveau_switcheroo_can_switc
8027 bool can_switch;
8028
8029 @@ -27008,9 +27756,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.1.3/drive
8030 spin_unlock(&dev->count_lock);
8031 return can_switch;
8032 }
8033 -diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c
8034 ---- linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-11 15:19:27.000000000 -0500
8035 -+++ linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-16 18:39:07.000000000 -0500
8036 +diff -urNp linux-3.1.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.1.4/drivers/gpu/drm/nouveau/nv04_graph.c
8037 +--- linux-3.1.4/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-11 15:19:27.000000000 -0500
8038 ++++ linux-3.1.4/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-16 18:39:07.000000000 -0500
8039 @@ -554,7 +554,7 @@ static int
8040 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
8041 u32 class, u32 mthd, u32 data)
8042 @@ -27020,9 +27768,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.1.3/drivers/
8043 return 0;
8044 }
8045
8046 -diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c
8047 ---- linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c 2011-11-11 15:19:27.000000000 -0500
8048 -+++ linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c 2011-11-16 18:39:07.000000000 -0500
8049 +diff -urNp linux-3.1.4/drivers/gpu/drm/r128/r128_cce.c linux-3.1.4/drivers/gpu/drm/r128/r128_cce.c
8050 +--- linux-3.1.4/drivers/gpu/drm/r128/r128_cce.c 2011-11-11 15:19:27.000000000 -0500
8051 ++++ linux-3.1.4/drivers/gpu/drm/r128/r128_cce.c 2011-11-16 18:39:07.000000000 -0500
8052 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
8053
8054 /* GH: Simple idle check.
8055 @@ -27032,9 +27780,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_cce.c linux-3.1.3/drivers/gpu/d
8056
8057 /* We don't support anything other than bus-mastering ring mode,
8058 * but the ring can be in either AGP or PCI space for the ring
8059 -diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h
8060 ---- linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h 2011-11-11 15:19:27.000000000 -0500
8061 -+++ linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h 2011-11-16 18:39:07.000000000 -0500
8062 +diff -urNp linux-3.1.4/drivers/gpu/drm/r128/r128_drv.h linux-3.1.4/drivers/gpu/drm/r128/r128_drv.h
8063 +--- linux-3.1.4/drivers/gpu/drm/r128/r128_drv.h 2011-11-11 15:19:27.000000000 -0500
8064 ++++ linux-3.1.4/drivers/gpu/drm/r128/r128_drv.h 2011-11-16 18:39:07.000000000 -0500
8065 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
8066 int is_pci;
8067 unsigned long cce_buffers_offset;
8068 @@ -27052,9 +27800,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_drv.h linux-3.1.3/drivers/gpu/d
8069
8070 u32 color_fmt;
8071 unsigned int front_offset;
8072 -diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c
8073 ---- linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c 2011-11-11 15:19:27.000000000 -0500
8074 -+++ linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c 2011-11-16 18:39:07.000000000 -0500
8075 +diff -urNp linux-3.1.4/drivers/gpu/drm/r128/r128_irq.c linux-3.1.4/drivers/gpu/drm/r128/r128_irq.c
8076 +--- linux-3.1.4/drivers/gpu/drm/r128/r128_irq.c 2011-11-11 15:19:27.000000000 -0500
8077 ++++ linux-3.1.4/drivers/gpu/drm/r128/r128_irq.c 2011-11-16 18:39:07.000000000 -0500
8078 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
8079 if (crtc != 0)
8080 return 0;
8081 @@ -27073,9 +27821,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_irq.c linux-3.1.3/drivers/gpu/d
8082 drm_handle_vblank(dev, 0);
8083 return IRQ_HANDLED;
8084 }
8085 -diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_state.c linux-3.1.3/drivers/gpu/drm/r128/r128_state.c
8086 ---- linux-3.1.3/drivers/gpu/drm/r128/r128_state.c 2011-11-11 15:19:27.000000000 -0500
8087 -+++ linux-3.1.3/drivers/gpu/drm/r128/r128_state.c 2011-11-16 18:39:07.000000000 -0500
8088 +diff -urNp linux-3.1.4/drivers/gpu/drm/r128/r128_state.c linux-3.1.4/drivers/gpu/drm/r128/r128_state.c
8089 +--- linux-3.1.4/drivers/gpu/drm/r128/r128_state.c 2011-11-11 15:19:27.000000000 -0500
8090 ++++ linux-3.1.4/drivers/gpu/drm/r128/r128_state.c 2011-11-16 18:39:07.000000000 -0500
8091 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
8092
8093 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
8094 @@ -27089,9 +27837,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/r128/r128_state.c linux-3.1.3/drivers/gpu
8095 }
8096
8097 #endif
8098 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/atom.c linux-3.1.3/drivers/gpu/drm/radeon/atom.c
8099 ---- linux-3.1.3/drivers/gpu/drm/radeon/atom.c 2011-11-11 15:19:27.000000000 -0500
8100 -+++ linux-3.1.3/drivers/gpu/drm/radeon/atom.c 2011-11-16 19:09:42.000000000 -0500
8101 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/atom.c linux-3.1.4/drivers/gpu/drm/radeon/atom.c
8102 +--- linux-3.1.4/drivers/gpu/drm/radeon/atom.c 2011-11-11 15:19:27.000000000 -0500
8103 ++++ linux-3.1.4/drivers/gpu/drm/radeon/atom.c 2011-11-16 19:09:42.000000000 -0500
8104 @@ -1254,6 +1254,8 @@ struct atom_context *atom_parse(struct c
8105 char name[512];
8106 int i;
8107 @@ -27101,9 +27849,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/atom.c linux-3.1.3/drivers/gpu/drm
8108 if (!ctx)
8109 return NULL;
8110
8111 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c
8112 ---- linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c 2011-11-11 15:19:27.000000000 -0500
8113 -+++ linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c 2011-11-16 18:39:07.000000000 -0500
8114 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/mkregtable.c linux-3.1.4/drivers/gpu/drm/radeon/mkregtable.c
8115 +--- linux-3.1.4/drivers/gpu/drm/radeon/mkregtable.c 2011-11-11 15:19:27.000000000 -0500
8116 ++++ linux-3.1.4/drivers/gpu/drm/radeon/mkregtable.c 2011-11-16 18:39:07.000000000 -0500
8117 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
8118 regex_t mask_rex;
8119 regmatch_t match[4];
8120 @@ -27121,9 +27869,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.1.3/drivers/g
8121
8122 if (regcomp
8123 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
8124 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c
8125 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-11 15:19:27.000000000 -0500
8126 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-16 18:40:10.000000000 -0500
8127 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_atombios.c
8128 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-11 15:19:27.000000000 -0500
8129 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-16 18:40:10.000000000 -0500
8130 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
8131 struct radeon_gpio_rec gpio;
8132 struct radeon_hpd hpd;
8133 @@ -27133,9 +27881,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.1.3/driv
8134 if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
8135 return false;
8136
8137 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c
8138 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c 2011-11-11 15:19:27.000000000 -0500
8139 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c 2011-11-16 18:39:07.000000000 -0500
8140 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_device.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_device.c
8141 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_device.c 2011-11-11 15:19:27.000000000 -0500
8142 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_device.c 2011-11-16 18:39:07.000000000 -0500
8143 @@ -684,7 +684,7 @@ static bool radeon_switcheroo_can_switch
8144 bool can_switch;
8145
8146 @@ -27145,9 +27893,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.1.3/driver
8147 spin_unlock(&dev->count_lock);
8148 return can_switch;
8149 }
8150 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c
8151 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c 2011-11-11 15:19:27.000000000 -0500
8152 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c 2011-11-16 18:40:10.000000000 -0500
8153 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_display.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_display.c
8154 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_display.c 2011-11-11 15:19:27.000000000 -0500
8155 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_display.c 2011-11-16 18:40:10.000000000 -0500
8156 @@ -925,6 +925,8 @@ void radeon_compute_pll_legacy(struct ra
8157 uint32_t post_div;
8158 u32 pll_out_min, pll_out_max;
8159 @@ -27157,9 +27905,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.1.3/drive
8160 DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
8161 freq = freq * 1000;
8162
8163 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h
8164 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-11 15:19:27.000000000 -0500
8165 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-16 18:39:07.000000000 -0500
8166 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_drv.h linux-3.1.4/drivers/gpu/drm/radeon/radeon_drv.h
8167 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-11 15:19:27.000000000 -0500
8168 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-16 18:39:07.000000000 -0500
8169 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
8170
8171 /* SW interrupt */
8172 @@ -27169,9 +27917,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.1.3/drivers/g
8173 int vblank_crtc;
8174 uint32_t irq_enable_reg;
8175 uint32_t r500_disp_irq_reg;
8176 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c
8177 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-11 15:19:27.000000000 -0500
8178 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-16 18:39:07.000000000 -0500
8179 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_fence.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_fence.c
8180 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-11 15:19:27.000000000 -0500
8181 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-16 18:39:07.000000000 -0500
8182 @@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
8183 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
8184 return 0;
8185 @@ -27190,9 +27938,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.1.3/drivers
8186 INIT_LIST_HEAD(&rdev->fence_drv.created);
8187 INIT_LIST_HEAD(&rdev->fence_drv.emited);
8188 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
8189 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon.h linux-3.1.3/drivers/gpu/drm/radeon/radeon.h
8190 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon.h 2011-11-11 15:19:27.000000000 -0500
8191 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon.h 2011-11-16 18:39:07.000000000 -0500
8192 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon.h linux-3.1.4/drivers/gpu/drm/radeon/radeon.h
8193 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon.h 2011-11-11 15:19:27.000000000 -0500
8194 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon.h 2011-11-16 18:39:07.000000000 -0500
8195 @@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_d
8196 */
8197 struct radeon_fence_driver {
8198 @@ -27211,9 +27959,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon.h linux-3.1.3/drivers/gpu/d
8199
8200 /*
8201 * Asic structures
8202 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c
8203 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-11 15:19:27.000000000 -0500
8204 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-16 18:39:07.000000000 -0500
8205 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_ioc32.c
8206 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-11 15:19:27.000000000 -0500
8207 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-16 18:39:07.000000000 -0500
8208 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
8209 request = compat_alloc_user_space(sizeof(*request));
8210 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
8211 @@ -27223,9 +27971,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.1.3/drivers
8212 &request->value))
8213 return -EFAULT;
8214
8215 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c
8216 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-11 15:19:27.000000000 -0500
8217 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-16 18:39:07.000000000 -0500
8218 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_irq.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_irq.c
8219 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-11 15:19:27.000000000 -0500
8220 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-16 18:39:07.000000000 -0500
8221 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
8222 unsigned int ret;
8223 RING_LOCALS;
8224 @@ -27246,9 +27994,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.1.3/drivers/g
8225 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
8226
8227 dev->max_vblank_count = 0x001fffff;
8228 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c
8229 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c 2011-11-11 15:19:27.000000000 -0500
8230 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c 2011-11-16 18:39:07.000000000 -0500
8231 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_state.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_state.c
8232 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_state.c 2011-11-11 15:19:27.000000000 -0500
8233 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_state.c 2011-11-16 18:39:07.000000000 -0500
8234 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
8235 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
8236 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
8237 @@ -27267,9 +28015,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.1.3/drivers
8238
8239 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
8240
8241 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c
8242 ---- linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-11 15:19:27.000000000 -0500
8243 -+++ linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-16 18:39:07.000000000 -0500
8244 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.1.4/drivers/gpu/drm/radeon/radeon_ttm.c
8245 +--- linux-3.1.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-11 15:19:27.000000000 -0500
8246 ++++ linux-3.1.4/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-16 18:39:07.000000000 -0500
8247 @@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struc
8248 }
8249 if (unlikely(ttm_vm_ops == NULL)) {
8250 @@ -27283,9 +28031,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.1.3/drivers/g
8251 }
8252 vma->vm_ops = &radeon_ttm_vm_ops;
8253 return 0;
8254 -diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/rs690.c linux-3.1.3/drivers/gpu/drm/radeon/rs690.c
8255 ---- linux-3.1.3/drivers/gpu/drm/radeon/rs690.c 2011-11-11 15:19:27.000000000 -0500
8256 -+++ linux-3.1.3/drivers/gpu/drm/radeon/rs690.c 2011-11-16 18:39:07.000000000 -0500
8257 +diff -urNp linux-3.1.4/drivers/gpu/drm/radeon/rs690.c linux-3.1.4/drivers/gpu/drm/radeon/rs690.c
8258 +--- linux-3.1.4/drivers/gpu/drm/radeon/rs690.c 2011-11-11 15:19:27.000000000 -0500
8259 ++++ linux-3.1.4/drivers/gpu/drm/radeon/rs690.c 2011-11-16 18:39:07.000000000 -0500
8260 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct
8261 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
8262 rdev->pm.sideport_bandwidth.full)
8263 @@ -27299,9 +28047,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/radeon/rs690.c linux-3.1.3/drivers/gpu/dr
8264 } else {
8265 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
8266 rdev->pm.k8_bandwidth.full)
8267 -diff -urNp linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c
8268 ---- linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-11 15:19:27.000000000 -0500
8269 -+++ linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-16 18:39:07.000000000 -0500
8270 +diff -urNp linux-3.1.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.1.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
8271 +--- linux-3.1.4/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-11 15:19:27.000000000 -0500
8272 ++++ linux-3.1.4/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-16 18:39:07.000000000 -0500
8273 @@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages
8274 static int ttm_pool_mm_shrink(struct shrinker *shrink,
8275 struct shrink_control *sc)
8276 @@ -27314,9 +28062,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.1.3/drivers/
8277 struct ttm_page_pool *pool;
8278 int shrink_pages = sc->nr_to_scan;
8279
8280 -diff -urNp linux-3.1.3/drivers/gpu/drm/via/via_drv.h linux-3.1.3/drivers/gpu/drm/via/via_drv.h
8281 ---- linux-3.1.3/drivers/gpu/drm/via/via_drv.h 2011-11-11 15:19:27.000000000 -0500
8282 -+++ linux-3.1.3/drivers/gpu/drm/via/via_drv.h 2011-11-16 18:39:07.000000000 -0500
8283 +diff -urNp linux-3.1.4/drivers/gpu/drm/via/via_drv.h linux-3.1.4/drivers/gpu/drm/via/via_drv.h
8284 +--- linux-3.1.4/drivers/gpu/drm/via/via_drv.h 2011-11-11 15:19:27.000000000 -0500
8285 ++++ linux-3.1.4/drivers/gpu/drm/via/via_drv.h 2011-11-16 18:39:07.000000000 -0500
8286 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
8287 typedef uint32_t maskarray_t[5];
8288
8289 @@ -27335,9 +28083,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/via/via_drv.h linux-3.1.3/drivers/gpu/drm
8290 drm_via_state_t hc_state;
8291 char pci_buf[VIA_PCI_BUF_SIZE];
8292 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
8293 -diff -urNp linux-3.1.3/drivers/gpu/drm/via/via_irq.c linux-3.1.3/drivers/gpu/drm/via/via_irq.c
8294 ---- linux-3.1.3/drivers/gpu/drm/via/via_irq.c 2011-11-11 15:19:27.000000000 -0500
8295 -+++ linux-3.1.3/drivers/gpu/drm/via/via_irq.c 2011-11-16 18:39:07.000000000 -0500
8296 +diff -urNp linux-3.1.4/drivers/gpu/drm/via/via_irq.c linux-3.1.4/drivers/gpu/drm/via/via_irq.c
8297 +--- linux-3.1.4/drivers/gpu/drm/via/via_irq.c 2011-11-11 15:19:27.000000000 -0500
8298 ++++ linux-3.1.4/drivers/gpu/drm/via/via_irq.c 2011-11-16 18:39:07.000000000 -0500
8299 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
8300 if (crtc != 0)
8301 return 0;
8302 @@ -27408,9 +28156,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/via/via_irq.c linux-3.1.3/drivers/gpu/drm
8303 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
8304 case VIA_IRQ_ABSOLUTE:
8305 break;
8306 -diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
8307 ---- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-11 15:19:27.000000000 -0500
8308 -+++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-16 18:39:07.000000000 -0500
8309 +diff -urNp linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
8310 +--- linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-11 15:19:27.000000000 -0500
8311 ++++ linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-16 18:39:07.000000000 -0500
8312 @@ -240,7 +240,7 @@ struct vmw_private {
8313 * Fencing and IRQs.
8314 */
8315 @@ -27420,9 +28168,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.1.3/drivers/g
8316 wait_queue_head_t fence_queue;
8317 wait_queue_head_t fifo_queue;
8318 atomic_t fence_queue_waiters;
8319 -diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
8320 ---- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-11 15:19:27.000000000 -0500
8321 -+++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-16 18:39:07.000000000 -0500
8322 +diff -urNp linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
8323 +--- linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-11 15:19:27.000000000 -0500
8324 ++++ linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-16 18:39:07.000000000 -0500
8325 @@ -610,7 +610,7 @@ int vmw_execbuf_ioctl(struct drm_device
8326 struct drm_vmw_fence_rep fence_rep;
8327 struct drm_vmw_fence_rep __user *user_fence_rep;
8328 @@ -27432,9 +28180,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.1.3/drive
8329 void *cmd;
8330 uint32_t sequence;
8331 struct vmw_sw_context *sw_context = &dev_priv->ctx;
8332 -diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
8333 ---- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-11 15:19:27.000000000 -0500
8334 -+++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-16 18:39:07.000000000 -0500
8335 +diff -urNp linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
8336 +--- linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-11 15:19:27.000000000 -0500
8337 ++++ linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-16 18:39:07.000000000 -0500
8338 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
8339 while (!vmw_lag_lt(queue, us)) {
8340 spin_lock(&queue->lock);
8341 @@ -27444,9 +28192,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.1.3/drivers
8342 else {
8343 fence = list_first_entry(&queue->head,
8344 struct vmw_fence, head);
8345 -diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
8346 ---- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-11 15:19:27.000000000 -0500
8347 -+++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-16 18:39:07.000000000 -0500
8348 +diff -urNp linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
8349 +--- linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-11 15:19:27.000000000 -0500
8350 ++++ linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-16 18:39:07.000000000 -0500
8351 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
8352 (unsigned int) min,
8353 (unsigned int) fifo->capabilities);
8354 @@ -27483,9 +28231,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.1.3/drivers/
8355 } while (*sequence == 0);
8356
8357 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
8358 -diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
8359 ---- linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-11 15:19:27.000000000 -0500
8360 -+++ linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-16 18:39:07.000000000 -0500
8361 +diff -urNp linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
8362 +--- linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-11 15:19:27.000000000 -0500
8363 ++++ linux-3.1.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-16 18:39:07.000000000 -0500
8364 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
8365 * emitted. Then the fence is stale and signaled.
8366 */
8367 @@ -27504,9 +28252,9 @@ diff -urNp linux-3.1.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.1.3/drivers/g
8368 ret = 0;
8369
8370 for (;;) {
8371 -diff -urNp linux-3.1.3/drivers/hid/hid-core.c linux-3.1.3/drivers/hid/hid-core.c
8372 ---- linux-3.1.3/drivers/hid/hid-core.c 2011-11-11 15:19:27.000000000 -0500
8373 -+++ linux-3.1.3/drivers/hid/hid-core.c 2011-11-16 18:39:07.000000000 -0500
8374 +diff -urNp linux-3.1.4/drivers/hid/hid-core.c linux-3.1.4/drivers/hid/hid-core.c
8375 +--- linux-3.1.4/drivers/hid/hid-core.c 2011-11-11 15:19:27.000000000 -0500
8376 ++++ linux-3.1.4/drivers/hid/hid-core.c 2011-11-16 18:39:07.000000000 -0500
8377 @@ -1951,7 +1951,7 @@ static bool hid_ignore(struct hid_device
8378
8379 int hid_add_device(struct hid_device *hdev)
8380 @@ -27525,9 +28273,9 @@ diff -urNp linux-3.1.3/drivers/hid/hid-core.c linux-3.1.3/drivers/hid/hid-core.c
8381
8382 hid_debug_register(hdev, dev_name(&hdev->dev));
8383 ret = device_add(&hdev->dev);
8384 -diff -urNp linux-3.1.3/drivers/hid/usbhid/hiddev.c linux-3.1.3/drivers/hid/usbhid/hiddev.c
8385 ---- linux-3.1.3/drivers/hid/usbhid/hiddev.c 2011-11-11 15:19:27.000000000 -0500
8386 -+++ linux-3.1.3/drivers/hid/usbhid/hiddev.c 2011-11-16 18:39:07.000000000 -0500
8387 +diff -urNp linux-3.1.4/drivers/hid/usbhid/hiddev.c linux-3.1.4/drivers/hid/usbhid/hiddev.c
8388 +--- linux-3.1.4/drivers/hid/usbhid/hiddev.c 2011-11-11 15:19:27.000000000 -0500
8389 ++++ linux-3.1.4/drivers/hid/usbhid/hiddev.c 2011-11-16 18:39:07.000000000 -0500
8390 @@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
8391 break;
8392
8393 @@ -27537,9 +28285,9 @@ diff -urNp linux-3.1.3/drivers/hid/usbhid/hiddev.c linux-3.1.3/drivers/hid/usbhi
8394 break;
8395
8396 for (i = 0; i < hid->maxcollection; i++)
8397 -diff -urNp linux-3.1.3/drivers/hwmon/acpi_power_meter.c linux-3.1.3/drivers/hwmon/acpi_power_meter.c
8398 ---- linux-3.1.3/drivers/hwmon/acpi_power_meter.c 2011-11-11 15:19:27.000000000 -0500
8399 -+++ linux-3.1.3/drivers/hwmon/acpi_power_meter.c 2011-11-16 18:39:07.000000000 -0500
8400 +diff -urNp linux-3.1.4/drivers/hwmon/acpi_power_meter.c linux-3.1.4/drivers/hwmon/acpi_power_meter.c
8401 +--- linux-3.1.4/drivers/hwmon/acpi_power_meter.c 2011-11-11 15:19:27.000000000 -0500
8402 ++++ linux-3.1.4/drivers/hwmon/acpi_power_meter.c 2011-11-16 18:39:07.000000000 -0500
8403 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
8404 return res;
8405
8406 @@ -27549,9 +28297,9 @@ diff -urNp linux-3.1.3/drivers/hwmon/acpi_power_meter.c linux-3.1.3/drivers/hwmo
8407
8408 mutex_lock(&resource->lock);
8409 resource->trip[attr->index - 7] = temp;
8410 -diff -urNp linux-3.1.3/drivers/hwmon/sht15.c linux-3.1.3/drivers/hwmon/sht15.c
8411 ---- linux-3.1.3/drivers/hwmon/sht15.c 2011-11-11 15:19:27.000000000 -0500
8412 -+++ linux-3.1.3/drivers/hwmon/sht15.c 2011-11-16 18:39:07.000000000 -0500
8413 +diff -urNp linux-3.1.4/drivers/hwmon/sht15.c linux-3.1.4/drivers/hwmon/sht15.c
8414 +--- linux-3.1.4/drivers/hwmon/sht15.c 2011-11-11 15:19:27.000000000 -0500
8415 ++++ linux-3.1.4/drivers/hwmon/sht15.c 2011-11-16 18:39:07.000000000 -0500
8416 @@ -166,7 +166,7 @@ struct sht15_data {
8417 int supply_uV;
8418 bool supply_uV_valid;
8419 @@ -27600,9 +28348,9 @@ diff -urNp linux-3.1.3/drivers/hwmon/sht15.c linux-3.1.3/drivers/hwmon/sht15.c
8420 return;
8421 }
8422
8423 -diff -urNp linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c
8424 ---- linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-11 15:19:27.000000000 -0500
8425 -+++ linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-16 18:39:07.000000000 -0500
8426 +diff -urNp linux-3.1.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.1.4/drivers/i2c/busses/i2c-amd756-s4882.c
8427 +--- linux-3.1.4/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-11 15:19:27.000000000 -0500
8428 ++++ linux-3.1.4/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-16 18:39:07.000000000 -0500
8429 @@ -43,7 +43,7 @@
8430 extern struct i2c_adapter amd756_smbus;
8431
8432 @@ -27612,9 +28360,9 @@ diff -urNp linux-3.1.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.1.3/drivers
8433
8434 /* Wrapper access functions for multiplexed SMBus */
8435 static DEFINE_MUTEX(amd756_lock);
8436 -diff -urNp linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c
8437 ---- linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-11 15:19:27.000000000 -0500
8438 -+++ linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-16 18:39:07.000000000 -0500
8439 +diff -urNp linux-3.1.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.1.4/drivers/i2c/busses/i2c-nforce2-s4985.c
8440 +--- linux-3.1.4/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-11 15:19:27.000000000 -0500
8441 ++++ linux-3.1.4/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-16 18:39:07.000000000 -0500
8442 @@ -41,7 +41,7 @@
8443 extern struct i2c_adapter *nforce2_smbus;
8444
8445 @@ -27624,9 +28372,9 @@ diff -urNp linux-3.1.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.1.3/driver
8446
8447 /* Wrapper access functions for multiplexed SMBus */
8448 static DEFINE_MUTEX(nforce2_lock);
8449 -diff -urNp linux-3.1.3/drivers/i2c/i2c-mux.c linux-3.1.3/drivers/i2c/i2c-mux.c
8450 ---- linux-3.1.3/drivers/i2c/i2c-mux.c 2011-11-11 15:19:27.000000000 -0500
8451 -+++ linux-3.1.3/drivers/i2c/i2c-mux.c 2011-11-16 18:39:07.000000000 -0500
8452 +diff -urNp linux-3.1.4/drivers/i2c/i2c-mux.c linux-3.1.4/drivers/i2c/i2c-mux.c
8453 +--- linux-3.1.4/drivers/i2c/i2c-mux.c 2011-11-11 15:19:27.000000000 -0500
8454 ++++ linux-3.1.4/drivers/i2c/i2c-mux.c 2011-11-16 18:39:07.000000000 -0500
8455 @@ -28,7 +28,7 @@
8456 /* multiplexer per channel data */
8457 struct i2c_mux_priv {
8458 @@ -27636,9 +28384,9 @@ diff -urNp linux-3.1.3/drivers/i2c/i2c-mux.c linux-3.1.3/drivers/i2c/i2c-mux.c
8459
8460 struct i2c_adapter *parent;
8461 void *mux_dev; /* the mux chip/device */
8462 -diff -urNp linux-3.1.3/drivers/ide/aec62xx.c linux-3.1.3/drivers/ide/aec62xx.c
8463 ---- linux-3.1.3/drivers/ide/aec62xx.c 2011-11-11 15:19:27.000000000 -0500
8464 -+++ linux-3.1.3/drivers/ide/aec62xx.c 2011-11-16 18:39:07.000000000 -0500
8465 +diff -urNp linux-3.1.4/drivers/ide/aec62xx.c linux-3.1.4/drivers/ide/aec62xx.c
8466 +--- linux-3.1.4/drivers/ide/aec62xx.c 2011-11-11 15:19:27.000000000 -0500
8467 ++++ linux-3.1.4/drivers/ide/aec62xx.c 2011-11-16 18:39:07.000000000 -0500
8468 @@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_
8469 .cable_detect = atp86x_cable_detect,
8470 };
8471 @@ -27648,9 +28396,9 @@ diff -urNp linux-3.1.3/drivers/ide/aec62xx.c linux-3.1.3/drivers/ide/aec62xx.c
8472 { /* 0: AEC6210 */
8473 .name = DRV_NAME,
8474 .init_chipset = init_chipset_aec62xx,
8475 -diff -urNp linux-3.1.3/drivers/ide/alim15x3.c linux-3.1.3/drivers/ide/alim15x3.c
8476 ---- linux-3.1.3/drivers/ide/alim15x3.c 2011-11-11 15:19:27.000000000 -0500
8477 -+++ linux-3.1.3/drivers/ide/alim15x3.c 2011-11-16 18:39:07.000000000 -0500
8478 +diff -urNp linux-3.1.4/drivers/ide/alim15x3.c linux-3.1.4/drivers/ide/alim15x3.c
8479 +--- linux-3.1.4/drivers/ide/alim15x3.c 2011-11-11 15:19:27.000000000 -0500
8480 ++++ linux-3.1.4/drivers/ide/alim15x3.c 2011-11-16 18:39:07.000000000 -0500
8481 @@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_
8482 .dma_sff_read_status = ide_dma_sff_read_status,
8483 };
8484 @@ -27660,9 +28408,9 @@ diff -urNp linux-3.1.3/drivers/ide/alim15x3.c linux-3.1.3/drivers/ide/alim15x3.c
8485 .name = DRV_NAME,
8486 .init_chipset = init_chipset_ali15x3,
8487 .init_hwif = init_hwif_ali15x3,
8488 -diff -urNp linux-3.1.3/drivers/ide/amd74xx.c linux-3.1.3/drivers/ide/amd74xx.c
8489 ---- linux-3.1.3/drivers/ide/amd74xx.c 2011-11-11 15:19:27.000000000 -0500
8490 -+++ linux-3.1.3/drivers/ide/amd74xx.c 2011-11-16 18:39:07.000000000 -0500
8491 +diff -urNp linux-3.1.4/drivers/ide/amd74xx.c linux-3.1.4/drivers/ide/amd74xx.c
8492 +--- linux-3.1.4/drivers/ide/amd74xx.c 2011-11-11 15:19:27.000000000 -0500
8493 ++++ linux-3.1.4/drivers/ide/amd74xx.c 2011-11-16 18:39:07.000000000 -0500
8494 @@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por
8495 .udma_mask = udma, \
8496 }
8497 @@ -27672,9 +28420,9 @@ diff -urNp linux-3.1.3/drivers/ide/amd74xx.c linux-3.1.3/drivers/ide/amd74xx.c
8498 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
8499 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
8500 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
8501 -diff -urNp linux-3.1.3/drivers/ide/atiixp.c linux-3.1.3/drivers/ide/atiixp.c
8502 ---- linux-3.1.3/drivers/ide/atiixp.c 2011-11-11 15:19:27.000000000 -0500
8503 -+++ linux-3.1.3/drivers/ide/atiixp.c 2011-11-16 18:39:07.000000000 -0500
8504 +diff -urNp linux-3.1.4/drivers/ide/atiixp.c linux-3.1.4/drivers/ide/atiixp.c
8505 +--- linux-3.1.4/drivers/ide/atiixp.c 2011-11-11 15:19:27.000000000 -0500
8506 ++++ linux-3.1.4/drivers/ide/atiixp.c 2011-11-16 18:39:07.000000000 -0500
8507 @@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_
8508 .cable_detect = atiixp_cable_detect,
8509 };
8510 @@ -27684,9 +28432,9 @@ diff -urNp linux-3.1.3/drivers/ide/atiixp.c linux-3.1.3/drivers/ide/atiixp.c
8511 { /* 0: IXP200/300/400/700 */
8512 .name = DRV_NAME,
8513 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
8514 -diff -urNp linux-3.1.3/drivers/ide/cmd64x.c linux-3.1.3/drivers/ide/cmd64x.c
8515 ---- linux-3.1.3/drivers/ide/cmd64x.c 2011-11-11 15:19:27.000000000 -0500
8516 -+++ linux-3.1.3/drivers/ide/cmd64x.c 2011-11-16 18:39:07.000000000 -0500
8517 +diff -urNp linux-3.1.4/drivers/ide/cmd64x.c linux-3.1.4/drivers/ide/cmd64x.c
8518 +--- linux-3.1.4/drivers/ide/cmd64x.c 2011-11-11 15:19:27.000000000 -0500
8519 ++++ linux-3.1.4/drivers/ide/cmd64x.c 2011-11-16 18:39:07.000000000 -0500
8520 @@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r
8521 .dma_sff_read_status = ide_dma_sff_read_status,
8522 };
8523 @@ -27696,9 +28444,9 @@ diff -urNp linux-3.1.3/drivers/ide/cmd64x.c linux-3.1.3/drivers/ide/cmd64x.c
8524 { /* 0: CMD643 */
8525 .name = DRV_NAME,
8526 .init_chipset = init_chipset_cmd64x,
8527 -diff -urNp linux-3.1.3/drivers/ide/cs5520.c linux-3.1.3/drivers/ide/cs5520.c
8528 ---- linux-3.1.3/drivers/ide/cs5520.c 2011-11-11 15:19:27.000000000 -0500
8529 -+++ linux-3.1.3/drivers/ide/cs5520.c 2011-11-16 18:39:07.000000000 -0500
8530 +diff -urNp linux-3.1.4/drivers/ide/cs5520.c linux-3.1.4/drivers/ide/cs5520.c
8531 +--- linux-3.1.4/drivers/ide/cs5520.c 2011-11-11 15:19:27.000000000 -0500
8532 ++++ linux-3.1.4/drivers/ide/cs5520.c 2011-11-16 18:39:07.000000000 -0500
8533 @@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_
8534 .set_dma_mode = cs5520_set_dma_mode,
8535 };
8536 @@ -27708,9 +28456,9 @@ diff -urNp linux-3.1.3/drivers/ide/cs5520.c linux-3.1.3/drivers/ide/cs5520.c
8537 .name = DRV_NAME,
8538 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
8539 .port_ops = &cs5520_port_ops,
8540 -diff -urNp linux-3.1.3/drivers/ide/cs5530.c linux-3.1.3/drivers/ide/cs5530.c
8541 ---- linux-3.1.3/drivers/ide/cs5530.c 2011-11-11 15:19:27.000000000 -0500
8542 -+++ linux-3.1.3/drivers/ide/cs5530.c 2011-11-16 18:39:07.000000000 -0500
8543 +diff -urNp linux-3.1.4/drivers/ide/cs5530.c linux-3.1.4/drivers/ide/cs5530.c
8544 +--- linux-3.1.4/drivers/ide/cs5530.c 2011-11-11 15:19:27.000000000 -0500
8545 ++++ linux-3.1.4/drivers/ide/cs5530.c 2011-11-16 18:39:07.000000000 -0500
8546 @@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_
8547 .udma_filter = cs5530_udma_filter,
8548 };
8549 @@ -27720,9 +28468,9 @@ diff -urNp linux-3.1.3/drivers/ide/cs5530.c linux-3.1.3/drivers/ide/cs5530.c
8550 .name = DRV_NAME,
8551 .init_chipset = init_chipset_cs5530,
8552 .init_hwif = init_hwif_cs5530,
8553 -diff -urNp linux-3.1.3/drivers/ide/cs5535.c linux-3.1.3/drivers/ide/cs5535.c
8554 ---- linux-3.1.3/drivers/ide/cs5535.c 2011-11-11 15:19:27.000000000 -0500
8555 -+++ linux-3.1.3/drivers/ide/cs5535.c 2011-11-16 18:39:07.000000000 -0500
8556 +diff -urNp linux-3.1.4/drivers/ide/cs5535.c linux-3.1.4/drivers/ide/cs5535.c
8557 +--- linux-3.1.4/drivers/ide/cs5535.c 2011-11-11 15:19:27.000000000 -0500
8558 ++++ linux-3.1.4/drivers/ide/cs5535.c 2011-11-16 18:39:07.000000000 -0500
8559 @@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_
8560 .cable_detect = cs5535_cable_detect,
8561 };
8562 @@ -27732,9 +28480,9 @@ diff -urNp linux-3.1.3/drivers/ide/cs5535.c linux-3.1.3/drivers/ide/cs5535.c
8563 .name = DRV_NAME,
8564 .port_ops = &cs5535_port_ops,
8565 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
8566 -diff -urNp linux-3.1.3/drivers/ide/cy82c693.c linux-3.1.3/drivers/ide/cy82c693.c
8567 ---- linux-3.1.3/drivers/ide/cy82c693.c 2011-11-11 15:19:27.000000000 -0500
8568 -+++ linux-3.1.3/drivers/ide/cy82c693.c 2011-11-16 18:39:07.000000000 -0500
8569 +diff -urNp linux-3.1.4/drivers/ide/cy82c693.c linux-3.1.4/drivers/ide/cy82c693.c
8570 +--- linux-3.1.4/drivers/ide/cy82c693.c 2011-11-11 15:19:27.000000000 -0500
8571 ++++ linux-3.1.4/drivers/ide/cy82c693.c 2011-11-16 18:39:07.000000000 -0500
8572 @@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c69
8573 .set_dma_mode = cy82c693_set_dma_mode,
8574 };
8575 @@ -27744,9 +28492,9 @@ diff -urNp linux-3.1.3/drivers/ide/cy82c693.c linux-3.1.3/drivers/ide/cy82c693.c
8576 .name = DRV_NAME,
8577 .init_iops = init_iops_cy82c693,
8578 .port_ops = &cy82c693_port_ops,
8579 -diff -urNp linux-3.1.3/drivers/ide/hpt366.c linux-3.1.3/drivers/ide/hpt366.c
8580 ---- linux-3.1.3/drivers/ide/hpt366.c 2011-11-11 15:19:27.000000000 -0500
8581 -+++ linux-3.1.3/drivers/ide/hpt366.c 2011-11-16 18:39:07.000000000 -0500
8582 +diff -urNp linux-3.1.4/drivers/ide/hpt366.c linux-3.1.4/drivers/ide/hpt366.c
8583 +--- linux-3.1.4/drivers/ide/hpt366.c 2011-11-11 15:19:27.000000000 -0500
8584 ++++ linux-3.1.4/drivers/ide/hpt366.c 2011-11-16 18:39:07.000000000 -0500
8585 @@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings
8586 }
8587 };
8588 @@ -27855,9 +28603,9 @@ diff -urNp linux-3.1.3/drivers/ide/hpt366.c linux-3.1.3/drivers/ide/hpt366.c
8589 { /* 0: HPT36x */
8590 .name = DRV_NAME,
8591 .init_chipset = init_chipset_hpt366,
8592 -diff -urNp linux-3.1.3/drivers/ide/ide-cd.c linux-3.1.3/drivers/ide/ide-cd.c
8593 ---- linux-3.1.3/drivers/ide/ide-cd.c 2011-11-11 15:19:27.000000000 -0500
8594 -+++ linux-3.1.3/drivers/ide/ide-cd.c 2011-11-16 18:39:07.000000000 -0500
8595 +diff -urNp linux-3.1.4/drivers/ide/ide-cd.c linux-3.1.4/drivers/ide/ide-cd.c
8596 +--- linux-3.1.4/drivers/ide/ide-cd.c 2011-11-11 15:19:27.000000000 -0500
8597 ++++ linux-3.1.4/drivers/ide/ide-cd.c 2011-11-16 18:39:07.000000000 -0500
8598 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
8599 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
8600 if ((unsigned long)buf & alignment
8601 @@ -27867,9 +28615,9 @@ diff -urNp linux-3.1.3/drivers/ide/ide-cd.c linux-3.1.3/drivers/ide/ide-cd.c
8602 drive->dma = 0;
8603 }
8604 }
8605 -diff -urNp linux-3.1.3/drivers/ide/ide-floppy.c linux-3.1.3/drivers/ide/ide-floppy.c
8606 ---- linux-3.1.3/drivers/ide/ide-floppy.c 2011-11-11 15:19:27.000000000 -0500
8607 -+++ linux-3.1.3/drivers/ide/ide-floppy.c 2011-11-16 18:40:10.000000000 -0500
8608 +diff -urNp linux-3.1.4/drivers/ide/ide-floppy.c linux-3.1.4/drivers/ide/ide-floppy.c
8609 +--- linux-3.1.4/drivers/ide/ide-floppy.c 2011-11-11 15:19:27.000000000 -0500
8610 ++++ linux-3.1.4/drivers/ide/ide-floppy.c 2011-11-16 18:40:10.000000000 -0500
8611 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
8612 u8 pc_buf[256], header_len, desc_cnt;
8613 int i, rc = 1, blocks, length;
8614 @@ -27879,9 +28627,9 @@ diff -urNp linux-3.1.3/drivers/ide/ide-floppy.c linux-3.1.3/drivers/ide/ide-flop
8615 ide_debug_log(IDE_DBG_FUNC, "enter");
8616
8617 drive->bios_cyl = 0;
8618 -diff -urNp linux-3.1.3/drivers/ide/ide-pci-generic.c linux-3.1.3/drivers/ide/ide-pci-generic.c
8619 ---- linux-3.1.3/drivers/ide/ide-pci-generic.c 2011-11-11 15:19:27.000000000 -0500
8620 -+++ linux-3.1.3/drivers/ide/ide-pci-generic.c 2011-11-16 18:39:07.000000000 -0500
8621 +diff -urNp linux-3.1.4/drivers/ide/ide-pci-generic.c linux-3.1.4/drivers/ide/ide-pci-generic.c
8622 +--- linux-3.1.4/drivers/ide/ide-pci-generic.c 2011-11-11 15:19:27.000000000 -0500
8623 ++++ linux-3.1.4/drivers/ide/ide-pci-generic.c 2011-11-16 18:39:07.000000000 -0500
8624 @@ -53,7 +53,7 @@ static const struct ide_port_ops netcell
8625 .udma_mask = ATA_UDMA6, \
8626 }
8627 @@ -27891,9 +28639,9 @@ diff -urNp linux-3.1.3/drivers/ide/ide-pci-generic.c linux-3.1.3/drivers/ide/ide
8628 /* 0: Unknown */
8629 DECLARE_GENERIC_PCI_DEV(0),
8630
8631 -diff -urNp linux-3.1.3/drivers/ide/it8172.c linux-3.1.3/drivers/ide/it8172.c
8632 ---- linux-3.1.3/drivers/ide/it8172.c 2011-11-11 15:19:27.000000000 -0500
8633 -+++ linux-3.1.3/drivers/ide/it8172.c 2011-11-16 18:39:07.000000000 -0500
8634 +diff -urNp linux-3.1.4/drivers/ide/it8172.c linux-3.1.4/drivers/ide/it8172.c
8635 +--- linux-3.1.4/drivers/ide/it8172.c 2011-11-11 15:19:27.000000000 -0500
8636 ++++ linux-3.1.4/drivers/ide/it8172.c 2011-11-16 18:39:07.000000000 -0500
8637 @@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_
8638 .set_dma_mode = it8172_set_dma_mode,
8639 };
8640 @@ -27903,9 +28651,9 @@ diff -urNp linux-3.1.3/drivers/ide/it8172.c linux-3.1.3/drivers/ide/it8172.c
8641 .name = DRV_NAME,
8642 .port_ops = &it8172_port_ops,
8643 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
8644 -diff -urNp linux-3.1.3/drivers/ide/it8213.c linux-3.1.3/drivers/ide/it8213.c
8645 ---- linux-3.1.3/drivers/ide/it8213.c 2011-11-11 15:19:27.000000000 -0500
8646 -+++ linux-3.1.3/drivers/ide/it8213.c 2011-11-16 18:39:07.000000000 -0500
8647 +diff -urNp linux-3.1.4/drivers/ide/it8213.c linux-3.1.4/drivers/ide/it8213.c
8648 +--- linux-3.1.4/drivers/ide/it8213.c 2011-11-11 15:19:27.000000000 -0500
8649 ++++ linux-3.1.4/drivers/ide/it8213.c 2011-11-16 18:39:07.000000000 -0500
8650 @@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_
8651 .cable_detect = it8213_cable_detect,
8652 };
8653 @@ -27915,9 +28663,9 @@ diff -urNp linux-3.1.3/drivers/ide/it8213.c linux-3.1.3/drivers/ide/it8213.c
8654 .name = DRV_NAME,
8655 .enablebits = { {0x41, 0x80, 0x80} },
8656 .port_ops = &it8213_port_ops,
8657 -diff -urNp linux-3.1.3/drivers/ide/it821x.c linux-3.1.3/drivers/ide/it821x.c
8658 ---- linux-3.1.3/drivers/ide/it821x.c 2011-11-11 15:19:27.000000000 -0500
8659 -+++ linux-3.1.3/drivers/ide/it821x.c 2011-11-16 18:39:07.000000000 -0500
8660 +diff -urNp linux-3.1.4/drivers/ide/it821x.c linux-3.1.4/drivers/ide/it821x.c
8661 +--- linux-3.1.4/drivers/ide/it821x.c 2011-11-11 15:19:27.000000000 -0500
8662 ++++ linux-3.1.4/drivers/ide/it821x.c 2011-11-16 18:39:07.000000000 -0500
8663 @@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_
8664 .cable_detect = it821x_cable_detect,
8665 };
8666 @@ -27927,9 +28675,9 @@ diff -urNp linux-3.1.3/drivers/ide/it821x.c linux-3.1.3/drivers/ide/it821x.c
8667 .name = DRV_NAME,
8668 .init_chipset = init_chipset_it821x,
8669 .init_hwif = init_hwif_it821x,
8670 -diff -urNp linux-3.1.3/drivers/ide/jmicron.c linux-3.1.3/drivers/ide/jmicron.c
8671 ---- linux-3.1.3/drivers/ide/jmicron.c 2011-11-11 15:19:27.000000000 -0500
8672 -+++ linux-3.1.3/drivers/ide/jmicron.c 2011-11-16 18:39:07.000000000 -0500
8673 +diff -urNp linux-3.1.4/drivers/ide/jmicron.c linux-3.1.4/drivers/ide/jmicron.c
8674 +--- linux-3.1.4/drivers/ide/jmicron.c 2011-11-11 15:19:27.000000000 -0500
8675 ++++ linux-3.1.4/drivers/ide/jmicron.c 2011-11-16 18:39:07.000000000 -0500
8676 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron
8677 .cable_detect = jmicron_cable_detect,
8678 };
8679 @@ -27939,9 +28687,9 @@ diff -urNp linux-3.1.3/drivers/ide/jmicron.c linux-3.1.3/drivers/ide/jmicron.c
8680 .name = DRV_NAME,
8681 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
8682 .port_ops = &jmicron_port_ops,
8683 -diff -urNp linux-3.1.3/drivers/ide/ns87415.c linux-3.1.3/drivers/ide/ns87415.c
8684 ---- linux-3.1.3/drivers/ide/ns87415.c 2011-11-11 15:19:27.000000000 -0500
8685 -+++ linux-3.1.3/drivers/ide/ns87415.c 2011-11-16 18:39:07.000000000 -0500
8686 +diff -urNp linux-3.1.4/drivers/ide/ns87415.c linux-3.1.4/drivers/ide/ns87415.c
8687 +--- linux-3.1.4/drivers/ide/ns87415.c 2011-11-11 15:19:27.000000000 -0500
8688 ++++ linux-3.1.4/drivers/ide/ns87415.c 2011-11-16 18:39:07.000000000 -0500
8689 @@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_
8690 .dma_sff_read_status = superio_dma_sff_read_status,
8691 };
8692 @@ -27951,9 +28699,9 @@ diff -urNp linux-3.1.3/drivers/ide/ns87415.c linux-3.1.3/drivers/ide/ns87415.c
8693 .name = DRV_NAME,
8694 .init_hwif = init_hwif_ns87415,
8695 .tp_ops = &ns87415_tp_ops,
8696 -diff -urNp linux-3.1.3/drivers/ide/opti621.c linux-3.1.3/drivers/ide/opti621.c
8697 ---- linux-3.1.3/drivers/ide/opti621.c 2011-11-11 15:19:27.000000000 -0500
8698 -+++ linux-3.1.3/drivers/ide/opti621.c 2011-11-16 18:39:07.000000000 -0500
8699 +diff -urNp linux-3.1.4/drivers/ide/opti621.c linux-3.1.4/drivers/ide/opti621.c
8700 +--- linux-3.1.4/drivers/ide/opti621.c 2011-11-11 15:19:27.000000000 -0500
8701 ++++ linux-3.1.4/drivers/ide/opti621.c 2011-11-16 18:39:07.000000000 -0500
8702 @@ -131,7 +131,7 @@ static const struct ide_port_ops opti621
8703 .set_pio_mode = opti621_set_pio_mode,
8704 };
8705 @@ -27963,9 +28711,9 @@ diff -urNp linux-3.1.3/drivers/ide/opti621.c linux-3.1.3/drivers/ide/opti621.c
8706 .name = DRV_NAME,
8707 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
8708 .port_ops = &opti621_port_ops,
8709 -diff -urNp linux-3.1.3/drivers/ide/pdc202xx_new.c linux-3.1.3/drivers/ide/pdc202xx_new.c
8710 ---- linux-3.1.3/drivers/ide/pdc202xx_new.c 2011-11-11 15:19:27.000000000 -0500
8711 -+++ linux-3.1.3/drivers/ide/pdc202xx_new.c 2011-11-16 18:39:07.000000000 -0500
8712 +diff -urNp linux-3.1.4/drivers/ide/pdc202xx_new.c linux-3.1.4/drivers/ide/pdc202xx_new.c
8713 +--- linux-3.1.4/drivers/ide/pdc202xx_new.c 2011-11-11 15:19:27.000000000 -0500
8714 ++++ linux-3.1.4/drivers/ide/pdc202xx_new.c 2011-11-16 18:39:07.000000000 -0500
8715 @@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_
8716 .udma_mask = udma, \
8717 }
8718 @@ -27975,9 +28723,9 @@ diff -urNp linux-3.1.3/drivers/ide/pdc202xx_new.c linux-3.1.3/drivers/ide/pdc202
8719 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
8720 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
8721 };
8722 -diff -urNp linux-3.1.3/drivers/ide/pdc202xx_old.c linux-3.1.3/drivers/ide/pdc202xx_old.c
8723 ---- linux-3.1.3/drivers/ide/pdc202xx_old.c 2011-11-11 15:19:27.000000000 -0500
8724 -+++ linux-3.1.3/drivers/ide/pdc202xx_old.c 2011-11-16 18:39:07.000000000 -0500
8725 +diff -urNp linux-3.1.4/drivers/ide/pdc202xx_old.c linux-3.1.4/drivers/ide/pdc202xx_old.c
8726 +--- linux-3.1.4/drivers/ide/pdc202xx_old.c 2011-11-11 15:19:27.000000000 -0500
8727 ++++ linux-3.1.4/drivers/ide/pdc202xx_old.c 2011-11-16 18:39:07.000000000 -0500
8728 @@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x
8729 .max_sectors = sectors, \
8730 }
8731 @@ -27987,9 +28735,9 @@ diff -urNp linux-3.1.3/drivers/ide/pdc202xx_old.c linux-3.1.3/drivers/ide/pdc202
8732 { /* 0: PDC20246 */
8733 .name = DRV_NAME,
8734 .init_chipset = init_chipset_pdc202xx,
8735 -diff -urNp linux-3.1.3/drivers/ide/piix.c linux-3.1.3/drivers/ide/piix.c
8736 ---- linux-3.1.3/drivers/ide/piix.c 2011-11-11 15:19:27.000000000 -0500
8737 -+++ linux-3.1.3/drivers/ide/piix.c 2011-11-16 18:39:07.000000000 -0500
8738 +diff -urNp linux-3.1.4/drivers/ide/piix.c linux-3.1.4/drivers/ide/piix.c
8739 +--- linux-3.1.4/drivers/ide/piix.c 2011-11-11 15:19:27.000000000 -0500
8740 ++++ linux-3.1.4/drivers/ide/piix.c 2011-11-16 18:39:07.000000000 -0500
8741 @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por
8742 .udma_mask = udma, \
8743 }
8744 @@ -27999,9 +28747,9 @@ diff -urNp linux-3.1.3/drivers/ide/piix.c linux-3.1.3/drivers/ide/piix.c
8745 /* 0: MPIIX */
8746 { /*
8747 * MPIIX actually has only a single IDE channel mapped to
8748 -diff -urNp linux-3.1.3/drivers/ide/rz1000.c linux-3.1.3/drivers/ide/rz1000.c
8749 ---- linux-3.1.3/drivers/ide/rz1000.c 2011-11-11 15:19:27.000000000 -0500
8750 -+++ linux-3.1.3/drivers/ide/rz1000.c 2011-11-16 18:39:07.000000000 -0500
8751 +diff -urNp linux-3.1.4/drivers/ide/rz1000.c linux-3.1.4/drivers/ide/rz1000.c
8752 +--- linux-3.1.4/drivers/ide/rz1000.c 2011-11-11 15:19:27.000000000 -0500
8753 ++++ linux-3.1.4/drivers/ide/rz1000.c 2011-11-16 18:39:07.000000000 -0500
8754 @@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read
8755 }
8756 }
8757 @@ -28011,9 +28759,9 @@ diff -urNp linux-3.1.3/drivers/ide/rz1000.c linux-3.1.3/drivers/ide/rz1000.c
8758 .name = DRV_NAME,
8759 .host_flags = IDE_HFLAG_NO_DMA,
8760 };
8761 -diff -urNp linux-3.1.3/drivers/ide/sc1200.c linux-3.1.3/drivers/ide/sc1200.c
8762 ---- linux-3.1.3/drivers/ide/sc1200.c 2011-11-11 15:19:27.000000000 -0500
8763 -+++ linux-3.1.3/drivers/ide/sc1200.c 2011-11-16 18:39:07.000000000 -0500
8764 +diff -urNp linux-3.1.4/drivers/ide/sc1200.c linux-3.1.4/drivers/ide/sc1200.c
8765 +--- linux-3.1.4/drivers/ide/sc1200.c 2011-11-11 15:19:27.000000000 -0500
8766 ++++ linux-3.1.4/drivers/ide/sc1200.c 2011-11-16 18:39:07.000000000 -0500
8767 @@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d
8768 .dma_sff_read_status = ide_dma_sff_read_status,
8769 };
8770 @@ -28023,9 +28771,9 @@ diff -urNp linux-3.1.3/drivers/ide/sc1200.c linux-3.1.3/drivers/ide/sc1200.c
8771 .name = DRV_NAME,
8772 .port_ops = &sc1200_port_ops,
8773 .dma_ops = &sc1200_dma_ops,
8774 -diff -urNp linux-3.1.3/drivers/ide/scc_pata.c linux-3.1.3/drivers/ide/scc_pata.c
8775 ---- linux-3.1.3/drivers/ide/scc_pata.c 2011-11-11 15:19:27.000000000 -0500
8776 -+++ linux-3.1.3/drivers/ide/scc_pata.c 2011-11-16 18:39:07.000000000 -0500
8777 +diff -urNp linux-3.1.4/drivers/ide/scc_pata.c linux-3.1.4/drivers/ide/scc_pata.c
8778 +--- linux-3.1.4/drivers/ide/scc_pata.c 2011-11-11 15:19:27.000000000 -0500
8779 ++++ linux-3.1.4/drivers/ide/scc_pata.c 2011-11-16 18:39:07.000000000 -0500
8780 @@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_
8781 .dma_sff_read_status = scc_dma_sff_read_status,
8782 };
8783 @@ -28035,9 +28783,9 @@ diff -urNp linux-3.1.3/drivers/ide/scc_pata.c linux-3.1.3/drivers/ide/scc_pata.c
8784 .name = "sccIDE",
8785 .init_iops = init_iops_scc,
8786 .init_dma = scc_init_dma,
8787 -diff -urNp linux-3.1.3/drivers/ide/serverworks.c linux-3.1.3/drivers/ide/serverworks.c
8788 ---- linux-3.1.3/drivers/ide/serverworks.c 2011-11-11 15:19:27.000000000 -0500
8789 -+++ linux-3.1.3/drivers/ide/serverworks.c 2011-11-16 18:39:07.000000000 -0500
8790 +diff -urNp linux-3.1.4/drivers/ide/serverworks.c linux-3.1.4/drivers/ide/serverworks.c
8791 +--- linux-3.1.4/drivers/ide/serverworks.c 2011-11-11 15:19:27.000000000 -0500
8792 ++++ linux-3.1.4/drivers/ide/serverworks.c 2011-11-16 18:39:07.000000000 -0500
8793 @@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p
8794 .cable_detect = svwks_cable_detect,
8795 };
8796 @@ -28047,9 +28795,9 @@ diff -urNp linux-3.1.3/drivers/ide/serverworks.c linux-3.1.3/drivers/ide/serverw
8797 { /* 0: OSB4 */
8798 .name = DRV_NAME,
8799 .init_chipset = init_chipset_svwks,
8800 -diff -urNp linux-3.1.3/drivers/ide/setup-pci.c linux-3.1.3/drivers/ide/setup-pci.c
8801 ---- linux-3.1.3/drivers/ide/setup-pci.c 2011-11-11 15:19:27.000000000 -0500
8802 -+++ linux-3.1.3/drivers/ide/setup-pci.c 2011-11-16 18:40:10.000000000 -0500
8803 +diff -urNp linux-3.1.4/drivers/ide/setup-pci.c linux-3.1.4/drivers/ide/setup-pci.c
8804 +--- linux-3.1.4/drivers/ide/setup-pci.c 2011-11-11 15:19:27.000000000 -0500
8805 ++++ linux-3.1.4/drivers/ide/setup-pci.c 2011-11-16 18:40:10.000000000 -0500
8806 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
8807 int ret, i, n_ports = dev2 ? 4 : 2;
8808 struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
8809 @@ -28059,9 +28807,9 @@ diff -urNp linux-3.1.3/drivers/ide/setup-pci.c linux-3.1.3/drivers/ide/setup-pci
8810 for (i = 0; i < n_ports / 2; i++) {
8811 ret = ide_setup_pci_controller(pdev[i], d, !i);
8812 if (ret < 0)
8813 -diff -urNp linux-3.1.3/drivers/ide/siimage.c linux-3.1.3/drivers/ide/siimage.c
8814 ---- linux-3.1.3/drivers/ide/siimage.c 2011-11-11 15:19:27.000000000 -0500
8815 -+++ linux-3.1.3/drivers/ide/siimage.c 2011-11-16 18:39:07.000000000 -0500
8816 +diff -urNp linux-3.1.4/drivers/ide/siimage.c linux-3.1.4/drivers/ide/siimage.c
8817 +--- linux-3.1.4/drivers/ide/siimage.c 2011-11-11 15:19:27.000000000 -0500
8818 ++++ linux-3.1.4/drivers/ide/siimage.c 2011-11-16 18:39:07.000000000 -0500
8819 @@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_
8820 .udma_mask = ATA_UDMA6, \
8821 }
8822 @@ -28071,9 +28819,9 @@ diff -urNp linux-3.1.3/drivers/ide/siimage.c linux-3.1.3/drivers/ide/siimage.c
8823 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
8824 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
8825 };
8826 -diff -urNp linux-3.1.3/drivers/ide/sis5513.c linux-3.1.3/drivers/ide/sis5513.c
8827 ---- linux-3.1.3/drivers/ide/sis5513.c 2011-11-11 15:19:27.000000000 -0500
8828 -+++ linux-3.1.3/drivers/ide/sis5513.c 2011-11-16 18:39:07.000000000 -0500
8829 +diff -urNp linux-3.1.4/drivers/ide/sis5513.c linux-3.1.4/drivers/ide/sis5513.c
8830 +--- linux-3.1.4/drivers/ide/sis5513.c 2011-11-11 15:19:27.000000000 -0500
8831 ++++ linux-3.1.4/drivers/ide/sis5513.c 2011-11-16 18:39:07.000000000 -0500
8832 @@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata
8833 .cable_detect = sis_cable_detect,
8834 };
8835 @@ -28083,9 +28831,9 @@ diff -urNp linux-3.1.3/drivers/ide/sis5513.c linux-3.1.3/drivers/ide/sis5513.c
8836 .name = DRV_NAME,
8837 .init_chipset = init_chipset_sis5513,
8838 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
8839 -diff -urNp linux-3.1.3/drivers/ide/sl82c105.c linux-3.1.3/drivers/ide/sl82c105.c
8840 ---- linux-3.1.3/drivers/ide/sl82c105.c 2011-11-11 15:19:27.000000000 -0500
8841 -+++ linux-3.1.3/drivers/ide/sl82c105.c 2011-11-16 18:39:07.000000000 -0500
8842 +diff -urNp linux-3.1.4/drivers/ide/sl82c105.c linux-3.1.4/drivers/ide/sl82c105.c
8843 +--- linux-3.1.4/drivers/ide/sl82c105.c 2011-11-11 15:19:27.000000000 -0500
8844 ++++ linux-3.1.4/drivers/ide/sl82c105.c 2011-11-16 18:39:07.000000000 -0500
8845 @@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105
8846 .dma_sff_read_status = ide_dma_sff_read_status,
8847 };
8848 @@ -28095,9 +28843,9 @@ diff -urNp linux-3.1.3/drivers/ide/sl82c105.c linux-3.1.3/drivers/ide/sl82c105.c
8849 .name = DRV_NAME,
8850 .init_chipset = init_chipset_sl82c105,
8851 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
8852 -diff -urNp linux-3.1.3/drivers/ide/slc90e66.c linux-3.1.3/drivers/ide/slc90e66.c
8853 ---- linux-3.1.3/drivers/ide/slc90e66.c 2011-11-11 15:19:27.000000000 -0500
8854 -+++ linux-3.1.3/drivers/ide/slc90e66.c 2011-11-16 18:39:07.000000000 -0500
8855 +diff -urNp linux-3.1.4/drivers/ide/slc90e66.c linux-3.1.4/drivers/ide/slc90e66.c
8856 +--- linux-3.1.4/drivers/ide/slc90e66.c 2011-11-11 15:19:27.000000000 -0500
8857 ++++ linux-3.1.4/drivers/ide/slc90e66.c 2011-11-16 18:39:07.000000000 -0500
8858 @@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6
8859 .cable_detect = slc90e66_cable_detect,
8860 };
8861 @@ -28107,9 +28855,9 @@ diff -urNp linux-3.1.3/drivers/ide/slc90e66.c linux-3.1.3/drivers/ide/slc90e66.c
8862 .name = DRV_NAME,
8863 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
8864 .port_ops = &slc90e66_port_ops,
8865 -diff -urNp linux-3.1.3/drivers/ide/tc86c001.c linux-3.1.3/drivers/ide/tc86c001.c
8866 ---- linux-3.1.3/drivers/ide/tc86c001.c 2011-11-11 15:19:27.000000000 -0500
8867 -+++ linux-3.1.3/drivers/ide/tc86c001.c 2011-11-16 18:39:07.000000000 -0500
8868 +diff -urNp linux-3.1.4/drivers/ide/tc86c001.c linux-3.1.4/drivers/ide/tc86c001.c
8869 +--- linux-3.1.4/drivers/ide/tc86c001.c 2011-11-11 15:19:27.000000000 -0500
8870 ++++ linux-3.1.4/drivers/ide/tc86c001.c 2011-11-16 18:39:07.000000000 -0500
8871 @@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001
8872 .dma_sff_read_status = ide_dma_sff_read_status,
8873 };
8874 @@ -28119,9 +28867,9 @@ diff -urNp linux-3.1.3/drivers/ide/tc86c001.c linux-3.1.3/drivers/ide/tc86c001.c
8875 .name = DRV_NAME,
8876 .init_hwif = init_hwif_tc86c001,
8877 .port_ops = &tc86c001_port_ops,
8878 -diff -urNp linux-3.1.3/drivers/ide/triflex.c linux-3.1.3/drivers/ide/triflex.c
8879 ---- linux-3.1.3/drivers/ide/triflex.c 2011-11-11 15:19:27.000000000 -0500
8880 -+++ linux-3.1.3/drivers/ide/triflex.c 2011-11-16 18:39:07.000000000 -0500
8881 +diff -urNp linux-3.1.4/drivers/ide/triflex.c linux-3.1.4/drivers/ide/triflex.c
8882 +--- linux-3.1.4/drivers/ide/triflex.c 2011-11-11 15:19:27.000000000 -0500
8883 ++++ linux-3.1.4/drivers/ide/triflex.c 2011-11-16 18:39:07.000000000 -0500
8884 @@ -92,7 +92,7 @@ static const struct ide_port_ops triflex
8885 .set_dma_mode = triflex_set_mode,
8886 };
8887 @@ -28131,9 +28879,9 @@ diff -urNp linux-3.1.3/drivers/ide/triflex.c linux-3.1.3/drivers/ide/triflex.c
8888 .name = DRV_NAME,
8889 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
8890 .port_ops = &triflex_port_ops,
8891 -diff -urNp linux-3.1.3/drivers/ide/trm290.c linux-3.1.3/drivers/ide/trm290.c
8892 ---- linux-3.1.3/drivers/ide/trm290.c 2011-11-11 15:19:27.000000000 -0500
8893 -+++ linux-3.1.3/drivers/ide/trm290.c 2011-11-16 18:39:07.000000000 -0500
8894 +diff -urNp linux-3.1.4/drivers/ide/trm290.c linux-3.1.4/drivers/ide/trm290.c
8895 +--- linux-3.1.4/drivers/ide/trm290.c 2011-11-11 15:19:27.000000000 -0500
8896 ++++ linux-3.1.4/drivers/ide/trm290.c 2011-11-16 18:39:07.000000000 -0500
8897 @@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops
8898 .dma_check = trm290_dma_check,
8899 };
8900 @@ -28143,9 +28891,9 @@ diff -urNp linux-3.1.3/drivers/ide/trm290.c linux-3.1.3/drivers/ide/trm290.c
8901 .name = DRV_NAME,
8902 .init_hwif = init_hwif_trm290,
8903 .tp_ops = &trm290_tp_ops,
8904 -diff -urNp linux-3.1.3/drivers/ide/via82cxxx.c linux-3.1.3/drivers/ide/via82cxxx.c
8905 ---- linux-3.1.3/drivers/ide/via82cxxx.c 2011-11-11 15:19:27.000000000 -0500
8906 -+++ linux-3.1.3/drivers/ide/via82cxxx.c 2011-11-16 18:39:07.000000000 -0500
8907 +diff -urNp linux-3.1.4/drivers/ide/via82cxxx.c linux-3.1.4/drivers/ide/via82cxxx.c
8908 +--- linux-3.1.4/drivers/ide/via82cxxx.c 2011-11-11 15:19:27.000000000 -0500
8909 ++++ linux-3.1.4/drivers/ide/via82cxxx.c 2011-11-16 18:39:07.000000000 -0500
8910 @@ -403,7 +403,7 @@ static const struct ide_port_ops via_por
8911 .cable_detect = via82cxxx_cable_detect,
8912 };
8913 @@ -28155,9 +28903,9 @@ diff -urNp linux-3.1.3/drivers/ide/via82cxxx.c linux-3.1.3/drivers/ide/via82cxxx
8914 .name = DRV_NAME,
8915 .init_chipset = init_chipset_via82cxxx,
8916 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
8917 -diff -urNp linux-3.1.3/drivers/infiniband/core/cm.c linux-3.1.3/drivers/infiniband/core/cm.c
8918 ---- linux-3.1.3/drivers/infiniband/core/cm.c 2011-11-11 15:19:27.000000000 -0500
8919 -+++ linux-3.1.3/drivers/infiniband/core/cm.c 2011-11-16 18:39:07.000000000 -0500
8920 +diff -urNp linux-3.1.4/drivers/infiniband/core/cm.c linux-3.1.4/drivers/infiniband/core/cm.c
8921 +--- linux-3.1.4/drivers/infiniband/core/cm.c 2011-11-11 15:19:27.000000000 -0500
8922 ++++ linux-3.1.4/drivers/infiniband/core/cm.c 2011-11-16 18:39:07.000000000 -0500
8923 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
8924
8925 struct cm_counter_group {
8926 @@ -28297,9 +29045,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/core/cm.c linux-3.1.3/drivers/infiniba
8927 }
8928
8929 static const struct sysfs_ops cm_counter_ops = {
8930 -diff -urNp linux-3.1.3/drivers/infiniband/core/fmr_pool.c linux-3.1.3/drivers/infiniband/core/fmr_pool.c
8931 ---- linux-3.1.3/drivers/infiniband/core/fmr_pool.c 2011-11-11 15:19:27.000000000 -0500
8932 -+++ linux-3.1.3/drivers/infiniband/core/fmr_pool.c 2011-11-16 18:39:07.000000000 -0500
8933 +diff -urNp linux-3.1.4/drivers/infiniband/core/fmr_pool.c linux-3.1.4/drivers/infiniband/core/fmr_pool.c
8934 +--- linux-3.1.4/drivers/infiniband/core/fmr_pool.c 2011-11-11 15:19:27.000000000 -0500
8935 ++++ linux-3.1.4/drivers/infiniband/core/fmr_pool.c 2011-11-16 18:39:07.000000000 -0500
8936 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
8937
8938 struct task_struct *thread;
8939 @@ -28367,9 +29115,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/core/fmr_pool.c linux-3.1.3/drivers/in
8940 wake_up_process(pool->thread);
8941 }
8942 }
8943 -diff -urNp linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c
8944 ---- linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c 2011-11-11 15:19:27.000000000 -0500
8945 -+++ linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c 2011-11-16 18:39:07.000000000 -0500
8946 +diff -urNp linux-3.1.4/drivers/infiniband/hw/cxgb4/mem.c linux-3.1.4/drivers/infiniband/hw/cxgb4/mem.c
8947 +--- linux-3.1.4/drivers/infiniband/hw/cxgb4/mem.c 2011-11-11 15:19:27.000000000 -0500
8948 ++++ linux-3.1.4/drivers/infiniband/hw/cxgb4/mem.c 2011-11-16 18:39:07.000000000 -0500
8949 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
8950 int err;
8951 struct fw_ri_tpte tpt;
8952 @@ -28388,9 +29136,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.1.3/drivers/inf
8953 }
8954 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
8955 __func__, stag_state, type, pdid, stag_idx);
8956 -diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c
8957 ---- linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-11 15:19:27.000000000 -0500
8958 -+++ linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-16 18:40:10.000000000 -0500
8959 +diff -urNp linux-3.1.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.1.4/drivers/infiniband/hw/ipath/ipath_fs.c
8960 +--- linux-3.1.4/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-11 15:19:27.000000000 -0500
8961 ++++ linux-3.1.4/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-16 18:40:10.000000000 -0500
8962 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
8963 struct infinipath_counters counters;
8964 struct ipath_devdata *dd;
8965 @@ -28400,9 +29148,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.1.3/driver
8966 dd = file->f_path.dentry->d_inode->i_private;
8967 dd->ipath_f_read_counters(dd, &counters);
8968
8969 -diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c
8970 ---- linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-11 15:19:27.000000000 -0500
8971 -+++ linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-16 18:39:07.000000000 -0500
8972 +diff -urNp linux-3.1.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.1.4/drivers/infiniband/hw/ipath/ipath_rc.c
8973 +--- linux-3.1.4/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-11 15:19:27.000000000 -0500
8974 ++++ linux-3.1.4/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-16 18:39:07.000000000 -0500
8975 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
8976 struct ib_atomic_eth *ateth;
8977 struct ipath_ack_entry *e;
8978 @@ -28426,9 +29174,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.1.3/driver
8979 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
8980 be64_to_cpu(ateth->compare_data),
8981 sdata);
8982 -diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c
8983 ---- linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-11 15:19:27.000000000 -0500
8984 -+++ linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-16 18:39:07.000000000 -0500
8985 +diff -urNp linux-3.1.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.1.4/drivers/infiniband/hw/ipath/ipath_ruc.c
8986 +--- linux-3.1.4/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-11 15:19:27.000000000 -0500
8987 ++++ linux-3.1.4/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-16 18:39:07.000000000 -0500
8988 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
8989 unsigned long flags;
8990 struct ib_wc wc;
8991 @@ -28452,9 +29200,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.1.3/drive
8992 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
8993 sdata, wqe->wr.wr.atomic.swap);
8994 goto send_comp;
8995 -diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes.c linux-3.1.3/drivers/infiniband/hw/nes/nes.c
8996 ---- linux-3.1.3/drivers/infiniband/hw/nes/nes.c 2011-11-11 15:19:27.000000000 -0500
8997 -+++ linux-3.1.3/drivers/infiniband/hw/nes/nes.c 2011-11-16 18:39:07.000000000 -0500
8998 +diff -urNp linux-3.1.4/drivers/infiniband/hw/nes/nes.c linux-3.1.4/drivers/infiniband/hw/nes/nes.c
8999 +--- linux-3.1.4/drivers/infiniband/hw/nes/nes.c 2011-11-11 15:19:27.000000000 -0500
9000 ++++ linux-3.1.4/drivers/infiniband/hw/nes/nes.c 2011-11-16 18:39:07.000000000 -0500
9001 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
9002 LIST_HEAD(nes_adapter_list);
9003 static LIST_HEAD(nes_dev_list);
9004 @@ -28473,9 +29221,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes.c linux-3.1.3/drivers/infin
9005
9006 /* Free the control structures */
9007
9008 -diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c
9009 ---- linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c 2011-11-11 15:19:27.000000000 -0500
9010 -+++ linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c 2011-11-16 18:39:07.000000000 -0500
9011 +diff -urNp linux-3.1.4/drivers/infiniband/hw/nes/nes_cm.c linux-3.1.4/drivers/infiniband/hw/nes/nes_cm.c
9012 +--- linux-3.1.4/drivers/infiniband/hw/nes/nes_cm.c 2011-11-11 15:19:27.000000000 -0500
9013 ++++ linux-3.1.4/drivers/infiniband/hw/nes/nes_cm.c 2011-11-16 18:39:07.000000000 -0500
9014 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
9015 u32 cm_packets_retrans;
9016 u32 cm_packets_created;
9017 @@ -28672,9 +29420,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.1.3/drivers/in
9018 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
9019 cm_node, cm_id, jiffies);
9020
9021 -diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes.h linux-3.1.3/drivers/infiniband/hw/nes/nes.h
9022 ---- linux-3.1.3/drivers/infiniband/hw/nes/nes.h 2011-11-11 15:19:27.000000000 -0500
9023 -+++ linux-3.1.3/drivers/infiniband/hw/nes/nes.h 2011-11-16 18:39:07.000000000 -0500
9024 +diff -urNp linux-3.1.4/drivers/infiniband/hw/nes/nes.h linux-3.1.4/drivers/infiniband/hw/nes/nes.h
9025 +--- linux-3.1.4/drivers/infiniband/hw/nes/nes.h 2011-11-11 15:19:27.000000000 -0500
9026 ++++ linux-3.1.4/drivers/infiniband/hw/nes/nes.h 2011-11-16 18:39:07.000000000 -0500
9027 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
9028 extern unsigned int wqm_quanta;
9029 extern struct list_head nes_adapter_list;
9030 @@ -28726,9 +29474,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes.h linux-3.1.3/drivers/infin
9031
9032 extern u32 int_mod_timer_init;
9033 extern u32 int_mod_cq_depth_256;
9034 -diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c
9035 ---- linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c 2011-11-11 15:19:27.000000000 -0500
9036 -+++ linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c 2011-11-16 18:39:07.000000000 -0500
9037 +diff -urNp linux-3.1.4/drivers/infiniband/hw/nes/nes_nic.c linux-3.1.4/drivers/infiniband/hw/nes/nes_nic.c
9038 +--- linux-3.1.4/drivers/infiniband/hw/nes/nes_nic.c 2011-11-11 15:19:27.000000000 -0500
9039 ++++ linux-3.1.4/drivers/infiniband/hw/nes/nes_nic.c 2011-11-16 18:39:07.000000000 -0500
9040 @@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
9041 target_stat_values[++index] = mh_detected;
9042 target_stat_values[++index] = mh_pauses_sent;
9043 @@ -28779,9 +29527,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.1.3/drivers/i
9044 target_stat_values[++index] = nesadapter->free_4kpbl;
9045 target_stat_values[++index] = nesadapter->free_256pbl;
9046 target_stat_values[++index] = int_mod_timer_init;
9047 -diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c
9048 ---- linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-11 15:19:27.000000000 -0500
9049 -+++ linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-16 18:39:07.000000000 -0500
9050 +diff -urNp linux-3.1.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.1.4/drivers/infiniband/hw/nes/nes_verbs.c
9051 +--- linux-3.1.4/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-11 15:19:27.000000000 -0500
9052 ++++ linux-3.1.4/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-16 18:39:07.000000000 -0500
9053 @@ -46,9 +46,9 @@
9054
9055 #include <rdma/ib_umem.h>
9056 @@ -28813,9 +29561,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.1.3/drivers
9057 nesqp->destroyed = 1;
9058
9059 /* Blow away the connection if it exists. */
9060 -diff -urNp linux-3.1.3/drivers/infiniband/hw/qib/qib.h linux-3.1.3/drivers/infiniband/hw/qib/qib.h
9061 ---- linux-3.1.3/drivers/infiniband/hw/qib/qib.h 2011-11-11 15:19:27.000000000 -0500
9062 -+++ linux-3.1.3/drivers/infiniband/hw/qib/qib.h 2011-11-16 18:39:07.000000000 -0500
9063 +diff -urNp linux-3.1.4/drivers/infiniband/hw/qib/qib.h linux-3.1.4/drivers/infiniband/hw/qib/qib.h
9064 +--- linux-3.1.4/drivers/infiniband/hw/qib/qib.h 2011-11-11 15:19:27.000000000 -0500
9065 ++++ linux-3.1.4/drivers/infiniband/hw/qib/qib.h 2011-11-16 18:39:07.000000000 -0500
9066 @@ -51,6 +51,7 @@
9067 #include <linux/completion.h>
9068 #include <linux/kref.h>
9069 @@ -28824,9 +29572,9 @@ diff -urNp linux-3.1.3/drivers/infiniband/hw/qib/qib.h linux-3.1.3/drivers/infin
9070
9071 #include "qib_common.h"
9072 #include "qib_verbs.h"
9073 -diff -urNp linux-3.1.3/drivers/input/gameport/gameport.c linux-3.1.3/drivers/input/gameport/gameport.c
9074 ---- linux-3.1.3/drivers/input/gameport/gameport.c 2011-11-11 15:19:27.000000000 -0500
9075 -+++ linux-3.1.3/drivers/input/gameport/gameport.c 2011-11-16 18:39:07.000000000 -0500
9076 +diff -urNp linux-3.1.4/drivers/input/gameport/gameport.c linux-3.1.4/drivers/input/gameport/gameport.c
9077 +--- linux-3.1.4/drivers/input/gameport/gameport.c 2011-11-11 15:19:27.000000000 -0500
9078 ++++ linux-3.1.4/drivers/input/gameport/gameport.c 2011-11-16 18:39:07.000000000 -0500
9079 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
9080 */
9081 static void gameport_init_port(struct gameport *gameport)
9082 @@ -28844,9 +29592,9 @@ diff -urNp linux-3.1.3/drivers/input/gameport/gameport.c linux-3.1.3/drivers/inp
9083 gameport->dev.bus = &gameport_bus;
9084 gameport->dev.release = gameport_release_port;
9085 if (gameport->parent)
9086 -diff -urNp linux-3.1.3/drivers/input/input.c linux-3.1.3/drivers/input/input.c
9087 ---- linux-3.1.3/drivers/input/input.c 2011-11-11 15:19:27.000000000 -0500
9088 -+++ linux-3.1.3/drivers/input/input.c 2011-11-16 18:39:07.000000000 -0500
9089 +diff -urNp linux-3.1.4/drivers/input/input.c linux-3.1.4/drivers/input/input.c
9090 +--- linux-3.1.4/drivers/input/input.c 2011-11-11 15:19:27.000000000 -0500
9091 ++++ linux-3.1.4/drivers/input/input.c 2011-11-16 18:39:07.000000000 -0500
9092 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
9093 */
9094 int input_register_device(struct input_dev *dev)
9095 @@ -28865,9 +29613,9 @@ diff -urNp linux-3.1.3/drivers/input/input.c linux-3.1.3/drivers/input/input.c
9096
9097 error = device_add(&dev->dev);
9098 if (error)
9099 -diff -urNp linux-3.1.3/drivers/input/joystick/sidewinder.c linux-3.1.3/drivers/input/joystick/sidewinder.c
9100 ---- linux-3.1.3/drivers/input/joystick/sidewinder.c 2011-11-11 15:19:27.000000000 -0500
9101 -+++ linux-3.1.3/drivers/input/joystick/sidewinder.c 2011-11-16 18:40:10.000000000 -0500
9102 +diff -urNp linux-3.1.4/drivers/input/joystick/sidewinder.c linux-3.1.4/drivers/input/joystick/sidewinder.c
9103 +--- linux-3.1.4/drivers/input/joystick/sidewinder.c 2011-11-11 15:19:27.000000000 -0500
9104 ++++ linux-3.1.4/drivers/input/joystick/sidewinder.c 2011-11-16 18:40:10.000000000 -0500
9105 @@ -30,6 +30,7 @@
9106 #include <linux/kernel.h>
9107 #include <linux/module.h>
9108 @@ -28885,9 +29633,9 @@ diff -urNp linux-3.1.3/drivers/input/joystick/sidewinder.c linux-3.1.3/drivers/i
9109 i = sw_read_packet(sw->gameport, buf, sw->length, 0);
9110
9111 if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */
9112 -diff -urNp linux-3.1.3/drivers/input/joystick/xpad.c linux-3.1.3/drivers/input/joystick/xpad.c
9113 ---- linux-3.1.3/drivers/input/joystick/xpad.c 2011-11-11 15:19:27.000000000 -0500
9114 -+++ linux-3.1.3/drivers/input/joystick/xpad.c 2011-11-16 18:39:07.000000000 -0500
9115 +diff -urNp linux-3.1.4/drivers/input/joystick/xpad.c linux-3.1.4/drivers/input/joystick/xpad.c
9116 +--- linux-3.1.4/drivers/input/joystick/xpad.c 2011-11-11 15:19:27.000000000 -0500
9117 ++++ linux-3.1.4/drivers/input/joystick/xpad.c 2011-11-16 18:39:07.000000000 -0500
9118 @@ -710,7 +710,7 @@ static void xpad_led_set(struct led_clas
9119
9120 static int xpad_led_probe(struct usb_xpad *xpad)
9121 @@ -28906,9 +29654,9 @@ diff -urNp linux-3.1.3/drivers/input/joystick/xpad.c linux-3.1.3/drivers/input/j
9122
9123 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
9124 led->xpad = xpad;
9125 -diff -urNp linux-3.1.3/drivers/input/mousedev.c linux-3.1.3/drivers/input/mousedev.c
9126 ---- linux-3.1.3/drivers/input/mousedev.c 2011-11-11 15:19:27.000000000 -0500
9127 -+++ linux-3.1.3/drivers/input/mousedev.c 2011-11-16 18:39:07.000000000 -0500
9128 +diff -urNp linux-3.1.4/drivers/input/mousedev.c linux-3.1.4/drivers/input/mousedev.c
9129 +--- linux-3.1.4/drivers/input/mousedev.c 2011-11-11 15:19:27.000000000 -0500
9130 ++++ linux-3.1.4/drivers/input/mousedev.c 2011-11-16 18:39:07.000000000 -0500
9131 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
9132
9133 spin_unlock_irq(&client->packet_lock);
9134 @@ -28918,9 +29666,9 @@ diff -urNp linux-3.1.3/drivers/input/mousedev.c linux-3.1.3/drivers/input/moused
9135 return -EFAULT;
9136
9137 return count;
9138 -diff -urNp linux-3.1.3/drivers/input/serio/serio.c linux-3.1.3/drivers/input/serio/serio.c
9139 ---- linux-3.1.3/drivers/input/serio/serio.c 2011-11-11 15:19:27.000000000 -0500
9140 -+++ linux-3.1.3/drivers/input/serio/serio.c 2011-11-16 18:39:07.000000000 -0500
9141 +diff -urNp linux-3.1.4/drivers/input/serio/serio.c linux-3.1.4/drivers/input/serio/serio.c
9142 +--- linux-3.1.4/drivers/input/serio/serio.c 2011-11-11 15:19:27.000000000 -0500
9143 ++++ linux-3.1.4/drivers/input/serio/serio.c 2011-11-16 18:39:07.000000000 -0500
9144 @@ -497,7 +497,7 @@ static void serio_release_port(struct de
9145 */
9146 static void serio_init_port(struct serio *serio)
9147 @@ -28939,9 +29687,9 @@ diff -urNp linux-3.1.3/drivers/input/serio/serio.c linux-3.1.3/drivers/input/ser
9148 serio->dev.bus = &serio_bus;
9149 serio->dev.release = serio_release_port;
9150 serio->dev.groups = serio_device_attr_groups;
9151 -diff -urNp linux-3.1.3/drivers/isdn/capi/capi.c linux-3.1.3/drivers/isdn/capi/capi.c
9152 ---- linux-3.1.3/drivers/isdn/capi/capi.c 2011-11-11 15:19:27.000000000 -0500
9153 -+++ linux-3.1.3/drivers/isdn/capi/capi.c 2011-11-16 18:39:07.000000000 -0500
9154 +diff -urNp linux-3.1.4/drivers/isdn/capi/capi.c linux-3.1.4/drivers/isdn/capi/capi.c
9155 +--- linux-3.1.4/drivers/isdn/capi/capi.c 2011-11-11 15:19:27.000000000 -0500
9156 ++++ linux-3.1.4/drivers/isdn/capi/capi.c 2011-11-16 18:39:07.000000000 -0500
9157 @@ -83,8 +83,8 @@ struct capiminor {
9158
9159 struct capi20_appl *ap;
9160 @@ -28979,9 +29727,9 @@ diff -urNp linux-3.1.3/drivers/isdn/capi/capi.c linux-3.1.3/drivers/isdn/capi/ca
9161 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
9162 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
9163 capimsg_setu16(skb->data, 16, len); /* Data length */
9164 -diff -urNp linux-3.1.3/drivers/isdn/gigaset/common.c linux-3.1.3/drivers/isdn/gigaset/common.c
9165 ---- linux-3.1.3/drivers/isdn/gigaset/common.c 2011-11-11 15:19:27.000000000 -0500
9166 -+++ linux-3.1.3/drivers/isdn/gigaset/common.c 2011-11-16 18:39:07.000000000 -0500
9167 +diff -urNp linux-3.1.4/drivers/isdn/gigaset/common.c linux-3.1.4/drivers/isdn/gigaset/common.c
9168 +--- linux-3.1.4/drivers/isdn/gigaset/common.c 2011-11-11 15:19:27.000000000 -0500
9169 ++++ linux-3.1.4/drivers/isdn/gigaset/common.c 2011-11-16 18:39:07.000000000 -0500
9170 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
9171 cs->commands_pending = 0;
9172 cs->cur_at_seq = 0;
9173 @@ -28991,9 +29739,9 @@ diff -urNp linux-3.1.3/drivers/isdn/gigaset/common.c linux-3.1.3/drivers/isdn/gi
9174 cs->dev = NULL;
9175 cs->tty = NULL;
9176 cs->tty_dev = NULL;
9177 -diff -urNp linux-3.1.3/drivers/isdn/gigaset/gigaset.h linux-3.1.3/drivers/isdn/gigaset/gigaset.h
9178 ---- linux-3.1.3/drivers/isdn/gigaset/gigaset.h 2011-11-11 15:19:27.000000000 -0500
9179 -+++ linux-3.1.3/drivers/isdn/gigaset/gigaset.h 2011-11-16 18:39:07.000000000 -0500
9180 +diff -urNp linux-3.1.4/drivers/isdn/gigaset/gigaset.h linux-3.1.4/drivers/isdn/gigaset/gigaset.h
9181 +--- linux-3.1.4/drivers/isdn/gigaset/gigaset.h 2011-11-11 15:19:27.000000000 -0500
9182 ++++ linux-3.1.4/drivers/isdn/gigaset/gigaset.h 2011-11-16 18:39:07.000000000 -0500
9183 @@ -35,6 +35,7 @@
9184 #include <linux/tty_driver.h>
9185 #include <linux/list.h>
9186 @@ -29011,9 +29759,9 @@ diff -urNp linux-3.1.3/drivers/isdn/gigaset/gigaset.h linux-3.1.3/drivers/isdn/g
9187 struct tty_struct *tty;
9188 struct tasklet_struct if_wake_tasklet;
9189 unsigned control_state;
9190 -diff -urNp linux-3.1.3/drivers/isdn/gigaset/interface.c linux-3.1.3/drivers/isdn/gigaset/interface.c
9191 ---- linux-3.1.3/drivers/isdn/gigaset/interface.c 2011-11-11 15:19:27.000000000 -0500
9192 -+++ linux-3.1.3/drivers/isdn/gigaset/interface.c 2011-11-16 18:39:07.000000000 -0500
9193 +diff -urNp linux-3.1.4/drivers/isdn/gigaset/interface.c linux-3.1.4/drivers/isdn/gigaset/interface.c
9194 +--- linux-3.1.4/drivers/isdn/gigaset/interface.c 2011-11-11 15:19:27.000000000 -0500
9195 ++++ linux-3.1.4/drivers/isdn/gigaset/interface.c 2011-11-16 18:39:07.000000000 -0500
9196 @@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
9197 }
9198 tty->driver_data = cs;
9199 @@ -29101,9 +29849,9 @@ diff -urNp linux-3.1.3/drivers/isdn/gigaset/interface.c linux-3.1.3/drivers/isdn
9200 dev_warn(cs->dev, "%s: device not opened\n", __func__);
9201 goto out;
9202 }
9203 -diff -urNp linux-3.1.3/drivers/isdn/hardware/avm/b1.c linux-3.1.3/drivers/isdn/hardware/avm/b1.c
9204 ---- linux-3.1.3/drivers/isdn/hardware/avm/b1.c 2011-11-11 15:19:27.000000000 -0500
9205 -+++ linux-3.1.3/drivers/isdn/hardware/avm/b1.c 2011-11-16 18:39:07.000000000 -0500
9206 +diff -urNp linux-3.1.4/drivers/isdn/hardware/avm/b1.c linux-3.1.4/drivers/isdn/hardware/avm/b1.c
9207 +--- linux-3.1.4/drivers/isdn/hardware/avm/b1.c 2011-11-11 15:19:27.000000000 -0500
9208 ++++ linux-3.1.4/drivers/isdn/hardware/avm/b1.c 2011-11-16 18:39:07.000000000 -0500
9209 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
9210 }
9211 if (left) {
9212 @@ -29122,9 +29870,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/avm/b1.c linux-3.1.3/drivers/isdn/h
9213 return -EFAULT;
9214 } else {
9215 memcpy(buf, dp, left);
9216 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c
9217 ---- linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-11 15:19:27.000000000 -0500
9218 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-16 18:40:10.000000000 -0500
9219 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/capidtmf.c linux-3.1.4/drivers/isdn/hardware/eicon/capidtmf.c
9220 +--- linux-3.1.4/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-11 15:19:27.000000000 -0500
9221 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-16 18:40:10.000000000 -0500
9222 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
9223 byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
9224 short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
9225 @@ -29133,9 +29881,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.1.3/driver
9226
9227 if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
9228 {
9229 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c
9230 ---- linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c 2011-11-11 15:19:27.000000000 -0500
9231 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c 2011-11-16 18:40:10.000000000 -0500
9232 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/capifunc.c linux-3.1.4/drivers/isdn/hardware/eicon/capifunc.c
9233 +--- linux-3.1.4/drivers/isdn/hardware/eicon/capifunc.c 2011-11-11 15:19:27.000000000 -0500
9234 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/capifunc.c 2011-11-16 18:40:10.000000000 -0500
9235 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
9236 IDI_SYNC_REQ req;
9237 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
9238 @@ -29145,9 +29893,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.1.3/driver
9239 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
9240
9241 for (x = 0; x < MAX_DESCRIPTORS; x++) {
9242 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c
9243 ---- linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-11 15:19:27.000000000 -0500
9244 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-16 18:40:10.000000000 -0500
9245 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/diddfunc.c linux-3.1.4/drivers/isdn/hardware/eicon/diddfunc.c
9246 +--- linux-3.1.4/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-11 15:19:27.000000000 -0500
9247 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-16 18:40:10.000000000 -0500
9248 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
9249 IDI_SYNC_REQ req;
9250 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
9251 @@ -29157,9 +29905,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.1.3/driver
9252 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
9253
9254 for (x = 0; x < MAX_DESCRIPTORS; x++) {
9255 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c
9256 ---- linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-11 15:19:27.000000000 -0500
9257 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-16 18:40:10.000000000 -0500
9258 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/divasfunc.c linux-3.1.4/drivers/isdn/hardware/eicon/divasfunc.c
9259 +--- linux-3.1.4/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-11 15:19:27.000000000 -0500
9260 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-16 18:40:10.000000000 -0500
9261 @@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
9262 IDI_SYNC_REQ req;
9263 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
9264 @@ -29169,9 +29917,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.1.3/drive
9265 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
9266
9267 for (x = 0; x < MAX_DESCRIPTORS; x++) {
9268 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h
9269 ---- linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h 2011-11-11 15:19:27.000000000 -0500
9270 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h 2011-11-16 18:39:07.000000000 -0500
9271 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/divasync.h linux-3.1.4/drivers/isdn/hardware/eicon/divasync.h
9272 +--- linux-3.1.4/drivers/isdn/hardware/eicon/divasync.h 2011-11-11 15:19:27.000000000 -0500
9273 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/divasync.h 2011-11-16 18:39:07.000000000 -0500
9274 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
9275 } diva_didd_add_adapter_t;
9276 typedef struct _diva_didd_remove_adapter {
9277 @@ -29181,9 +29929,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/divasync.h linux-3.1.3/driver
9278 typedef struct _diva_didd_read_adapter_array {
9279 void * buffer;
9280 dword length;
9281 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c
9282 ---- linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c 2011-11-11 15:19:27.000000000 -0500
9283 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c 2011-11-16 18:40:10.000000000 -0500
9284 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/idifunc.c linux-3.1.4/drivers/isdn/hardware/eicon/idifunc.c
9285 +--- linux-3.1.4/drivers/isdn/hardware/eicon/idifunc.c 2011-11-11 15:19:27.000000000 -0500
9286 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/idifunc.c 2011-11-16 18:40:10.000000000 -0500
9287 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
9288 IDI_SYNC_REQ req;
9289 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
9290 @@ -29193,9 +29941,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.1.3/drivers
9291 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
9292
9293 for (x = 0; x < MAX_DESCRIPTORS; x++) {
9294 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/message.c linux-3.1.3/drivers/isdn/hardware/eicon/message.c
9295 ---- linux-3.1.3/drivers/isdn/hardware/eicon/message.c 2011-11-11 15:19:27.000000000 -0500
9296 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/message.c 2011-11-16 18:40:10.000000000 -0500
9297 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/message.c linux-3.1.4/drivers/isdn/hardware/eicon/message.c
9298 +--- linux-3.1.4/drivers/isdn/hardware/eicon/message.c 2011-11-11 15:19:27.000000000 -0500
9299 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/message.c 2011-11-16 18:40:10.000000000 -0500
9300 @@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
9301 dword d;
9302 word w;
9303 @@ -29232,9 +29980,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/message.c linux-3.1.3/drivers
9304 set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
9305
9306 if(!a->group_optimization_enabled)
9307 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c
9308 ---- linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-11 15:19:27.000000000 -0500
9309 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-16 18:40:10.000000000 -0500
9310 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/mntfunc.c linux-3.1.4/drivers/isdn/hardware/eicon/mntfunc.c
9311 +--- linux-3.1.4/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-11 15:19:27.000000000 -0500
9312 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-16 18:40:10.000000000 -0500
9313 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
9314 IDI_SYNC_REQ req;
9315 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
9316 @@ -29244,9 +29992,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.1.3/drivers
9317 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
9318
9319 for (x = 0; x < MAX_DESCRIPTORS; x++) {
9320 -diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h
9321 ---- linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-11 15:19:27.000000000 -0500
9322 -+++ linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-16 18:39:07.000000000 -0500
9323 +diff -urNp linux-3.1.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.1.4/drivers/isdn/hardware/eicon/xdi_adapter.h
9324 +--- linux-3.1.4/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-11 15:19:27.000000000 -0500
9325 ++++ linux-3.1.4/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-16 18:39:07.000000000 -0500
9326 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
9327 typedef struct _diva_os_idi_adapter_interface {
9328 diva_init_card_proc_t cleanup_adapter_proc;
9329 @@ -29256,9 +30004,9 @@ diff -urNp linux-3.1.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.1.3/dri
9330
9331 typedef struct _diva_os_xdi_adapter {
9332 struct list_head link;
9333 -diff -urNp linux-3.1.3/drivers/isdn/i4l/isdn_common.c linux-3.1.3/drivers/isdn/i4l/isdn_common.c
9334 ---- linux-3.1.3/drivers/isdn/i4l/isdn_common.c 2011-11-11 15:19:27.000000000 -0500
9335 -+++ linux-3.1.3/drivers/isdn/i4l/isdn_common.c 2011-11-16 18:40:10.000000000 -0500
9336 +diff -urNp linux-3.1.4/drivers/isdn/i4l/isdn_common.c linux-3.1.4/drivers/isdn/i4l/isdn_common.c
9337 +--- linux-3.1.4/drivers/isdn/i4l/isdn_common.c 2011-11-11 15:19:27.000000000 -0500
9338 ++++ linux-3.1.4/drivers/isdn/i4l/isdn_common.c 2011-11-16 18:40:10.000000000 -0500
9339 @@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd,
9340 } iocpar;
9341 void __user *argp = (void __user *)arg;
9342 @@ -29268,9 +30016,9 @@ diff -urNp linux-3.1.3/drivers/isdn/i4l/isdn_common.c linux-3.1.3/drivers/isdn/i
9343 #define name iocpar.name
9344 #define bname iocpar.bname
9345 #define iocts iocpar.iocts
9346 -diff -urNp linux-3.1.3/drivers/isdn/icn/icn.c linux-3.1.3/drivers/isdn/icn/icn.c
9347 ---- linux-3.1.3/drivers/isdn/icn/icn.c 2011-11-11 15:19:27.000000000 -0500
9348 -+++ linux-3.1.3/drivers/isdn/icn/icn.c 2011-11-16 18:39:07.000000000 -0500
9349 +diff -urNp linux-3.1.4/drivers/isdn/icn/icn.c linux-3.1.4/drivers/isdn/icn/icn.c
9350 +--- linux-3.1.4/drivers/isdn/icn/icn.c 2011-11-11 15:19:27.000000000 -0500
9351 ++++ linux-3.1.4/drivers/isdn/icn/icn.c 2011-11-16 18:39:07.000000000 -0500
9352 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
9353 if (count > len)
9354 count = len;
9355 @@ -29280,9 +30028,9 @@ diff -urNp linux-3.1.3/drivers/isdn/icn/icn.c linux-3.1.3/drivers/isdn/icn/icn.c
9356 return -EFAULT;
9357 } else
9358 memcpy(msg, buf, count);
9359 -diff -urNp linux-3.1.3/drivers/lguest/core.c linux-3.1.3/drivers/lguest/core.c
9360 ---- linux-3.1.3/drivers/lguest/core.c 2011-11-11 15:19:27.000000000 -0500
9361 -+++ linux-3.1.3/drivers/lguest/core.c 2011-11-16 18:39:07.000000000 -0500
9362 +diff -urNp linux-3.1.4/drivers/lguest/core.c linux-3.1.4/drivers/lguest/core.c
9363 +--- linux-3.1.4/drivers/lguest/core.c 2011-11-11 15:19:27.000000000 -0500
9364 ++++ linux-3.1.4/drivers/lguest/core.c 2011-11-16 18:39:07.000000000 -0500
9365 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
9366 * it's worked so far. The end address needs +1 because __get_vm_area
9367 * allocates an extra guard page, so we need space for that.
9368 @@ -29310,9 +30058,9 @@ diff -urNp linux-3.1.3/drivers/lguest/core.c linux-3.1.3/drivers/lguest/core.c
9369 end_switcher_text - start_switcher_text);
9370
9371 printk(KERN_INFO "lguest: mapped switcher at %p\n",
9372 -diff -urNp linux-3.1.3/drivers/lguest/x86/core.c linux-3.1.3/drivers/lguest/x86/core.c
9373 ---- linux-3.1.3/drivers/lguest/x86/core.c 2011-11-11 15:19:27.000000000 -0500
9374 -+++ linux-3.1.3/drivers/lguest/x86/core.c 2011-11-16 18:39:07.000000000 -0500
9375 +diff -urNp linux-3.1.4/drivers/lguest/x86/core.c linux-3.1.4/drivers/lguest/x86/core.c
9376 +--- linux-3.1.4/drivers/lguest/x86/core.c 2011-11-11 15:19:27.000000000 -0500
9377 ++++ linux-3.1.4/drivers/lguest/x86/core.c 2011-11-16 18:39:07.000000000 -0500
9378 @@ -59,7 +59,7 @@ static struct {
9379 /* Offset from where switcher.S was compiled to where we've copied it */
9380 static unsigned long switcher_offset(void)
9381 @@ -29354,9 +30102,9 @@ diff -urNp linux-3.1.3/drivers/lguest/x86/core.c linux-3.1.3/drivers/lguest/x86/
9382 lguest_entry.segment = LGUEST_CS;
9383
9384 /*
9385 -diff -urNp linux-3.1.3/drivers/lguest/x86/switcher_32.S linux-3.1.3/drivers/lguest/x86/switcher_32.S
9386 ---- linux-3.1.3/drivers/lguest/x86/switcher_32.S 2011-11-11 15:19:27.000000000 -0500
9387 -+++ linux-3.1.3/drivers/lguest/x86/switcher_32.S 2011-11-16 18:39:07.000000000 -0500
9388 +diff -urNp linux-3.1.4/drivers/lguest/x86/switcher_32.S linux-3.1.4/drivers/lguest/x86/switcher_32.S
9389 +--- linux-3.1.4/drivers/lguest/x86/switcher_32.S 2011-11-11 15:19:27.000000000 -0500
9390 ++++ linux-3.1.4/drivers/lguest/x86/switcher_32.S 2011-11-16 18:39:07.000000000 -0500
9391 @@ -87,6 +87,7 @@
9392 #include <asm/page.h>
9393 #include <asm/segment.h>
9394 @@ -29415,9 +30163,9 @@ diff -urNp linux-3.1.3/drivers/lguest/x86/switcher_32.S linux-3.1.3/drivers/lgue
9395
9396 // Every interrupt can come to us here
9397 // But we must truly tell each apart.
9398 -diff -urNp linux-3.1.3/drivers/macintosh/macio_asic.c linux-3.1.3/drivers/macintosh/macio_asic.c
9399 ---- linux-3.1.3/drivers/macintosh/macio_asic.c 2011-11-11 15:19:27.000000000 -0500
9400 -+++ linux-3.1.3/drivers/macintosh/macio_asic.c 2011-11-16 18:39:07.000000000 -0500
9401 +diff -urNp linux-3.1.4/drivers/macintosh/macio_asic.c linux-3.1.4/drivers/macintosh/macio_asic.c
9402 +--- linux-3.1.4/drivers/macintosh/macio_asic.c 2011-11-11 15:19:27.000000000 -0500
9403 ++++ linux-3.1.4/drivers/macintosh/macio_asic.c 2011-11-16 18:39:07.000000000 -0500
9404 @@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(s
9405 * MacIO is matched against any Apple ID, it's probe() function
9406 * will then decide wether it applies or not
9407 @@ -29427,9 +30175,9 @@ diff -urNp linux-3.1.3/drivers/macintosh/macio_asic.c linux-3.1.3/drivers/macint
9408 .vendor = PCI_VENDOR_ID_APPLE,
9409 .device = PCI_ANY_ID,
9410 .subvendor = PCI_ANY_ID,
9411 -diff -urNp linux-3.1.3/drivers/md/dm.c linux-3.1.3/drivers/md/dm.c
9412 ---- linux-3.1.3/drivers/md/dm.c 2011-11-11 15:19:27.000000000 -0500
9413 -+++ linux-3.1.3/drivers/md/dm.c 2011-11-16 18:39:07.000000000 -0500
9414 +diff -urNp linux-3.1.4/drivers/md/dm.c linux-3.1.4/drivers/md/dm.c
9415 +--- linux-3.1.4/drivers/md/dm.c 2011-11-11 15:19:27.000000000 -0500
9416 ++++ linux-3.1.4/drivers/md/dm.c 2011-11-16 18:39:07.000000000 -0500
9417 @@ -165,9 +165,9 @@ struct mapped_device {
9418 /*
9419 * Event handling.
9420 @@ -29484,9 +30232,9 @@ diff -urNp linux-3.1.3/drivers/md/dm.c linux-3.1.3/drivers/md/dm.c
9421 }
9422
9423 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
9424 -diff -urNp linux-3.1.3/drivers/md/dm-ioctl.c linux-3.1.3/drivers/md/dm-ioctl.c
9425 ---- linux-3.1.3/drivers/md/dm-ioctl.c 2011-11-11 15:19:27.000000000 -0500
9426 -+++ linux-3.1.3/drivers/md/dm-ioctl.c 2011-11-16 18:39:07.000000000 -0500
9427 +diff -urNp linux-3.1.4/drivers/md/dm-ioctl.c linux-3.1.4/drivers/md/dm-ioctl.c
9428 +--- linux-3.1.4/drivers/md/dm-ioctl.c 2011-11-11 15:19:27.000000000 -0500
9429 ++++ linux-3.1.4/drivers/md/dm-ioctl.c 2011-11-16 18:39:07.000000000 -0500
9430 @@ -1578,7 +1578,7 @@ static int validate_params(uint cmd, str
9431 cmd == DM_LIST_VERSIONS_CMD)
9432 return 0;
9433 @@ -29496,9 +30244,9 @@ diff -urNp linux-3.1.3/drivers/md/dm-ioctl.c linux-3.1.3/drivers/md/dm-ioctl.c
9434 if (!*param->name) {
9435 DMWARN("name not supplied when creating device");
9436 return -EINVAL;
9437 -diff -urNp linux-3.1.3/drivers/md/dm-raid1.c linux-3.1.3/drivers/md/dm-raid1.c
9438 ---- linux-3.1.3/drivers/md/dm-raid1.c 2011-11-11 15:19:27.000000000 -0500
9439 -+++ linux-3.1.3/drivers/md/dm-raid1.c 2011-11-16 18:39:07.000000000 -0500
9440 +diff -urNp linux-3.1.4/drivers/md/dm-raid1.c linux-3.1.4/drivers/md/dm-raid1.c
9441 +--- linux-3.1.4/drivers/md/dm-raid1.c 2011-11-11 15:19:27.000000000 -0500
9442 ++++ linux-3.1.4/drivers/md/dm-raid1.c 2011-11-16 18:39:07.000000000 -0500
9443 @@ -40,7 +40,7 @@ enum dm_raid1_error {
9444
9445 struct mirror {
9446 @@ -29571,9 +30319,9 @@ diff -urNp linux-3.1.3/drivers/md/dm-raid1.c linux-3.1.3/drivers/md/dm-raid1.c
9447 return 'A';
9448
9449 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
9450 -diff -urNp linux-3.1.3/drivers/md/dm-stripe.c linux-3.1.3/drivers/md/dm-stripe.c
9451 ---- linux-3.1.3/drivers/md/dm-stripe.c 2011-11-11 15:19:27.000000000 -0500
9452 -+++ linux-3.1.3/drivers/md/dm-stripe.c 2011-11-16 18:39:07.000000000 -0500
9453 +diff -urNp linux-3.1.4/drivers/md/dm-stripe.c linux-3.1.4/drivers/md/dm-stripe.c
9454 +--- linux-3.1.4/drivers/md/dm-stripe.c 2011-11-11 15:19:27.000000000 -0500
9455 ++++ linux-3.1.4/drivers/md/dm-stripe.c 2011-11-16 18:39:07.000000000 -0500
9456 @@ -20,7 +20,7 @@ struct stripe {
9457 struct dm_dev *dev;
9458 sector_t physical_start;
9459 @@ -29612,9 +30360,9 @@ diff -urNp linux-3.1.3/drivers/md/dm-stripe.c linux-3.1.3/drivers/md/dm-stripe.c
9460 DM_IO_ERROR_THRESHOLD)
9461 schedule_work(&sc->trigger_event);
9462 }
9463 -diff -urNp linux-3.1.3/drivers/md/dm-table.c linux-3.1.3/drivers/md/dm-table.c
9464 ---- linux-3.1.3/drivers/md/dm-table.c 2011-11-11 15:19:27.000000000 -0500
9465 -+++ linux-3.1.3/drivers/md/dm-table.c 2011-11-16 18:39:07.000000000 -0500
9466 +diff -urNp linux-3.1.4/drivers/md/dm-table.c linux-3.1.4/drivers/md/dm-table.c
9467 +--- linux-3.1.4/drivers/md/dm-table.c 2011-11-11 15:19:27.000000000 -0500
9468 ++++ linux-3.1.4/drivers/md/dm-table.c 2011-11-16 18:39:07.000000000 -0500
9469 @@ -389,7 +389,7 @@ static int device_area_is_invalid(struct
9470 if (!dev_size)
9471 return 0;
9472 @@ -29624,9 +30372,9 @@ diff -urNp linux-3.1.3/drivers/md/dm-table.c linux-3.1.3/drivers/md/dm-table.c
9473 DMWARN("%s: %s too small for target: "
9474 "start=%llu, len=%llu, dev_size=%llu",
9475 dm_device_name(ti->table->md), bdevname(bdev, b),
9476 -diff -urNp linux-3.1.3/drivers/md/md.c linux-3.1.3/drivers/md/md.c
9477 ---- linux-3.1.3/drivers/md/md.c 2011-11-11 15:19:27.000000000 -0500
9478 -+++ linux-3.1.3/drivers/md/md.c 2011-11-16 18:39:07.000000000 -0500
9479 +diff -urNp linux-3.1.4/drivers/md/md.c linux-3.1.4/drivers/md/md.c
9480 +--- linux-3.1.4/drivers/md/md.c 2011-11-11 15:19:27.000000000 -0500
9481 ++++ linux-3.1.4/drivers/md/md.c 2011-11-16 18:39:07.000000000 -0500
9482 @@ -280,10 +280,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
9483 * start build, activate spare
9484 */
9485 @@ -29741,9 +30489,9 @@ diff -urNp linux-3.1.3/drivers/md/md.c linux-3.1.3/drivers/md/md.c
9486 /* sync IO will cause sync_io to increase before the disk_stats
9487 * as sync_io is counted when a request starts, and
9488 * disk_stats is counted when it completes.
9489 -diff -urNp linux-3.1.3/drivers/md/md.h linux-3.1.3/drivers/md/md.h
9490 ---- linux-3.1.3/drivers/md/md.h 2011-11-11 15:19:27.000000000 -0500
9491 -+++ linux-3.1.3/drivers/md/md.h 2011-11-16 18:39:07.000000000 -0500
9492 +diff -urNp linux-3.1.4/drivers/md/md.h linux-3.1.4/drivers/md/md.h
9493 +--- linux-3.1.4/drivers/md/md.h 2011-11-11 15:19:27.000000000 -0500
9494 ++++ linux-3.1.4/drivers/md/md.h 2011-11-16 18:39:07.000000000 -0500
9495 @@ -124,13 +124,13 @@ struct mdk_rdev_s
9496 * only maintained for arrays that
9497 * support hot removal
9498 @@ -29769,9 +30517,9 @@ diff -urNp linux-3.1.3/drivers/md/md.h linux-3.1.3/drivers/md/md.h
9499 }
9500
9501 struct mdk_personality
9502 -diff -urNp linux-3.1.3/drivers/md/raid10.c linux-3.1.3/drivers/md/raid10.c
9503 ---- linux-3.1.3/drivers/md/raid10.c 2011-11-11 15:19:27.000000000 -0500
9504 -+++ linux-3.1.3/drivers/md/raid10.c 2011-11-16 18:39:07.000000000 -0500
9505 +diff -urNp linux-3.1.4/drivers/md/raid10.c linux-3.1.4/drivers/md/raid10.c
9506 +--- linux-3.1.4/drivers/md/raid10.c 2011-11-11 15:19:27.000000000 -0500
9507 ++++ linux-3.1.4/drivers/md/raid10.c 2011-11-16 18:39:07.000000000 -0500
9508 @@ -1423,7 +1423,7 @@ static void end_sync_read(struct bio *bi
9509 /* The write handler will notice the lack of
9510 * R10BIO_Uptodate and record any errors etc
9511 @@ -29831,9 +30579,9 @@ diff -urNp linux-3.1.3/drivers/md/raid10.c linux-3.1.3/drivers/md/raid10.c
9512 }
9513
9514 rdev_dec_pending(rdev, mddev);
9515 -diff -urNp linux-3.1.3/drivers/md/raid1.c linux-3.1.3/drivers/md/raid1.c
9516 ---- linux-3.1.3/drivers/md/raid1.c 2011-11-11 15:19:27.000000000 -0500
9517 -+++ linux-3.1.3/drivers/md/raid1.c 2011-11-16 18:39:07.000000000 -0500
9518 +diff -urNp linux-3.1.4/drivers/md/raid1.c linux-3.1.4/drivers/md/raid1.c
9519 +--- linux-3.1.4/drivers/md/raid1.c 2011-11-11 15:19:27.000000000 -0500
9520 ++++ linux-3.1.4/drivers/md/raid1.c 2011-11-16 18:39:07.000000000 -0500
9521 @@ -1541,7 +1541,7 @@ static int fix_sync_read_error(r1bio_t *
9522 if (r1_sync_page_io(rdev, sect, s,
9523 bio->bi_io_vec[idx].bv_page,
9524 @@ -29852,9 +30600,9 @@ diff -urNp linux-3.1.3/drivers/md/raid1.c linux-3.1.3/drivers/md/raid1.c
9525 printk(KERN_INFO
9526 "md/raid1:%s: read error corrected "
9527 "(%d sectors at %llu on %s)\n",
9528 -diff -urNp linux-3.1.3/drivers/md/raid5.c linux-3.1.3/drivers/md/raid5.c
9529 ---- linux-3.1.3/drivers/md/raid5.c 2011-11-11 15:19:27.000000000 -0500
9530 -+++ linux-3.1.3/drivers/md/raid5.c 2011-11-16 18:40:10.000000000 -0500
9531 +diff -urNp linux-3.1.4/drivers/md/raid5.c linux-3.1.4/drivers/md/raid5.c
9532 +--- linux-3.1.4/drivers/md/raid5.c 2011-11-11 15:19:27.000000000 -0500
9533 ++++ linux-3.1.4/drivers/md/raid5.c 2011-11-16 18:40:10.000000000 -0500
9534 @@ -1616,19 +1616,19 @@ static void raid5_end_read_request(struc
9535 (unsigned long long)(sh->sector
9536 + rdev->data_offset),
9537 @@ -29896,9 +30644,9 @@ diff -urNp linux-3.1.3/drivers/md/raid5.c linux-3.1.3/drivers/md/raid5.c
9538
9539 chunk_offset = sector_div(new_sector, sectors_per_chunk);
9540 stripe = new_sector;
9541 -diff -urNp linux-3.1.3/drivers/media/common/saa7146_hlp.c linux-3.1.3/drivers/media/common/saa7146_hlp.c
9542 ---- linux-3.1.3/drivers/media/common/saa7146_hlp.c 2011-11-11 15:19:27.000000000 -0500
9543 -+++ linux-3.1.3/drivers/media/common/saa7146_hlp.c 2011-11-16 18:40:10.000000000 -0500
9544 +diff -urNp linux-3.1.4/drivers/media/common/saa7146_hlp.c linux-3.1.4/drivers/media/common/saa7146_hlp.c
9545 +--- linux-3.1.4/drivers/media/common/saa7146_hlp.c 2011-11-11 15:19:27.000000000 -0500
9546 ++++ linux-3.1.4/drivers/media/common/saa7146_hlp.c 2011-11-16 18:40:10.000000000 -0500
9547 @@ -353,6 +353,8 @@ static void calculate_clipping_registers
9548
9549 int x[32], y[32], w[32], h[32];
9550 @@ -29908,9 +30656,9 @@ diff -urNp linux-3.1.3/drivers/media/common/saa7146_hlp.c linux-3.1.3/drivers/me
9551 /* clear out memory */
9552 memset(&line_list[0], 0x00, sizeof(u32)*32);
9553 memset(&pixel_list[0], 0x00, sizeof(u32)*32);
9554 -diff -urNp linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c
9555 ---- linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-11 15:19:27.000000000 -0500
9556 -+++ linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-16 18:39:07.000000000 -0500
9557 +diff -urNp linux-3.1.4/drivers/media/dvb/ddbridge/ddbridge-core.c linux-3.1.4/drivers/media/dvb/ddbridge/ddbridge-core.c
9558 +--- linux-3.1.4/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-11 15:19:27.000000000 -0500
9559 ++++ linux-3.1.4/drivers/media/dvb/ddbridge/ddbridge-core.c 2011-11-16 18:39:07.000000000 -0500
9560 @@ -1675,7 +1675,7 @@ static struct ddb_info ddb_v6 = {
9561 .subvendor = _subvend, .subdevice = _subdev, \
9562 .driver_data = (unsigned long)&_driverdata }
9563 @@ -29920,9 +30668,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/ddbridge/ddbridge-core.c linux-3.1.3/dr
9564 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
9565 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
9566 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
9567 -diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
9568 ---- linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-11 15:19:27.000000000 -0500
9569 -+++ linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-16 18:40:10.000000000 -0500
9570 +diff -urNp linux-3.1.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.1.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
9571 +--- linux-3.1.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-11 15:19:27.000000000 -0500
9572 ++++ linux-3.1.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-16 18:40:10.000000000 -0500
9573 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
9574 u8 buf[HOST_LINK_BUF_SIZE];
9575 int i;
9576 @@ -29941,9 +30689,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.1.3/d
9577 dprintk("%s\n", __func__);
9578
9579 /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
9580 -diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h
9581 ---- linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-11 15:19:27.000000000 -0500
9582 -+++ linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-17 18:34:32.000000000 -0500
9583 +diff -urNp linux-3.1.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.1.4/drivers/media/dvb/dvb-core/dvb_demux.h
9584 +--- linux-3.1.4/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-11 15:19:27.000000000 -0500
9585 ++++ linux-3.1.4/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-17 18:34:32.000000000 -0500
9586 @@ -73,7 +73,7 @@ struct dvb_demux_feed {
9587 union {
9588 dmx_ts_cb ts;
9589 @@ -29953,9 +30701,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.1.3/driver
9590
9591 struct dvb_demux *demux;
9592 void *priv;
9593 -diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c
9594 ---- linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-11 15:19:27.000000000 -0500
9595 -+++ linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-16 18:39:07.000000000 -0500
9596 +diff -urNp linux-3.1.4/drivers/media/dvb/dvb-core/dvbdev.c linux-3.1.4/drivers/media/dvb/dvb-core/dvbdev.c
9597 +--- linux-3.1.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-11 15:19:27.000000000 -0500
9598 ++++ linux-3.1.4/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-16 18:39:07.000000000 -0500
9599 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
9600 const struct dvb_device *template, void *priv, int type)
9601 {
9602 @@ -29965,9 +30713,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.1.3/drivers/m
9603 struct device *clsdev;
9604 int minor;
9605 int id;
9606 -diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c
9607 ---- linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-11 15:19:27.000000000 -0500
9608 -+++ linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-16 18:39:07.000000000 -0500
9609 +diff -urNp linux-3.1.4/drivers/media/dvb/dvb-usb/cxusb.c linux-3.1.4/drivers/media/dvb/dvb-usb/cxusb.c
9610 +--- linux-3.1.4/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-11 15:19:27.000000000 -0500
9611 ++++ linux-3.1.4/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-16 18:39:07.000000000 -0500
9612 @@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
9613 struct dib0700_adapter_state {
9614 int (*set_param_save) (struct dvb_frontend *,
9615 @@ -29977,9 +30725,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.1.3/drivers/med
9616
9617 static int dib7070_set_param_override(struct dvb_frontend *fe,
9618 struct dvb_frontend_parameters *fep)
9619 -diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c
9620 ---- linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-11 15:19:27.000000000 -0500
9621 -+++ linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-16 18:40:10.000000000 -0500
9622 +diff -urNp linux-3.1.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.1.4/drivers/media/dvb/dvb-usb/dib0700_core.c
9623 +--- linux-3.1.4/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-11 15:19:27.000000000 -0500
9624 ++++ linux-3.1.4/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-16 18:40:10.000000000 -0500
9625 @@ -478,6 +478,8 @@ int dib0700_download_firmware(struct usb
9626 if (!buf)
9627 return -ENOMEM;
9628 @@ -29989,9 +30737,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.1.3/driv
9629 while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
9630 deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",
9631 hx.addr, hx.len, hx.chk);
9632 -diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c
9633 ---- linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-11 15:19:27.000000000 -0500
9634 -+++ linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-16 18:39:07.000000000 -0500
9635 +diff -urNp linux-3.1.4/drivers/media/dvb/dvb-usb/dw2102.c linux-3.1.4/drivers/media/dvb/dvb-usb/dw2102.c
9636 +--- linux-3.1.4/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-11 15:19:27.000000000 -0500
9637 ++++ linux-3.1.4/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-16 18:39:07.000000000 -0500
9638 @@ -95,7 +95,7 @@ struct su3000_state {
9639
9640 struct s6x0_state {
9641 @@ -30001,9 +30749,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.1.3/drivers/me
9642
9643 /* debug */
9644 static int dvb_usb_dw2102_debug;
9645 -diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c
9646 ---- linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-11 15:19:27.000000000 -0500
9647 -+++ linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-16 18:40:10.000000000 -0500
9648 +diff -urNp linux-3.1.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.1.4/drivers/media/dvb/dvb-usb/lmedm04.c
9649 +--- linux-3.1.4/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-11 15:19:27.000000000 -0500
9650 ++++ linux-3.1.4/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-16 18:40:10.000000000 -0500
9651 @@ -742,6 +742,7 @@ static int lme2510_download_firmware(str
9652 usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
9653 0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000);
9654 @@ -30021,9 +30769,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.1.3/drivers/m
9655 data[0] = 0x0a;
9656 len_in = 1;
9657 info("FRM Firmware Cold Reset");
9658 -diff -urNp linux-3.1.3/drivers/media/dvb/frontends/dib3000.h linux-3.1.3/drivers/media/dvb/frontends/dib3000.h
9659 ---- linux-3.1.3/drivers/media/dvb/frontends/dib3000.h 2011-11-11 15:19:27.000000000 -0500
9660 -+++ linux-3.1.3/drivers/media/dvb/frontends/dib3000.h 2011-11-17 18:38:05.000000000 -0500
9661 +diff -urNp linux-3.1.4/drivers/media/dvb/frontends/dib3000.h linux-3.1.4/drivers/media/dvb/frontends/dib3000.h
9662 +--- linux-3.1.4/drivers/media/dvb/frontends/dib3000.h 2011-11-11 15:19:27.000000000 -0500
9663 ++++ linux-3.1.4/drivers/media/dvb/frontends/dib3000.h 2011-11-17 18:38:05.000000000 -0500
9664 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
9665 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
9666 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
9667 @@ -30033,9 +30781,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/frontends/dib3000.h linux-3.1.3/drivers
9668
9669 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
9670 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
9671 -diff -urNp linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c
9672 ---- linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c 2011-11-11 15:19:27.000000000 -0500
9673 -+++ linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c 2011-11-16 18:40:10.000000000 -0500
9674 +diff -urNp linux-3.1.4/drivers/media/dvb/frontends/mb86a16.c linux-3.1.4/drivers/media/dvb/frontends/mb86a16.c
9675 +--- linux-3.1.4/drivers/media/dvb/frontends/mb86a16.c 2011-11-11 15:19:27.000000000 -0500
9676 ++++ linux-3.1.4/drivers/media/dvb/frontends/mb86a16.c 2011-11-16 18:40:10.000000000 -0500
9677 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
9678 int ret = -1;
9679 int sync;
9680 @@ -30045,9 +30793,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/frontends/mb86a16.c linux-3.1.3/drivers
9681 dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
9682
9683 fcp = 3000;
9684 -diff -urNp linux-3.1.3/drivers/media/dvb/frontends/or51211.c linux-3.1.3/drivers/media/dvb/frontends/or51211.c
9685 ---- linux-3.1.3/drivers/media/dvb/frontends/or51211.c 2011-11-11 15:19:27.000000000 -0500
9686 -+++ linux-3.1.3/drivers/media/dvb/frontends/or51211.c 2011-11-16 18:40:10.000000000 -0500
9687 +diff -urNp linux-3.1.4/drivers/media/dvb/frontends/or51211.c linux-3.1.4/drivers/media/dvb/frontends/or51211.c
9688 +--- linux-3.1.4/drivers/media/dvb/frontends/or51211.c 2011-11-11 15:19:27.000000000 -0500
9689 ++++ linux-3.1.4/drivers/media/dvb/frontends/or51211.c 2011-11-16 18:40:10.000000000 -0500
9690 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
9691 u8 tudata[585];
9692 int i;
9693 @@ -30057,9 +30805,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/frontends/or51211.c linux-3.1.3/drivers
9694 dprintk("Firmware is %zd bytes\n",fw->size);
9695
9696 /* Get eprom data */
9697 -diff -urNp linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c
9698 ---- linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c 2011-11-11 15:19:27.000000000 -0500
9699 -+++ linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c 2011-11-16 18:39:07.000000000 -0500
9700 +diff -urNp linux-3.1.4/drivers/media/dvb/ngene/ngene-cards.c linux-3.1.4/drivers/media/dvb/ngene/ngene-cards.c
9701 +--- linux-3.1.4/drivers/media/dvb/ngene/ngene-cards.c 2011-11-11 15:19:27.000000000 -0500
9702 ++++ linux-3.1.4/drivers/media/dvb/ngene/ngene-cards.c 2011-11-16 18:39:07.000000000 -0500
9703 @@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780
9704
9705 /****************************************************************************/
9706 @@ -30069,9 +30817,9 @@ diff -urNp linux-3.1.3/drivers/media/dvb/ngene/ngene-cards.c linux-3.1.3/drivers
9707 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
9708 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
9709 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
9710 -diff -urNp linux-3.1.3/drivers/media/radio/radio-cadet.c linux-3.1.3/drivers/media/radio/radio-cadet.c
9711 ---- linux-3.1.3/drivers/media/radio/radio-cadet.c 2011-11-11 15:19:27.000000000 -0500
9712 -+++ linux-3.1.3/drivers/media/radio/radio-cadet.c 2011-11-16 18:39:07.000000000 -0500
9713 +diff -urNp linux-3.1.4/drivers/media/radio/radio-cadet.c linux-3.1.4/drivers/media/radio/radio-cadet.c
9714 +--- linux-3.1.4/drivers/media/radio/radio-cadet.c 2011-11-11 15:19:27.000000000 -0500
9715 ++++ linux-3.1.4/drivers/media/radio/radio-cadet.c 2011-11-16 18:39:07.000000000 -0500
9716 @@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *f
9717 unsigned char readbuf[RDS_BUFFER];
9718 int i = 0;
9719 @@ -30081,9 +30829,9 @@ diff -urNp linux-3.1.3/drivers/media/radio/radio-cadet.c linux-3.1.3/drivers/med
9720 mutex_lock(&dev->lock);
9721 if (dev->rdsstat == 0) {
9722 dev->rdsstat = 1;
9723 -diff -urNp linux-3.1.3/drivers/media/video/au0828/au0828.h linux-3.1.3/drivers/media/video/au0828/au0828.h
9724 ---- linux-3.1.3/drivers/media/video/au0828/au0828.h 2011-11-11 15:19:27.000000000 -0500
9725 -+++ linux-3.1.3/drivers/media/video/au0828/au0828.h 2011-11-16 18:39:07.000000000 -0500
9726 +diff -urNp linux-3.1.4/drivers/media/video/au0828/au0828.h linux-3.1.4/drivers/media/video/au0828/au0828.h
9727 +--- linux-3.1.4/drivers/media/video/au0828/au0828.h 2011-11-11 15:19:27.000000000 -0500
9728 ++++ linux-3.1.4/drivers/media/video/au0828/au0828.h 2011-11-16 18:39:07.000000000 -0500
9729 @@ -191,7 +191,7 @@ struct au0828_dev {
9730
9731 /* I2C */
9732 @@ -30093,9 +30841,9 @@ diff -urNp linux-3.1.3/drivers/media/video/au0828/au0828.h linux-3.1.3/drivers/m
9733 struct i2c_client i2c_client;
9734 u32 i2c_rc;
9735
9736 -diff -urNp linux-3.1.3/drivers/media/video/cx18/cx18-driver.c linux-3.1.3/drivers/media/video/cx18/cx18-driver.c
9737 ---- linux-3.1.3/drivers/media/video/cx18/cx18-driver.c 2011-11-11 15:19:27.000000000 -0500
9738 -+++ linux-3.1.3/drivers/media/video/cx18/cx18-driver.c 2011-11-16 18:40:10.000000000 -0500
9739 +diff -urNp linux-3.1.4/drivers/media/video/cx18/cx18-driver.c linux-3.1.4/drivers/media/video/cx18/cx18-driver.c
9740 +--- linux-3.1.4/drivers/media/video/cx18/cx18-driver.c 2011-11-11 15:19:27.000000000 -0500
9741 ++++ linux-3.1.4/drivers/media/video/cx18/cx18-driver.c 2011-11-16 18:40:10.000000000 -0500
9742 @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
9743 struct i2c_client c;
9744 u8 eedata[256];
9745 @@ -30105,9 +30853,9 @@ diff -urNp linux-3.1.3/drivers/media/video/cx18/cx18-driver.c linux-3.1.3/driver
9746 memset(&c, 0, sizeof(c));
9747 strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
9748 c.adapter = &cx->i2c_adap[0];
9749 -diff -urNp linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c
9750 ---- linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c 2011-11-11 15:19:27.000000000 -0500
9751 -+++ linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c 2011-11-16 18:40:10.000000000 -0500
9752 +diff -urNp linux-3.1.4/drivers/media/video/cx23885/cx23885-input.c linux-3.1.4/drivers/media/video/cx23885/cx23885-input.c
9753 +--- linux-3.1.4/drivers/media/video/cx23885/cx23885-input.c 2011-11-11 15:19:27.000000000 -0500
9754 ++++ linux-3.1.4/drivers/media/video/cx23885/cx23885-input.c 2011-11-16 18:40:10.000000000 -0500
9755 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur
9756 bool handle = false;
9757 struct ir_raw_event ir_core_event[64];
9758 @@ -30117,9 +30865,9 @@ diff -urNp linux-3.1.3/drivers/media/video/cx23885/cx23885-input.c linux-3.1.3/d
9759 do {
9760 num = 0;
9761 v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
9762 -diff -urNp linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c
9763 ---- linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c 2011-11-11 15:19:27.000000000 -0500
9764 -+++ linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c 2011-11-16 18:39:07.000000000 -0500
9765 +diff -urNp linux-3.1.4/drivers/media/video/cx88/cx88-alsa.c linux-3.1.4/drivers/media/video/cx88/cx88-alsa.c
9766 +--- linux-3.1.4/drivers/media/video/cx88/cx88-alsa.c 2011-11-11 15:19:27.000000000 -0500
9767 ++++ linux-3.1.4/drivers/media/video/cx88/cx88-alsa.c 2011-11-16 18:39:07.000000000 -0500
9768 @@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_
9769 * Only boards with eeprom and byte 1 at eeprom=1 have it
9770 */
9771 @@ -30129,9 +30877,9 @@ diff -urNp linux-3.1.3/drivers/media/video/cx88/cx88-alsa.c linux-3.1.3/drivers/
9772 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
9773 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
9774 {0, }
9775 -diff -urNp linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
9776 ---- linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-11 15:19:27.000000000 -0500
9777 -+++ linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-16 18:40:10.000000000 -0500
9778 +diff -urNp linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
9779 +--- linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-11 15:19:27.000000000 -0500
9780 ++++ linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-16 18:40:10.000000000 -0500
9781 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw
9782 u8 *eeprom;
9783 struct tveeprom tvdata;
9784 @@ -30141,9 +30889,9 @@ diff -urNp linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.1.3/
9785 memset(&tvdata,0,sizeof(tvdata));
9786
9787 eeprom = pvr2_eeprom_fetch(hdw);
9788 -diff -urNp linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
9789 ---- linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-11 15:19:27.000000000 -0500
9790 -+++ linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-16 18:39:07.000000000 -0500
9791 +diff -urNp linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
9792 +--- linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-11 15:19:27.000000000 -0500
9793 ++++ linux-3.1.4/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-16 18:39:07.000000000 -0500
9794 @@ -196,7 +196,7 @@ struct pvr2_hdw {
9795
9796 /* I2C stuff */
9797 @@ -30153,9 +30901,9 @@ diff -urNp linux-3.1.3/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-
9798 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
9799 int i2c_cx25840_hack_state;
9800 int i2c_linked;
9801 -diff -urNp linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c
9802 ---- linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c 2011-11-11 15:19:27.000000000 -0500
9803 -+++ linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c 2011-11-16 18:40:10.000000000 -0500
9804 +diff -urNp linux-3.1.4/drivers/media/video/saa7134/saa6752hs.c linux-3.1.4/drivers/media/video/saa7134/saa6752hs.c
9805 +--- linux-3.1.4/drivers/media/video/saa7134/saa6752hs.c 2011-11-11 15:19:27.000000000 -0500
9806 ++++ linux-3.1.4/drivers/media/video/saa7134/saa6752hs.c 2011-11-16 18:40:10.000000000 -0500
9807 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
9808 unsigned char localPAT[256];
9809 unsigned char localPMT[256];
9810 @@ -30165,9 +30913,9 @@ diff -urNp linux-3.1.3/drivers/media/video/saa7134/saa6752hs.c linux-3.1.3/drive
9811 /* Set video format - must be done first as it resets other settings */
9812 set_reg8(client, 0x41, h->video_format);
9813
9814 -diff -urNp linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c
9815 ---- linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-11 15:19:27.000000000 -0500
9816 -+++ linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-16 18:40:10.000000000 -0500
9817 +diff -urNp linux-3.1.4/drivers/media/video/saa7164/saa7164-cmd.c linux-3.1.4/drivers/media/video/saa7164/saa7164-cmd.c
9818 +--- linux-3.1.4/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-11 15:19:27.000000000 -0500
9819 ++++ linux-3.1.4/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-16 18:40:10.000000000 -0500
9820 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
9821 u8 tmp[512];
9822 dprintk(DBGLVL_CMD, "%s()\n", __func__);
9823 @@ -30186,9 +30934,9 @@ diff -urNp linux-3.1.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.1.3/dri
9824 while (loop) {
9825
9826 struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
9827 -diff -urNp linux-3.1.3/drivers/media/video/timblogiw.c linux-3.1.3/drivers/media/video/timblogiw.c
9828 ---- linux-3.1.3/drivers/media/video/timblogiw.c 2011-11-11 15:19:27.000000000 -0500
9829 -+++ linux-3.1.3/drivers/media/video/timblogiw.c 2011-11-17 18:36:32.000000000 -0500
9830 +diff -urNp linux-3.1.4/drivers/media/video/timblogiw.c linux-3.1.4/drivers/media/video/timblogiw.c
9831 +--- linux-3.1.4/drivers/media/video/timblogiw.c 2011-11-11 15:19:27.000000000 -0500
9832 ++++ linux-3.1.4/drivers/media/video/timblogiw.c 2011-11-17 18:36:32.000000000 -0500
9833 @@ -744,7 +744,7 @@ static int timblogiw_mmap(struct file *f
9834
9835 /* Platform device functions */
9836 @@ -30207,9 +30955,9 @@ diff -urNp linux-3.1.3/drivers/media/video/timblogiw.c linux-3.1.3/drivers/media
9837 .owner = THIS_MODULE,
9838 .open = timblogiw_open,
9839 .release = timblogiw_close,
9840 -diff -urNp linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c
9841 ---- linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c 2011-11-11 15:19:27.000000000 -0500
9842 -+++ linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c 2011-11-16 18:40:10.000000000 -0500
9843 +diff -urNp linux-3.1.4/drivers/media/video/usbvision/usbvision-core.c linux-3.1.4/drivers/media/video/usbvision/usbvision-core.c
9844 +--- linux-3.1.4/drivers/media/video/usbvision/usbvision-core.c 2011-11-11 15:19:27.000000000 -0500
9845 ++++ linux-3.1.4/drivers/media/video/usbvision/usbvision-core.c 2011-11-16 18:40:10.000000000 -0500
9846 @@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
9847 unsigned char rv, gv, bv;
9848 static unsigned char *Y, *U, *V;
9849 @@ -30219,9 +30967,9 @@ diff -urNp linux-3.1.3/drivers/media/video/usbvision/usbvision-core.c linux-3.1.
9850 frame = usbvision->cur_frame;
9851 image_size = frame->frmwidth * frame->frmheight;
9852 if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
9853 -diff -urNp linux-3.1.3/drivers/media/video/videobuf-dma-sg.c linux-3.1.3/drivers/media/video/videobuf-dma-sg.c
9854 ---- linux-3.1.3/drivers/media/video/videobuf-dma-sg.c 2011-11-11 15:19:27.000000000 -0500
9855 -+++ linux-3.1.3/drivers/media/video/videobuf-dma-sg.c 2011-11-16 18:40:10.000000000 -0500
9856 +diff -urNp linux-3.1.4/drivers/media/video/videobuf-dma-sg.c linux-3.1.4/drivers/media/video/videobuf-dma-sg.c
9857 +--- linux-3.1.4/drivers/media/video/videobuf-dma-sg.c 2011-11-11 15:19:27.000000000 -0500
9858 ++++ linux-3.1.4/drivers/media/video/videobuf-dma-sg.c 2011-11-16 18:40:10.000000000 -0500
9859 @@ -607,6 +607,8 @@ void *videobuf_sg_alloc(size_t size)
9860 {
9861 struct videobuf_queue q;
9862 @@ -30231,9 +30979,9 @@ diff -urNp linux-3.1.3/drivers/media/video/videobuf-dma-sg.c linux-3.1.3/drivers
9863 /* Required to make generic handler to call __videobuf_alloc */
9864 q.int_ops = &sg_ops;
9865
9866 -diff -urNp linux-3.1.3/drivers/message/fusion/mptbase.c linux-3.1.3/drivers/message/fusion/mptbase.c
9867 ---- linux-3.1.3/drivers/message/fusion/mptbase.c 2011-11-11 15:19:27.000000000 -0500
9868 -+++ linux-3.1.3/drivers/message/fusion/mptbase.c 2011-11-16 18:40:10.000000000 -0500
9869 +diff -urNp linux-3.1.4/drivers/message/fusion/mptbase.c linux-3.1.4/drivers/message/fusion/mptbase.c
9870 +--- linux-3.1.4/drivers/message/fusion/mptbase.c 2011-11-11 15:19:27.000000000 -0500
9871 ++++ linux-3.1.4/drivers/message/fusion/mptbase.c 2011-11-16 18:40:10.000000000 -0500
9872 @@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct
9873 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
9874 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
9875 @@ -30248,9 +30996,9 @@ diff -urNp linux-3.1.3/drivers/message/fusion/mptbase.c linux-3.1.3/drivers/mess
9876 /*
9877 * Rounding UP to nearest 4-kB boundary here...
9878 */
9879 -diff -urNp linux-3.1.3/drivers/message/fusion/mptsas.c linux-3.1.3/drivers/message/fusion/mptsas.c
9880 ---- linux-3.1.3/drivers/message/fusion/mptsas.c 2011-11-11 15:19:27.000000000 -0500
9881 -+++ linux-3.1.3/drivers/message/fusion/mptsas.c 2011-11-16 18:39:07.000000000 -0500
9882 +diff -urNp linux-3.1.4/drivers/message/fusion/mptsas.c linux-3.1.4/drivers/message/fusion/mptsas.c
9883 +--- linux-3.1.4/drivers/message/fusion/mptsas.c 2011-11-11 15:19:27.000000000 -0500
9884 ++++ linux-3.1.4/drivers/message/fusion/mptsas.c 2011-11-16 18:39:07.000000000 -0500
9885 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
9886 return 0;
9887 }
9888 @@ -30299,9 +31047,9 @@ diff -urNp linux-3.1.3/drivers/message/fusion/mptsas.c linux-3.1.3/drivers/messa
9889 static inline struct sas_port *
9890 mptsas_get_port(struct mptsas_phyinfo *phy_info)
9891 {
9892 -diff -urNp linux-3.1.3/drivers/message/fusion/mptscsih.c linux-3.1.3/drivers/message/fusion/mptscsih.c
9893 ---- linux-3.1.3/drivers/message/fusion/mptscsih.c 2011-11-11 15:19:27.000000000 -0500
9894 -+++ linux-3.1.3/drivers/message/fusion/mptscsih.c 2011-11-16 18:39:07.000000000 -0500
9895 +diff -urNp linux-3.1.4/drivers/message/fusion/mptscsih.c linux-3.1.4/drivers/message/fusion/mptscsih.c
9896 +--- linux-3.1.4/drivers/message/fusion/mptscsih.c 2011-11-11 15:19:27.000000000 -0500
9897 ++++ linux-3.1.4/drivers/message/fusion/mptscsih.c 2011-11-16 18:39:07.000000000 -0500
9898 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
9899
9900 h = shost_priv(SChost);
9901 @@ -30327,9 +31075,9 @@ diff -urNp linux-3.1.3/drivers/message/fusion/mptscsih.c linux-3.1.3/drivers/mes
9902
9903 return h->info_kbuf;
9904 }
9905 -diff -urNp linux-3.1.3/drivers/message/i2o/i2o_config.c linux-3.1.3/drivers/message/i2o/i2o_config.c
9906 ---- linux-3.1.3/drivers/message/i2o/i2o_config.c 2011-11-11 15:19:27.000000000 -0500
9907 -+++ linux-3.1.3/drivers/message/i2o/i2o_config.c 2011-11-16 18:40:10.000000000 -0500
9908 +diff -urNp linux-3.1.4/drivers/message/i2o/i2o_config.c linux-3.1.4/drivers/message/i2o/i2o_config.c
9909 +--- linux-3.1.4/drivers/message/i2o/i2o_config.c 2011-11-11 15:19:27.000000000 -0500
9910 ++++ linux-3.1.4/drivers/message/i2o/i2o_config.c 2011-11-16 18:40:10.000000000 -0500
9911 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
9912 struct i2o_message *msg;
9913 unsigned int iop;
9914 @@ -30339,9 +31087,9 @@ diff -urNp linux-3.1.3/drivers/message/i2o/i2o_config.c linux-3.1.3/drivers/mess
9915 if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
9916 return -EFAULT;
9917
9918 -diff -urNp linux-3.1.3/drivers/message/i2o/i2o_proc.c linux-3.1.3/drivers/message/i2o/i2o_proc.c
9919 ---- linux-3.1.3/drivers/message/i2o/i2o_proc.c 2011-11-11 15:19:27.000000000 -0500
9920 -+++ linux-3.1.3/drivers/message/i2o/i2o_proc.c 2011-11-16 18:39:07.000000000 -0500
9921 +diff -urNp linux-3.1.4/drivers/message/i2o/i2o_proc.c linux-3.1.4/drivers/message/i2o/i2o_proc.c
9922 +--- linux-3.1.4/drivers/message/i2o/i2o_proc.c 2011-11-11 15:19:27.000000000 -0500
9923 ++++ linux-3.1.4/drivers/message/i2o/i2o_proc.c 2011-11-16 18:39:07.000000000 -0500
9924 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
9925 "Array Controller Device"
9926 };
9927 @@ -30428,9 +31176,9 @@ diff -urNp linux-3.1.3/drivers/message/i2o/i2o_proc.c linux-3.1.3/drivers/messag
9928
9929 return 0;
9930 }
9931 -diff -urNp linux-3.1.3/drivers/message/i2o/iop.c linux-3.1.3/drivers/message/i2o/iop.c
9932 ---- linux-3.1.3/drivers/message/i2o/iop.c 2011-11-11 15:19:27.000000000 -0500
9933 -+++ linux-3.1.3/drivers/message/i2o/iop.c 2011-11-16 18:39:07.000000000 -0500
9934 +diff -urNp linux-3.1.4/drivers/message/i2o/iop.c linux-3.1.4/drivers/message/i2o/iop.c
9935 +--- linux-3.1.4/drivers/message/i2o/iop.c 2011-11-11 15:19:27.000000000 -0500
9936 ++++ linux-3.1.4/drivers/message/i2o/iop.c 2011-11-16 18:39:07.000000000 -0500
9937 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
9938
9939 spin_lock_irqsave(&c->context_list_lock, flags);
9940 @@ -30454,9 +31202,9 @@ diff -urNp linux-3.1.3/drivers/message/i2o/iop.c linux-3.1.3/drivers/message/i2o
9941 INIT_LIST_HEAD(&c->context_list);
9942 #endif
9943
9944 -diff -urNp linux-3.1.3/drivers/mfd/ab3100-core.c linux-3.1.3/drivers/mfd/ab3100-core.c
9945 ---- linux-3.1.3/drivers/mfd/ab3100-core.c 2011-11-11 15:19:27.000000000 -0500
9946 -+++ linux-3.1.3/drivers/mfd/ab3100-core.c 2011-11-16 18:39:07.000000000 -0500
9947 +diff -urNp linux-3.1.4/drivers/mfd/ab3100-core.c linux-3.1.4/drivers/mfd/ab3100-core.c
9948 +--- linux-3.1.4/drivers/mfd/ab3100-core.c 2011-11-11 15:19:27.000000000 -0500
9949 ++++ linux-3.1.4/drivers/mfd/ab3100-core.c 2011-11-16 18:39:07.000000000 -0500
9950 @@ -809,7 +809,7 @@ struct ab_family_id {
9951 char *name;
9952 };
9953 @@ -30466,9 +31214,9 @@ diff -urNp linux-3.1.3/drivers/mfd/ab3100-core.c linux-3.1.3/drivers/mfd/ab3100-
9954 /* AB3100 */
9955 {
9956 .id = 0xc0,
9957 -diff -urNp linux-3.1.3/drivers/mfd/abx500-core.c linux-3.1.3/drivers/mfd/abx500-core.c
9958 ---- linux-3.1.3/drivers/mfd/abx500-core.c 2011-11-11 15:19:27.000000000 -0500
9959 -+++ linux-3.1.3/drivers/mfd/abx500-core.c 2011-11-16 18:39:07.000000000 -0500
9960 +diff -urNp linux-3.1.4/drivers/mfd/abx500-core.c linux-3.1.4/drivers/mfd/abx500-core.c
9961 +--- linux-3.1.4/drivers/mfd/abx500-core.c 2011-11-11 15:19:27.000000000 -0500
9962 ++++ linux-3.1.4/drivers/mfd/abx500-core.c 2011-11-16 18:39:07.000000000 -0500
9963 @@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
9964
9965 struct abx500_device_entry {
9966 @@ -30478,9 +31226,9 @@ diff -urNp linux-3.1.3/drivers/mfd/abx500-core.c linux-3.1.3/drivers/mfd/abx500-
9967 struct device *dev;
9968 };
9969
9970 -diff -urNp linux-3.1.3/drivers/mfd/janz-cmodio.c linux-3.1.3/drivers/mfd/janz-cmodio.c
9971 ---- linux-3.1.3/drivers/mfd/janz-cmodio.c 2011-11-11 15:19:27.000000000 -0500
9972 -+++ linux-3.1.3/drivers/mfd/janz-cmodio.c 2011-11-16 18:39:07.000000000 -0500
9973 +diff -urNp linux-3.1.4/drivers/mfd/janz-cmodio.c linux-3.1.4/drivers/mfd/janz-cmodio.c
9974 +--- linux-3.1.4/drivers/mfd/janz-cmodio.c 2011-11-11 15:19:27.000000000 -0500
9975 ++++ linux-3.1.4/drivers/mfd/janz-cmodio.c 2011-11-16 18:39:07.000000000 -0500
9976 @@ -13,6 +13,7 @@
9977
9978 #include <linux/kernel.h>
9979 @@ -30489,9 +31237,9 @@ diff -urNp linux-3.1.3/drivers/mfd/janz-cmodio.c linux-3.1.3/drivers/mfd/janz-cm
9980 #include <linux/init.h>
9981 #include <linux/pci.h>
9982 #include <linux/interrupt.h>
9983 -diff -urNp linux-3.1.3/drivers/mfd/wm8350-i2c.c linux-3.1.3/drivers/mfd/wm8350-i2c.c
9984 ---- linux-3.1.3/drivers/mfd/wm8350-i2c.c 2011-11-11 15:19:27.000000000 -0500
9985 -+++ linux-3.1.3/drivers/mfd/wm8350-i2c.c 2011-11-16 18:40:10.000000000 -0500
9986 +diff -urNp linux-3.1.4/drivers/mfd/wm8350-i2c.c linux-3.1.4/drivers/mfd/wm8350-i2c.c
9987 +--- linux-3.1.4/drivers/mfd/wm8350-i2c.c 2011-11-11 15:19:27.000000000 -0500
9988 ++++ linux-3.1.4/drivers/mfd/wm8350-i2c.c 2011-11-16 18:40:10.000000000 -0500
9989 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
9990 u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
9991 int ret;
9992 @@ -30501,9 +31249,9 @@ diff -urNp linux-3.1.3/drivers/mfd/wm8350-i2c.c linux-3.1.3/drivers/mfd/wm8350-i
9993 if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
9994 return -EINVAL;
9995
9996 -diff -urNp linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c
9997 ---- linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-11 15:19:27.000000000 -0500
9998 -+++ linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-16 18:39:07.000000000 -0500
9999 +diff -urNp linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.c
10000 +--- linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-11 15:19:27.000000000 -0500
10001 ++++ linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-16 18:39:07.000000000 -0500
10002 @@ -437,7 +437,7 @@ static irqreturn_t lis302dl_interrupt(in
10003 * the lid is closed. This leads to interrupts as soon as a little move
10004 * is done.
10005 @@ -30540,9 +31288,9 @@ diff -urNp linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.1.3/drivers/mi
10006 return POLLIN | POLLRDNORM;
10007 return 0;
10008 }
10009 -diff -urNp linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h
10010 ---- linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-11 15:19:27.000000000 -0500
10011 -+++ linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-16 18:39:07.000000000 -0500
10012 +diff -urNp linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.h
10013 +--- linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-11 15:19:27.000000000 -0500
10014 ++++ linux-3.1.4/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-16 18:39:07.000000000 -0500
10015 @@ -265,7 +265,7 @@ struct lis3lv02d {
10016 struct input_polled_dev *idev; /* input device */
10017 struct platform_device *pdev; /* platform device */
10018 @@ -30552,9 +31300,9 @@ diff -urNp linux-3.1.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.1.3/drivers/mi
10019 union axis_conversion ac; /* hw -> logical axis */
10020 int mapped_btns[3];
10021
10022 -diff -urNp linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c
10023 ---- linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c 2011-11-11 15:19:27.000000000 -0500
10024 -+++ linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c 2011-11-16 18:39:07.000000000 -0500
10025 +diff -urNp linux-3.1.4/drivers/misc/sgi-gru/gruhandles.c linux-3.1.4/drivers/misc/sgi-gru/gruhandles.c
10026 +--- linux-3.1.4/drivers/misc/sgi-gru/gruhandles.c 2011-11-11 15:19:27.000000000 -0500
10027 ++++ linux-3.1.4/drivers/misc/sgi-gru/gruhandles.c 2011-11-16 18:39:07.000000000 -0500
10028 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
10029 unsigned long nsec;
10030
10031 @@ -30566,9 +31314,9 @@ diff -urNp linux-3.1.3/drivers/misc/sgi-gru/gruhandles.c linux-3.1.3/drivers/mis
10032 if (mcs_op_statistics[op].max < nsec)
10033 mcs_op_statistics[op].max = nsec;
10034 }
10035 -diff -urNp linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c
10036 ---- linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c 2011-11-11 15:19:27.000000000 -0500
10037 -+++ linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c 2011-11-16 18:39:07.000000000 -0500
10038 +diff -urNp linux-3.1.4/drivers/misc/sgi-gru/gruprocfs.c linux-3.1.4/drivers/misc/sgi-gru/gruprocfs.c
10039 +--- linux-3.1.4/drivers/misc/sgi-gru/gruprocfs.c 2011-11-11 15:19:27.000000000 -0500
10040 ++++ linux-3.1.4/drivers/misc/sgi-gru/gruprocfs.c 2011-11-16 18:39:07.000000000 -0500
10041 @@ -32,9 +32,9 @@
10042
10043 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
10044 @@ -30592,9 +31340,9 @@ diff -urNp linux-3.1.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.1.3/drivers/misc
10045 max = mcs_op_statistics[op].max;
10046 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
10047 count ? total / count : 0, max);
10048 -diff -urNp linux-3.1.3/drivers/misc/sgi-gru/grutables.h linux-3.1.3/drivers/misc/sgi-gru/grutables.h
10049 ---- linux-3.1.3/drivers/misc/sgi-gru/grutables.h 2011-11-11 15:19:27.000000000 -0500
10050 -+++ linux-3.1.3/drivers/misc/sgi-gru/grutables.h 2011-11-16 18:39:07.000000000 -0500
10051 +diff -urNp linux-3.1.4/drivers/misc/sgi-gru/grutables.h linux-3.1.4/drivers/misc/sgi-gru/grutables.h
10052 +--- linux-3.1.4/drivers/misc/sgi-gru/grutables.h 2011-11-11 15:19:27.000000000 -0500
10053 ++++ linux-3.1.4/drivers/misc/sgi-gru/grutables.h 2011-11-16 18:39:07.000000000 -0500
10054 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
10055 * GRU statistics.
10056 */
10057 @@ -30774,9 +31522,9 @@ diff -urNp linux-3.1.3/drivers/misc/sgi-gru/grutables.h linux-3.1.3/drivers/misc
10058 } while (0)
10059
10060 #ifdef CONFIG_SGI_GRU_DEBUG
10061 -diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xpc.h linux-3.1.3/drivers/misc/sgi-xp/xpc.h
10062 ---- linux-3.1.3/drivers/misc/sgi-xp/xpc.h 2011-11-11 15:19:27.000000000 -0500
10063 -+++ linux-3.1.3/drivers/misc/sgi-xp/xpc.h 2011-11-16 18:39:07.000000000 -0500
10064 +diff -urNp linux-3.1.4/drivers/misc/sgi-xp/xpc.h linux-3.1.4/drivers/misc/sgi-xp/xpc.h
10065 +--- linux-3.1.4/drivers/misc/sgi-xp/xpc.h 2011-11-11 15:19:27.000000000 -0500
10066 ++++ linux-3.1.4/drivers/misc/sgi-xp/xpc.h 2011-11-16 18:39:07.000000000 -0500
10067 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
10068 void (*received_payload) (struct xpc_channel *, void *);
10069 void (*notify_senders_of_disconnect) (struct xpc_channel *);
10070 @@ -30794,9 +31542,9 @@ diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xpc.h linux-3.1.3/drivers/misc/sgi-xp
10071 extern int xpc_disengage_timelimit;
10072 extern int xpc_disengage_timedout;
10073 extern int xpc_activate_IRQ_rcvd;
10074 -diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c
10075 ---- linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c 2011-11-11 15:19:27.000000000 -0500
10076 -+++ linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c 2011-11-16 18:39:07.000000000 -0500
10077 +diff -urNp linux-3.1.4/drivers/misc/sgi-xp/xpc_main.c linux-3.1.4/drivers/misc/sgi-xp/xpc_main.c
10078 +--- linux-3.1.4/drivers/misc/sgi-xp/xpc_main.c 2011-11-11 15:19:27.000000000 -0500
10079 ++++ linux-3.1.4/drivers/misc/sgi-xp/xpc_main.c 2011-11-16 18:39:07.000000000 -0500
10080 @@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not
10081 .notifier_call = xpc_system_die,
10082 };
10083 @@ -30806,9 +31554,9 @@ diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xpc_main.c linux-3.1.3/drivers/misc/s
10084
10085 /*
10086 * Timer function to enforce the timelimit on the partition disengage.
10087 -diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xp.h linux-3.1.3/drivers/misc/sgi-xp/xp.h
10088 ---- linux-3.1.3/drivers/misc/sgi-xp/xp.h 2011-11-11 15:19:27.000000000 -0500
10089 -+++ linux-3.1.3/drivers/misc/sgi-xp/xp.h 2011-11-16 18:39:07.000000000 -0500
10090 +diff -urNp linux-3.1.4/drivers/misc/sgi-xp/xp.h linux-3.1.4/drivers/misc/sgi-xp/xp.h
10091 +--- linux-3.1.4/drivers/misc/sgi-xp/xp.h 2011-11-11 15:19:27.000000000 -0500
10092 ++++ linux-3.1.4/drivers/misc/sgi-xp/xp.h 2011-11-16 18:39:07.000000000 -0500
10093 @@ -289,7 +289,7 @@ struct xpc_interface {
10094 xpc_notify_func, void *);
10095 void (*received) (short, int, void *);
10096 @@ -30818,9 +31566,9 @@ diff -urNp linux-3.1.3/drivers/misc/sgi-xp/xp.h linux-3.1.3/drivers/misc/sgi-xp/
10097
10098 extern struct xpc_interface xpc_interface;
10099
10100 -diff -urNp linux-3.1.3/drivers/mmc/host/sdhci-pci.c linux-3.1.3/drivers/mmc/host/sdhci-pci.c
10101 ---- linux-3.1.3/drivers/mmc/host/sdhci-pci.c 2011-11-11 15:19:27.000000000 -0500
10102 -+++ linux-3.1.3/drivers/mmc/host/sdhci-pci.c 2011-11-16 18:39:07.000000000 -0500
10103 +diff -urNp linux-3.1.4/drivers/mmc/host/sdhci-pci.c linux-3.1.4/drivers/mmc/host/sdhci-pci.c
10104 +--- linux-3.1.4/drivers/mmc/host/sdhci-pci.c 2011-11-11 15:19:27.000000000 -0500
10105 ++++ linux-3.1.4/drivers/mmc/host/sdhci-pci.c 2011-11-16 18:39:07.000000000 -0500
10106 @@ -542,7 +542,7 @@ static const struct sdhci_pci_fixes sdhc
10107 .probe = via_probe,
10108 };
10109 @@ -30830,9 +31578,9 @@ diff -urNp linux-3.1.3/drivers/mmc/host/sdhci-pci.c linux-3.1.3/drivers/mmc/host
10110 {
10111 .vendor = PCI_VENDOR_ID_RICOH,
10112 .device = PCI_DEVICE_ID_RICOH_R5C822,
10113 -diff -urNp linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c
10114 ---- linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-11 15:19:27.000000000 -0500
10115 -+++ linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-16 18:40:10.000000000 -0500
10116 +diff -urNp linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0001.c
10117 +--- linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-11 15:19:27.000000000 -0500
10118 ++++ linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-16 18:40:10.000000000 -0500
10119 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
10120 struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
10121 unsigned long timeo = jiffies + HZ;
10122 @@ -30860,9 +31608,9 @@ diff -urNp linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.1.3/drivers/m
10123 adr += chip->start;
10124
10125 retry:
10126 -diff -urNp linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c
10127 ---- linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-11 15:19:27.000000000 -0500
10128 -+++ linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-16 18:40:10.000000000 -0500
10129 +diff -urNp linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0020.c
10130 +--- linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-11 15:19:27.000000000 -0500
10131 ++++ linux-3.1.4/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-16 18:40:10.000000000 -0500
10132 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
10133 unsigned long cmd_addr;
10134 struct cfi_private *cfi = map->fldrv_priv;
10135 @@ -30908,9 +31656,9 @@ diff -urNp linux-3.1.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.1.3/drivers/m
10136 adr += chip->start;
10137
10138 /* Let's determine this according to the interleave only once */
10139 -diff -urNp linux-3.1.3/drivers/mtd/devices/doc2000.c linux-3.1.3/drivers/mtd/devices/doc2000.c
10140 ---- linux-3.1.3/drivers/mtd/devices/doc2000.c 2011-11-11 15:19:27.000000000 -0500
10141 -+++ linux-3.1.3/drivers/mtd/devices/doc2000.c 2011-11-16 18:39:07.000000000 -0500
10142 +diff -urNp linux-3.1.4/drivers/mtd/devices/doc2000.c linux-3.1.4/drivers/mtd/devices/doc2000.c
10143 +--- linux-3.1.4/drivers/mtd/devices/doc2000.c 2011-11-11 15:19:27.000000000 -0500
10144 ++++ linux-3.1.4/drivers/mtd/devices/doc2000.c 2011-11-16 18:39:07.000000000 -0500
10145 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
10146
10147 /* The ECC will not be calculated correctly if less than 512 is written */
10148 @@ -30920,9 +31668,9 @@ diff -urNp linux-3.1.3/drivers/mtd/devices/doc2000.c linux-3.1.3/drivers/mtd/dev
10149 printk(KERN_WARNING
10150 "ECC needs a full sector write (adr: %lx size %lx)\n",
10151 (long) to, (long) len);
10152 -diff -urNp linux-3.1.3/drivers/mtd/devices/doc2001.c linux-3.1.3/drivers/mtd/devices/doc2001.c
10153 ---- linux-3.1.3/drivers/mtd/devices/doc2001.c 2011-11-11 15:19:27.000000000 -0500
10154 -+++ linux-3.1.3/drivers/mtd/devices/doc2001.c 2011-11-16 18:39:07.000000000 -0500
10155 +diff -urNp linux-3.1.4/drivers/mtd/devices/doc2001.c linux-3.1.4/drivers/mtd/devices/doc2001.c
10156 +--- linux-3.1.4/drivers/mtd/devices/doc2001.c 2011-11-11 15:19:27.000000000 -0500
10157 ++++ linux-3.1.4/drivers/mtd/devices/doc2001.c 2011-11-16 18:39:07.000000000 -0500
10158 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
10159 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
10160
10161 @@ -30932,9 +31680,9 @@ diff -urNp linux-3.1.3/drivers/mtd/devices/doc2001.c linux-3.1.3/drivers/mtd/dev
10162 return -EINVAL;
10163
10164 /* Don't allow a single read to cross a 512-byte block boundary */
10165 -diff -urNp linux-3.1.3/drivers/mtd/ftl.c linux-3.1.3/drivers/mtd/ftl.c
10166 ---- linux-3.1.3/drivers/mtd/ftl.c 2011-11-11 15:19:27.000000000 -0500
10167 -+++ linux-3.1.3/drivers/mtd/ftl.c 2011-11-16 18:40:10.000000000 -0500
10168 +diff -urNp linux-3.1.4/drivers/mtd/ftl.c linux-3.1.4/drivers/mtd/ftl.c
10169 +--- linux-3.1.4/drivers/mtd/ftl.c 2011-11-11 15:19:27.000000000 -0500
10170 ++++ linux-3.1.4/drivers/mtd/ftl.c 2011-11-16 18:40:10.000000000 -0500
10171 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
10172 loff_t offset;
10173 uint16_t srcunitswap = cpu_to_le16(srcunit);
10174 @@ -30944,9 +31692,9 @@ diff -urNp linux-3.1.3/drivers/mtd/ftl.c linux-3.1.3/drivers/mtd/ftl.c
10175 eun = &part->EUNInfo[srcunit];
10176 xfer = &part->XferInfo[xferunit];
10177 DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
10178 -diff -urNp linux-3.1.3/drivers/mtd/inftlcore.c linux-3.1.3/drivers/mtd/inftlcore.c
10179 ---- linux-3.1.3/drivers/mtd/inftlcore.c 2011-11-11 15:19:27.000000000 -0500
10180 -+++ linux-3.1.3/drivers/mtd/inftlcore.c 2011-11-16 18:40:10.000000000 -0500
10181 +diff -urNp linux-3.1.4/drivers/mtd/inftlcore.c linux-3.1.4/drivers/mtd/inftlcore.c
10182 +--- linux-3.1.4/drivers/mtd/inftlcore.c 2011-11-11 15:19:27.000000000 -0500
10183 ++++ linux-3.1.4/drivers/mtd/inftlcore.c 2011-11-16 18:40:10.000000000 -0500
10184 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
10185 struct inftl_oob oob;
10186 size_t retlen;
10187 @@ -30956,9 +31704,9 @@ diff -urNp linux-3.1.3/drivers/mtd/inftlcore.c linux-3.1.3/drivers/mtd/inftlcore
10188 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
10189 "pending=%d)\n", inftl, thisVUC, pendingblock);
10190
10191 -diff -urNp linux-3.1.3/drivers/mtd/inftlmount.c linux-3.1.3/drivers/mtd/inftlmount.c
10192 ---- linux-3.1.3/drivers/mtd/inftlmount.c 2011-11-11 15:19:27.000000000 -0500
10193 -+++ linux-3.1.3/drivers/mtd/inftlmount.c 2011-11-16 18:40:10.000000000 -0500
10194 +diff -urNp linux-3.1.4/drivers/mtd/inftlmount.c linux-3.1.4/drivers/mtd/inftlmount.c
10195 +--- linux-3.1.4/drivers/mtd/inftlmount.c 2011-11-11 15:19:27.000000000 -0500
10196 ++++ linux-3.1.4/drivers/mtd/inftlmount.c 2011-11-16 18:40:10.000000000 -0500
10197 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
10198 struct INFTLPartition *ip;
10199 size_t retlen;
10200 @@ -30968,9 +31716,9 @@ diff -urNp linux-3.1.3/drivers/mtd/inftlmount.c linux-3.1.3/drivers/mtd/inftlmou
10201 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
10202
10203 /*
10204 -diff -urNp linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c
10205 ---- linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c 2011-11-11 15:19:27.000000000 -0500
10206 -+++ linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c 2011-11-16 18:40:10.000000000 -0500
10207 +diff -urNp linux-3.1.4/drivers/mtd/lpddr/qinfo_probe.c linux-3.1.4/drivers/mtd/lpddr/qinfo_probe.c
10208 +--- linux-3.1.4/drivers/mtd/lpddr/qinfo_probe.c 2011-11-11 15:19:27.000000000 -0500
10209 ++++ linux-3.1.4/drivers/mtd/lpddr/qinfo_probe.c 2011-11-16 18:40:10.000000000 -0500
10210 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
10211 {
10212 map_word pfow_val[4];
10213 @@ -30980,9 +31728,9 @@ diff -urNp linux-3.1.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.1.3/drivers/mtd/l
10214 /* Check identification string */
10215 pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
10216 pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
10217 -diff -urNp linux-3.1.3/drivers/mtd/mtdchar.c linux-3.1.3/drivers/mtd/mtdchar.c
10218 ---- linux-3.1.3/drivers/mtd/mtdchar.c 2011-11-11 15:19:27.000000000 -0500
10219 -+++ linux-3.1.3/drivers/mtd/mtdchar.c 2011-11-16 18:40:10.000000000 -0500
10220 +diff -urNp linux-3.1.4/drivers/mtd/mtdchar.c linux-3.1.4/drivers/mtd/mtdchar.c
10221 +--- linux-3.1.4/drivers/mtd/mtdchar.c 2011-11-11 15:19:27.000000000 -0500
10222 ++++ linux-3.1.4/drivers/mtd/mtdchar.c 2011-11-16 18:40:10.000000000 -0500
10223 @@ -554,6 +554,8 @@ static int mtd_ioctl(struct file *file,
10224 u_long size;
10225 struct mtd_info_user info;
10226 @@ -30992,9 +31740,9 @@ diff -urNp linux-3.1.3/drivers/mtd/mtdchar.c linux-3.1.3/drivers/mtd/mtdchar.c
10227 DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
10228
10229 size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
10230 -diff -urNp linux-3.1.3/drivers/mtd/nand/denali.c linux-3.1.3/drivers/mtd/nand/denali.c
10231 ---- linux-3.1.3/drivers/mtd/nand/denali.c 2011-11-11 15:19:27.000000000 -0500
10232 -+++ linux-3.1.3/drivers/mtd/nand/denali.c 2011-11-16 18:39:07.000000000 -0500
10233 +diff -urNp linux-3.1.4/drivers/mtd/nand/denali.c linux-3.1.4/drivers/mtd/nand/denali.c
10234 +--- linux-3.1.4/drivers/mtd/nand/denali.c 2011-11-11 15:19:27.000000000 -0500
10235 ++++ linux-3.1.4/drivers/mtd/nand/denali.c 2011-11-16 18:39:07.000000000 -0500
10236 @@ -26,6 +26,7 @@
10237 #include <linux/pci.h>
10238 #include <linux/mtd/mtd.h>
10239 @@ -31003,9 +31751,9 @@ diff -urNp linux-3.1.3/drivers/mtd/nand/denali.c linux-3.1.3/drivers/mtd/nand/de
10240
10241 #include "denali.h"
10242
10243 -diff -urNp linux-3.1.3/drivers/mtd/nftlcore.c linux-3.1.3/drivers/mtd/nftlcore.c
10244 ---- linux-3.1.3/drivers/mtd/nftlcore.c 2011-11-11 15:19:27.000000000 -0500
10245 -+++ linux-3.1.3/drivers/mtd/nftlcore.c 2011-11-16 18:40:10.000000000 -0500
10246 +diff -urNp linux-3.1.4/drivers/mtd/nftlcore.c linux-3.1.4/drivers/mtd/nftlcore.c
10247 +--- linux-3.1.4/drivers/mtd/nftlcore.c 2011-11-11 15:19:27.000000000 -0500
10248 ++++ linux-3.1.4/drivers/mtd/nftlcore.c 2011-11-16 18:40:10.000000000 -0500
10249 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
10250 int inplace = 1;
10251 size_t retlen;
10252 @@ -31015,9 +31763,9 @@ diff -urNp linux-3.1.3/drivers/mtd/nftlcore.c linux-3.1.3/drivers/mtd/nftlcore.c
10253 memset(BlockMap, 0xff, sizeof(BlockMap));
10254 memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
10255
10256 -diff -urNp linux-3.1.3/drivers/mtd/nftlmount.c linux-3.1.3/drivers/mtd/nftlmount.c
10257 ---- linux-3.1.3/drivers/mtd/nftlmount.c 2011-11-11 15:19:27.000000000 -0500
10258 -+++ linux-3.1.3/drivers/mtd/nftlmount.c 2011-11-16 18:40:10.000000000 -0500
10259 +diff -urNp linux-3.1.4/drivers/mtd/nftlmount.c linux-3.1.4/drivers/mtd/nftlmount.c
10260 +--- linux-3.1.4/drivers/mtd/nftlmount.c 2011-11-11 15:19:27.000000000 -0500
10261 ++++ linux-3.1.4/drivers/mtd/nftlmount.c 2011-11-16 18:40:10.000000000 -0500
10262 @@ -24,6 +24,7 @@
10263 #include <asm/errno.h>
10264 #include <linux/delay.h>
10265 @@ -31035,9 +31783,9 @@ diff -urNp linux-3.1.3/drivers/mtd/nftlmount.c linux-3.1.3/drivers/mtd/nftlmount
10266 /* Assume logical EraseSize == physical erasesize for starting the scan.
10267 We'll sort it out later if we find a MediaHeader which says otherwise */
10268 /* Actually, we won't. The new DiskOnChip driver has already scanned
10269 -diff -urNp linux-3.1.3/drivers/mtd/ubi/build.c linux-3.1.3/drivers/mtd/ubi/build.c
10270 ---- linux-3.1.3/drivers/mtd/ubi/build.c 2011-11-11 15:19:27.000000000 -0500
10271 -+++ linux-3.1.3/drivers/mtd/ubi/build.c 2011-11-16 18:39:07.000000000 -0500
10272 +diff -urNp linux-3.1.4/drivers/mtd/ubi/build.c linux-3.1.4/drivers/mtd/ubi/build.c
10273 +--- linux-3.1.4/drivers/mtd/ubi/build.c 2011-11-11 15:19:27.000000000 -0500
10274 ++++ linux-3.1.4/drivers/mtd/ubi/build.c 2011-11-16 18:39:07.000000000 -0500
10275 @@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
10276 static int __init bytes_str_to_int(const char *str)
10277 {
10278 @@ -31077,9 +31825,9 @@ diff -urNp linux-3.1.3/drivers/mtd/ubi/build.c linux-3.1.3/drivers/mtd/ubi/build
10279 }
10280
10281 /**
10282 -diff -urNp linux-3.1.3/drivers/net/atlx/atl2.c linux-3.1.3/drivers/net/atlx/atl2.c
10283 ---- linux-3.1.3/drivers/net/atlx/atl2.c 2011-11-11 15:19:27.000000000 -0500
10284 -+++ linux-3.1.3/drivers/net/atlx/atl2.c 2011-11-16 18:39:07.000000000 -0500
10285 +diff -urNp linux-3.1.4/drivers/net/atlx/atl2.c linux-3.1.4/drivers/net/atlx/atl2.c
10286 +--- linux-3.1.4/drivers/net/atlx/atl2.c 2011-11-11 15:19:27.000000000 -0500
10287 ++++ linux-3.1.4/drivers/net/atlx/atl2.c 2011-11-16 18:39:07.000000000 -0500
10288 @@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw
10289 */
10290
10291 @@ -31089,9 +31837,9 @@ diff -urNp linux-3.1.3/drivers/net/atlx/atl2.c linux-3.1.3/drivers/net/atlx/atl2
10292 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
10293 MODULE_PARM_DESC(X, desc);
10294 #else
10295 -diff -urNp linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c
10296 ---- linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c 2011-11-11 15:19:27.000000000 -0500
10297 -+++ linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c 2011-11-16 18:39:07.000000000 -0500
10298 +diff -urNp linux-3.1.4/drivers/net/bna/bfa_ioc_ct.c linux-3.1.4/drivers/net/bna/bfa_ioc_ct.c
10299 +--- linux-3.1.4/drivers/net/bna/bfa_ioc_ct.c 2011-11-11 15:19:27.000000000 -0500
10300 ++++ linux-3.1.4/drivers/net/bna/bfa_ioc_ct.c 2011-11-16 18:39:07.000000000 -0500
10301 @@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
10302 static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
10303 static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
10304 @@ -31136,9 +31884,9 @@ diff -urNp linux-3.1.3/drivers/net/bna/bfa_ioc_ct.c linux-3.1.3/drivers/net/bna/
10305 ioc->ioc_hwif = &nw_hwif_ct;
10306 }
10307
10308 -diff -urNp linux-3.1.3/drivers/net/bna/bnad.c linux-3.1.3/drivers/net/bna/bnad.c
10309 ---- linux-3.1.3/drivers/net/bna/bnad.c 2011-11-11 15:19:27.000000000 -0500
10310 -+++ linux-3.1.3/drivers/net/bna/bnad.c 2011-11-16 18:39:07.000000000 -0500
10311 +diff -urNp linux-3.1.4/drivers/net/bna/bnad.c linux-3.1.4/drivers/net/bna/bnad.c
10312 +--- linux-3.1.4/drivers/net/bna/bnad.c 2011-11-11 15:19:27.000000000 -0500
10313 ++++ linux-3.1.4/drivers/net/bna/bnad.c 2011-11-16 18:39:07.000000000 -0500
10314 @@ -1673,7 +1673,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
10315 struct bna_intr_info *intr_info =
10316 &res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
10317 @@ -31200,9 +31948,9 @@ diff -urNp linux-3.1.3/drivers/net/bna/bnad.c linux-3.1.3/drivers/net/bna/bnad.c
10318 /* Get BNA's resource requirement for one Rx object */
10319 spin_lock_irqsave(&bnad->bna_lock, flags);
10320 bna_rx_res_req(rx_config, res_info);
10321 -diff -urNp linux-3.1.3/drivers/net/bnx2.c linux-3.1.3/drivers/net/bnx2.c
10322 ---- linux-3.1.3/drivers/net/bnx2.c 2011-11-11 15:19:27.000000000 -0500
10323 -+++ linux-3.1.3/drivers/net/bnx2.c 2011-11-16 18:40:11.000000000 -0500
10324 +diff -urNp linux-3.1.4/drivers/net/bnx2.c linux-3.1.4/drivers/net/bnx2.c
10325 +--- linux-3.1.4/drivers/net/bnx2.c 2011-11-11 15:19:27.000000000 -0500
10326 ++++ linux-3.1.4/drivers/net/bnx2.c 2011-11-16 18:40:11.000000000 -0500
10327 @@ -5877,6 +5877,8 @@ bnx2_test_nvram(struct bnx2 *bp)
10328 int rc = 0;
10329 u32 magic, csum;
10330 @@ -31212,9 +31960,9 @@ diff -urNp linux-3.1.3/drivers/net/bnx2.c linux-3.1.3/drivers/net/bnx2.c
10331 if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
10332 goto test_nvram_done;
10333
10334 -diff -urNp linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c
10335 ---- linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-11 15:19:27.000000000 -0500
10336 -+++ linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-16 18:40:11.000000000 -0500
10337 +diff -urNp linux-3.1.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.1.4/drivers/net/bnx2x/bnx2x_ethtool.c
10338 +--- linux-3.1.4/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-11 15:19:27.000000000 -0500
10339 ++++ linux-3.1.4/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-16 18:40:11.000000000 -0500
10340 @@ -1943,6 +1943,8 @@ static int bnx2x_test_nvram(struct bnx2x
10341 int i, rc;
10342 u32 magic, crc;
10343 @@ -31224,9 +31972,9 @@ diff -urNp linux-3.1.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.1.3/drivers/net
10344 if (BP_NOMCP(bp))
10345 return 0;
10346
10347 -diff -urNp linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h
10348 ---- linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h 2011-11-11 15:19:27.000000000 -0500
10349 -+++ linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h 2011-11-16 18:39:07.000000000 -0500
10350 +diff -urNp linux-3.1.4/drivers/net/bnx2x/bnx2x_sp.h linux-3.1.4/drivers/net/bnx2x/bnx2x_sp.h
10351 +--- linux-3.1.4/drivers/net/bnx2x/bnx2x_sp.h 2011-11-11 15:19:27.000000000 -0500
10352 ++++ linux-3.1.4/drivers/net/bnx2x/bnx2x_sp.h 2011-11-16 18:39:07.000000000 -0500
10353 @@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
10354
10355 int (*wait_comp)(struct bnx2x *bp,
10356 @@ -31236,9 +31984,9 @@ diff -urNp linux-3.1.3/drivers/net/bnx2x/bnx2x_sp.h linux-3.1.3/drivers/net/bnx2
10357
10358 /********************** Set multicast group ***********************************/
10359
10360 -diff -urNp linux-3.1.3/drivers/net/cxgb3/l2t.h linux-3.1.3/drivers/net/cxgb3/l2t.h
10361 ---- linux-3.1.3/drivers/net/cxgb3/l2t.h 2011-11-11 15:19:27.000000000 -0500
10362 -+++ linux-3.1.3/drivers/net/cxgb3/l2t.h 2011-11-16 18:39:07.000000000 -0500
10363 +diff -urNp linux-3.1.4/drivers/net/cxgb3/l2t.h linux-3.1.4/drivers/net/cxgb3/l2t.h
10364 +--- linux-3.1.4/drivers/net/cxgb3/l2t.h 2011-11-11 15:19:27.000000000 -0500
10365 ++++ linux-3.1.4/drivers/net/cxgb3/l2t.h 2011-11-16 18:39:07.000000000 -0500
10366 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)
10367 */
10368 struct l2t_skb_cb {
10369 @@ -31248,9 +31996,9 @@ diff -urNp linux-3.1.3/drivers/net/cxgb3/l2t.h linux-3.1.3/drivers/net/cxgb3/l2t
10370
10371 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
10372
10373 -diff -urNp linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c
10374 ---- linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c 2011-11-11 15:19:27.000000000 -0500
10375 -+++ linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c 2011-11-16 18:40:22.000000000 -0500
10376 +diff -urNp linux-3.1.4/drivers/net/cxgb4/cxgb4_main.c linux-3.1.4/drivers/net/cxgb4/cxgb4_main.c
10377 +--- linux-3.1.4/drivers/net/cxgb4/cxgb4_main.c 2011-11-11 15:19:27.000000000 -0500
10378 ++++ linux-3.1.4/drivers/net/cxgb4/cxgb4_main.c 2011-11-16 18:40:22.000000000 -0500
10379 @@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct
10380 unsigned int nchan = adap->params.nports;
10381 struct msix_entry entries[MAX_INGQ + 1];
10382 @@ -31260,9 +32008,9 @@ diff -urNp linux-3.1.3/drivers/net/cxgb4/cxgb4_main.c linux-3.1.3/drivers/net/cx
10383 for (i = 0; i < ARRAY_SIZE(entries); ++i)
10384 entries[i].entry = i;
10385
10386 -diff -urNp linux-3.1.3/drivers/net/cxgb4/t4_hw.c linux-3.1.3/drivers/net/cxgb4/t4_hw.c
10387 ---- linux-3.1.3/drivers/net/cxgb4/t4_hw.c 2011-11-11 15:19:27.000000000 -0500
10388 -+++ linux-3.1.3/drivers/net/cxgb4/t4_hw.c 2011-11-16 18:40:22.000000000 -0500
10389 +diff -urNp linux-3.1.4/drivers/net/cxgb4/t4_hw.c linux-3.1.4/drivers/net/cxgb4/t4_hw.c
10390 +--- linux-3.1.4/drivers/net/cxgb4/t4_hw.c 2011-11-11 15:19:27.000000000 -0500
10391 ++++ linux-3.1.4/drivers/net/cxgb4/t4_hw.c 2011-11-16 18:40:22.000000000 -0500
10392 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
10393 u8 vpd[VPD_LEN], csum;
10394 unsigned int vpdr_len, kw_offset, id_len;
10395 @@ -31272,9 +32020,9 @@ diff -urNp linux-3.1.3/drivers/net/cxgb4/t4_hw.c linux-3.1.3/drivers/net/cxgb4/t
10396 ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
10397 if (ret < 0)
10398 return ret;
10399 -diff -urNp linux-3.1.3/drivers/net/e1000e/82571.c linux-3.1.3/drivers/net/e1000e/82571.c
10400 ---- linux-3.1.3/drivers/net/e1000e/82571.c 2011-11-11 15:19:27.000000000 -0500
10401 -+++ linux-3.1.3/drivers/net/e1000e/82571.c 2011-11-16 18:39:07.000000000 -0500
10402 +diff -urNp linux-3.1.4/drivers/net/e1000e/82571.c linux-3.1.4/drivers/net/e1000e/82571.c
10403 +--- linux-3.1.4/drivers/net/e1000e/82571.c 2011-11-11 15:19:27.000000000 -0500
10404 ++++ linux-3.1.4/drivers/net/e1000e/82571.c 2011-11-16 18:39:07.000000000 -0500
10405 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
10406 {
10407 struct e1000_hw *hw = &adapter->hw;
10408 @@ -31284,9 +32032,9 @@ diff -urNp linux-3.1.3/drivers/net/e1000e/82571.c linux-3.1.3/drivers/net/e1000e
10409 u32 swsm = 0;
10410 u32 swsm2 = 0;
10411 bool force_clear_smbi = false;
10412 -diff -urNp linux-3.1.3/drivers/net/e1000e/es2lan.c linux-3.1.3/drivers/net/e1000e/es2lan.c
10413 ---- linux-3.1.3/drivers/net/e1000e/es2lan.c 2011-11-11 15:19:27.000000000 -0500
10414 -+++ linux-3.1.3/drivers/net/e1000e/es2lan.c 2011-11-16 18:39:07.000000000 -0500
10415 +diff -urNp linux-3.1.4/drivers/net/e1000e/es2lan.c linux-3.1.4/drivers/net/e1000e/es2lan.c
10416 +--- linux-3.1.4/drivers/net/e1000e/es2lan.c 2011-11-11 15:19:27.000000000 -0500
10417 ++++ linux-3.1.4/drivers/net/e1000e/es2lan.c 2011-11-16 18:39:07.000000000 -0500
10418 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
10419 {
10420 struct e1000_hw *hw = &adapter->hw;
10421 @@ -31296,9 +32044,9 @@ diff -urNp linux-3.1.3/drivers/net/e1000e/es2lan.c linux-3.1.3/drivers/net/e1000
10422
10423 /* Set media type */
10424 switch (adapter->pdev->device) {
10425 -diff -urNp linux-3.1.3/drivers/net/e1000e/hw.h linux-3.1.3/drivers/net/e1000e/hw.h
10426 ---- linux-3.1.3/drivers/net/e1000e/hw.h 2011-11-11 15:19:27.000000000 -0500
10427 -+++ linux-3.1.3/drivers/net/e1000e/hw.h 2011-11-16 18:39:07.000000000 -0500
10428 +diff -urNp linux-3.1.4/drivers/net/e1000e/hw.h linux-3.1.4/drivers/net/e1000e/hw.h
10429 +--- linux-3.1.4/drivers/net/e1000e/hw.h 2011-11-11 15:19:27.000000000 -0500
10430 ++++ linux-3.1.4/drivers/net/e1000e/hw.h 2011-11-16 18:39:07.000000000 -0500
10431 @@ -778,6 +778,7 @@ struct e1000_mac_operations {
10432 void (*write_vfta)(struct e1000_hw *, u32, u32);
10433 s32 (*read_mac_addr)(struct e1000_hw *);
10434 @@ -31345,9 +32093,9 @@ diff -urNp linux-3.1.3/drivers/net/e1000e/hw.h linux-3.1.3/drivers/net/e1000e/hw
10435
10436 enum e1000_nvm_type type;
10437 enum e1000_nvm_override override;
10438 -diff -urNp linux-3.1.3/drivers/net/fealnx.c linux-3.1.3/drivers/net/fealnx.c
10439 ---- linux-3.1.3/drivers/net/fealnx.c 2011-11-11 15:19:27.000000000 -0500
10440 -+++ linux-3.1.3/drivers/net/fealnx.c 2011-11-16 18:39:07.000000000 -0500
10441 +diff -urNp linux-3.1.4/drivers/net/fealnx.c linux-3.1.4/drivers/net/fealnx.c
10442 +--- linux-3.1.4/drivers/net/fealnx.c 2011-11-11 15:19:27.000000000 -0500
10443 ++++ linux-3.1.4/drivers/net/fealnx.c 2011-11-16 18:39:07.000000000 -0500
10444 @@ -150,7 +150,7 @@ struct chip_info {
10445 int flags;
10446 };
10447 @@ -31357,9 +32105,9 @@ diff -urNp linux-3.1.3/drivers/net/fealnx.c linux-3.1.3/drivers/net/fealnx.c
10448 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
10449 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
10450 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
10451 -diff -urNp linux-3.1.3/drivers/net/hamradio/6pack.c linux-3.1.3/drivers/net/hamradio/6pack.c
10452 ---- linux-3.1.3/drivers/net/hamradio/6pack.c 2011-11-11 15:19:27.000000000 -0500
10453 -+++ linux-3.1.3/drivers/net/hamradio/6pack.c 2011-11-16 18:40:22.000000000 -0500
10454 +diff -urNp linux-3.1.4/drivers/net/hamradio/6pack.c linux-3.1.4/drivers/net/hamradio/6pack.c
10455 +--- linux-3.1.4/drivers/net/hamradio/6pack.c 2011-11-11 15:19:27.000000000 -0500
10456 ++++ linux-3.1.4/drivers/net/hamradio/6pack.c 2011-11-16 18:40:22.000000000 -0500
10457 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
10458 unsigned char buf[512];
10459 int count1;
10460 @@ -31369,9 +32117,9 @@ diff -urNp linux-3.1.3/drivers/net/hamradio/6pack.c linux-3.1.3/drivers/net/hamr
10461 if (!count)
10462 return;
10463
10464 -diff -urNp linux-3.1.3/drivers/net/igb/e1000_hw.h linux-3.1.3/drivers/net/igb/e1000_hw.h
10465 ---- linux-3.1.3/drivers/net/igb/e1000_hw.h 2011-11-11 15:19:27.000000000 -0500
10466 -+++ linux-3.1.3/drivers/net/igb/e1000_hw.h 2011-11-16 18:39:07.000000000 -0500
10467 +diff -urNp linux-3.1.4/drivers/net/igb/e1000_hw.h linux-3.1.4/drivers/net/igb/e1000_hw.h
10468 +--- linux-3.1.4/drivers/net/igb/e1000_hw.h 2011-11-11 15:19:27.000000000 -0500
10469 ++++ linux-3.1.4/drivers/net/igb/e1000_hw.h 2011-11-16 18:39:07.000000000 -0500
10470 @@ -314,6 +314,7 @@ struct e1000_mac_operations {
10471 s32 (*read_mac_addr)(struct e1000_hw *);
10472 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
10473 @@ -31440,9 +32188,9 @@ diff -urNp linux-3.1.3/drivers/net/igb/e1000_hw.h linux-3.1.3/drivers/net/igb/e1
10474 struct e1000_mbx_stats stats;
10475 u32 timeout;
10476 u32 usec_delay;
10477 -diff -urNp linux-3.1.3/drivers/net/igbvf/vf.h linux-3.1.3/drivers/net/igbvf/vf.h
10478 ---- linux-3.1.3/drivers/net/igbvf/vf.h 2011-11-11 15:19:27.000000000 -0500
10479 -+++ linux-3.1.3/drivers/net/igbvf/vf.h 2011-11-16 18:39:07.000000000 -0500
10480 +diff -urNp linux-3.1.4/drivers/net/igbvf/vf.h linux-3.1.4/drivers/net/igbvf/vf.h
10481 +--- linux-3.1.4/drivers/net/igbvf/vf.h 2011-11-11 15:19:27.000000000 -0500
10482 ++++ linux-3.1.4/drivers/net/igbvf/vf.h 2011-11-16 18:39:07.000000000 -0500
10483 @@ -189,9 +189,10 @@ struct e1000_mac_operations {
10484 s32 (*read_mac_addr)(struct e1000_hw *);
10485 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
10486 @@ -31472,9 +32220,9 @@ diff -urNp linux-3.1.3/drivers/net/igbvf/vf.h linux-3.1.3/drivers/net/igbvf/vf.h
10487 struct e1000_mbx_stats stats;
10488 u32 timeout;
10489 u32 usec_delay;
10490 -diff -urNp linux-3.1.3/drivers/net/ixgb/ixgb_main.c linux-3.1.3/drivers/net/ixgb/ixgb_main.c
10491 ---- linux-3.1.3/drivers/net/ixgb/ixgb_main.c 2011-11-11 15:19:27.000000000 -0500
10492 -+++ linux-3.1.3/drivers/net/ixgb/ixgb_main.c 2011-11-16 18:40:22.000000000 -0500
10493 +diff -urNp linux-3.1.4/drivers/net/ixgb/ixgb_main.c linux-3.1.4/drivers/net/ixgb/ixgb_main.c
10494 +--- linux-3.1.4/drivers/net/ixgb/ixgb_main.c 2011-11-11 15:19:27.000000000 -0500
10495 ++++ linux-3.1.4/drivers/net/ixgb/ixgb_main.c 2011-11-16 18:40:22.000000000 -0500
10496 @@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
10497 u32 rctl;
10498 int i;
10499 @@ -31484,9 +32232,9 @@ diff -urNp linux-3.1.3/drivers/net/ixgb/ixgb_main.c linux-3.1.3/drivers/net/ixgb
10500 /* Check for Promiscuous and All Multicast modes */
10501
10502 rctl = IXGB_READ_REG(hw, RCTL);
10503 -diff -urNp linux-3.1.3/drivers/net/ixgb/ixgb_param.c linux-3.1.3/drivers/net/ixgb/ixgb_param.c
10504 ---- linux-3.1.3/drivers/net/ixgb/ixgb_param.c 2011-11-11 15:19:27.000000000 -0500
10505 -+++ linux-3.1.3/drivers/net/ixgb/ixgb_param.c 2011-11-16 18:40:22.000000000 -0500
10506 +diff -urNp linux-3.1.4/drivers/net/ixgb/ixgb_param.c linux-3.1.4/drivers/net/ixgb/ixgb_param.c
10507 +--- linux-3.1.4/drivers/net/ixgb/ixgb_param.c 2011-11-11 15:19:27.000000000 -0500
10508 ++++ linux-3.1.4/drivers/net/ixgb/ixgb_param.c 2011-11-16 18:40:22.000000000 -0500
10509 @@ -261,6 +261,9 @@ void __devinit
10510 ixgb_check_options(struct ixgb_adapter *adapter)
10511 {
10512 @@ -31497,9 +32245,9 @@ diff -urNp linux-3.1.3/drivers/net/ixgb/ixgb_param.c linux-3.1.3/drivers/net/ixg
10513 if (bd >= IXGB_MAX_NIC) {
10514 pr_notice("Warning: no configuration for board #%i\n", bd);
10515 pr_notice("Using defaults for all values\n");
10516 -diff -urNp linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h
10517 ---- linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h 2011-11-11 15:19:27.000000000 -0500
10518 -+++ linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h 2011-11-16 18:39:07.000000000 -0500
10519 +diff -urNp linux-3.1.4/drivers/net/ixgbe/ixgbe_type.h linux-3.1.4/drivers/net/ixgbe/ixgbe_type.h
10520 +--- linux-3.1.4/drivers/net/ixgbe/ixgbe_type.h 2011-11-11 15:19:27.000000000 -0500
10521 ++++ linux-3.1.4/drivers/net/ixgbe/ixgbe_type.h 2011-11-16 18:39:07.000000000 -0500
10522 @@ -2642,6 +2642,7 @@ struct ixgbe_eeprom_operations {
10523 s32 (*update_checksum)(struct ixgbe_hw *);
10524 u16 (*calc_checksum)(struct ixgbe_hw *);
10525 @@ -31563,9 +32311,9 @@ diff -urNp linux-3.1.3/drivers/net/ixgbe/ixgbe_type.h linux-3.1.3/drivers/net/ix
10526 struct ixgbe_mbx_stats stats;
10527 u32 timeout;
10528 u32 usec_delay;
10529 -diff -urNp linux-3.1.3/drivers/net/ixgbevf/vf.h linux-3.1.3/drivers/net/ixgbevf/vf.h
10530 ---- linux-3.1.3/drivers/net/ixgbevf/vf.h 2011-11-11 15:19:27.000000000 -0500
10531 -+++ linux-3.1.3/drivers/net/ixgbevf/vf.h 2011-11-16 18:39:07.000000000 -0500
10532 +diff -urNp linux-3.1.4/drivers/net/ixgbevf/vf.h linux-3.1.4/drivers/net/ixgbevf/vf.h
10533 +--- linux-3.1.4/drivers/net/ixgbevf/vf.h 2011-11-11 15:19:27.000000000 -0500
10534 ++++ linux-3.1.4/drivers/net/ixgbevf/vf.h 2011-11-16 18:39:07.000000000 -0500
10535 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
10536 s32 (*clear_vfta)(struct ixgbe_hw *);
10537 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
10538 @@ -31600,9 +32348,9 @@ diff -urNp linux-3.1.3/drivers/net/ixgbevf/vf.h linux-3.1.3/drivers/net/ixgbevf/
10539 struct ixgbe_mbx_stats stats;
10540 u32 timeout;
10541 u32 udelay;
10542 -diff -urNp linux-3.1.3/drivers/net/ksz884x.c linux-3.1.3/drivers/net/ksz884x.c
10543 ---- linux-3.1.3/drivers/net/ksz884x.c 2011-11-11 15:19:27.000000000 -0500
10544 -+++ linux-3.1.3/drivers/net/ksz884x.c 2011-11-16 18:40:22.000000000 -0500
10545 +diff -urNp linux-3.1.4/drivers/net/ksz884x.c linux-3.1.4/drivers/net/ksz884x.c
10546 +--- linux-3.1.4/drivers/net/ksz884x.c 2011-11-11 15:19:27.000000000 -0500
10547 ++++ linux-3.1.4/drivers/net/ksz884x.c 2011-11-16 18:40:22.000000000 -0500
10548 @@ -6533,6 +6533,8 @@ static void netdev_get_ethtool_stats(str
10549 int rc;
10550 u64 counter[TOTAL_PORT_COUNTER_NUM];
10551 @@ -31612,9 +32360,9 @@ diff -urNp linux-3.1.3/drivers/net/ksz884x.c linux-3.1.3/drivers/net/ksz884x.c
10552 mutex_lock(&hw_priv->lock);
10553 n = SWITCH_PORT_NUM;
10554 for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
10555 -diff -urNp linux-3.1.3/drivers/net/mlx4/main.c linux-3.1.3/drivers/net/mlx4/main.c
10556 ---- linux-3.1.3/drivers/net/mlx4/main.c 2011-11-11 15:19:27.000000000 -0500
10557 -+++ linux-3.1.3/drivers/net/mlx4/main.c 2011-11-16 18:40:22.000000000 -0500
10558 +diff -urNp linux-3.1.4/drivers/net/mlx4/main.c linux-3.1.4/drivers/net/mlx4/main.c
10559 +--- linux-3.1.4/drivers/net/mlx4/main.c 2011-11-11 15:19:27.000000000 -0500
10560 ++++ linux-3.1.4/drivers/net/mlx4/main.c 2011-11-16 18:40:22.000000000 -0500
10561 @@ -40,6 +40,7 @@
10562 #include <linux/dma-mapping.h>
10563 #include <linux/slab.h>
10564 @@ -31632,9 +32380,9 @@ diff -urNp linux-3.1.3/drivers/net/mlx4/main.c linux-3.1.3/drivers/net/mlx4/main
10565 err = mlx4_QUERY_FW(dev);
10566 if (err) {
10567 if (err == -EACCES)
10568 -diff -urNp linux-3.1.3/drivers/net/niu.c linux-3.1.3/drivers/net/niu.c
10569 ---- linux-3.1.3/drivers/net/niu.c 2011-11-11 15:19:27.000000000 -0500
10570 -+++ linux-3.1.3/drivers/net/niu.c 2011-11-16 18:40:22.000000000 -0500
10571 +diff -urNp linux-3.1.4/drivers/net/niu.c linux-3.1.4/drivers/net/niu.c
10572 +--- linux-3.1.4/drivers/net/niu.c 2011-11-11 15:19:27.000000000 -0500
10573 ++++ linux-3.1.4/drivers/net/niu.c 2011-11-16 18:40:22.000000000 -0500
10574 @@ -9061,6 +9061,8 @@ static void __devinit niu_try_msix(struc
10575 int i, num_irqs, err;
10576 u8 first_ldg;
10577 @@ -31644,9 +32392,9 @@ diff -urNp linux-3.1.3/drivers/net/niu.c linux-3.1.3/drivers/net/niu.c
10578 first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
10579 for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
10580 ldg_num_map[i] = first_ldg + i;
10581 -diff -urNp linux-3.1.3/drivers/net/pcnet32.c linux-3.1.3/drivers/net/pcnet32.c
10582 ---- linux-3.1.3/drivers/net/pcnet32.c 2011-11-11 15:19:27.000000000 -0500
10583 -+++ linux-3.1.3/drivers/net/pcnet32.c 2011-11-16 18:39:07.000000000 -0500
10584 +diff -urNp linux-3.1.4/drivers/net/pcnet32.c linux-3.1.4/drivers/net/pcnet32.c
10585 +--- linux-3.1.4/drivers/net/pcnet32.c 2011-11-11 15:19:27.000000000 -0500
10586 ++++ linux-3.1.4/drivers/net/pcnet32.c 2011-11-16 18:39:07.000000000 -0500
10587 @@ -270,7 +270,7 @@ struct pcnet32_private {
10588 struct sk_buff **rx_skbuff;
10589 dma_addr_t *tx_dma_addr;
10590 @@ -32260,9 +33008,9 @@ diff -urNp linux-3.1.3/drivers/net/pcnet32.c linux-3.1.3/drivers/net/pcnet32.c
10591 }
10592 } else {
10593 netif_info(lp, link, dev, "link up\n");
10594 -diff -urNp linux-3.1.3/drivers/net/ppp_generic.c linux-3.1.3/drivers/net/ppp_generic.c
10595 ---- linux-3.1.3/drivers/net/ppp_generic.c 2011-11-11 15:19:27.000000000 -0500
10596 -+++ linux-3.1.3/drivers/net/ppp_generic.c 2011-11-16 18:39:07.000000000 -0500
10597 +diff -urNp linux-3.1.4/drivers/net/ppp_generic.c linux-3.1.4/drivers/net/ppp_generic.c
10598 +--- linux-3.1.4/drivers/net/ppp_generic.c 2011-11-11 15:19:27.000000000 -0500
10599 ++++ linux-3.1.4/drivers/net/ppp_generic.c 2011-11-16 18:39:07.000000000 -0500
10600 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
10601 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
10602 struct ppp_stats stats;
10603 @@ -32281,9 +33029,9 @@ diff -urNp linux-3.1.3/drivers/net/ppp_generic.c linux-3.1.3/drivers/net/ppp_gen
10604 break;
10605 err = 0;
10606 break;
10607 -diff -urNp linux-3.1.3/drivers/net/r8169.c linux-3.1.3/drivers/net/r8169.c
10608 ---- linux-3.1.3/drivers/net/r8169.c 2011-11-11 15:19:27.000000000 -0500
10609 -+++ linux-3.1.3/drivers/net/r8169.c 2011-11-16 18:39:07.000000000 -0500
10610 +diff -urNp linux-3.1.4/drivers/net/r8169.c linux-3.1.4/drivers/net/r8169.c
10611 +--- linux-3.1.4/drivers/net/r8169.c 2011-11-11 15:19:27.000000000 -0500
10612 ++++ linux-3.1.4/drivers/net/r8169.c 2011-11-16 18:39:07.000000000 -0500
10613 @@ -663,12 +663,12 @@ struct rtl8169_private {
10614 struct mdio_ops {
10615 void (*write)(void __iomem *, int, int);
10616 @@ -32299,9 +33047,9 @@ diff -urNp linux-3.1.3/drivers/net/r8169.c linux-3.1.3/drivers/net/r8169.c
10617
10618 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
10619 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
10620 -diff -urNp linux-3.1.3/drivers/net/sis190.c linux-3.1.3/drivers/net/sis190.c
10621 ---- linux-3.1.3/drivers/net/sis190.c 2011-11-11 15:19:27.000000000 -0500
10622 -+++ linux-3.1.3/drivers/net/sis190.c 2011-11-16 18:39:07.000000000 -0500
10623 +diff -urNp linux-3.1.4/drivers/net/sis190.c linux-3.1.4/drivers/net/sis190.c
10624 +--- linux-3.1.4/drivers/net/sis190.c 2011-11-11 15:19:27.000000000 -0500
10625 ++++ linux-3.1.4/drivers/net/sis190.c 2011-11-16 18:39:07.000000000 -0500
10626 @@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr
10627 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
10628 struct net_device *dev)
10629 @@ -32311,9 +33059,9 @@ diff -urNp linux-3.1.3/drivers/net/sis190.c linux-3.1.3/drivers/net/sis190.c
10630 struct sis190_private *tp = netdev_priv(dev);
10631 struct pci_dev *isa_bridge;
10632 u8 reg, tmp8;
10633 -diff -urNp linux-3.1.3/drivers/net/sundance.c linux-3.1.3/drivers/net/sundance.c
10634 ---- linux-3.1.3/drivers/net/sundance.c 2011-11-11 15:19:27.000000000 -0500
10635 -+++ linux-3.1.3/drivers/net/sundance.c 2011-11-16 18:39:07.000000000 -0500
10636 +diff -urNp linux-3.1.4/drivers/net/sundance.c linux-3.1.4/drivers/net/sundance.c
10637 +--- linux-3.1.4/drivers/net/sundance.c 2011-11-11 15:19:27.000000000 -0500
10638 ++++ linux-3.1.4/drivers/net/sundance.c 2011-11-16 18:39:07.000000000 -0500
10639 @@ -218,7 +218,7 @@ enum {
10640 struct pci_id_info {
10641 const char *name;
10642 @@ -32323,9 +33071,9 @@ diff -urNp linux-3.1.3/drivers/net/sundance.c linux-3.1.3/drivers/net/sundance.c
10643 {"D-Link DFE-550TX FAST Ethernet Adapter"},
10644 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
10645 {"D-Link DFE-580TX 4 port Server Adapter"},
10646 -diff -urNp linux-3.1.3/drivers/net/tg3.h linux-3.1.3/drivers/net/tg3.h
10647 ---- linux-3.1.3/drivers/net/tg3.h 2011-11-11 15:19:27.000000000 -0500
10648 -+++ linux-3.1.3/drivers/net/tg3.h 2011-11-16 18:39:07.000000000 -0500
10649 +diff -urNp linux-3.1.4/drivers/net/tg3.h linux-3.1.4/drivers/net/tg3.h
10650 +--- linux-3.1.4/drivers/net/tg3.h 2011-11-11 15:19:27.000000000 -0500
10651 ++++ linux-3.1.4/drivers/net/tg3.h 2011-11-16 18:39:07.000000000 -0500
10652 @@ -134,6 +134,7 @@
10653 #define CHIPREV_ID_5750_A0 0x4000
10654 #define CHIPREV_ID_5750_A1 0x4001
10655 @@ -32334,9 +33082,9 @@ diff -urNp linux-3.1.3/drivers/net/tg3.h linux-3.1.3/drivers/net/tg3.h
10656 #define CHIPREV_ID_5750_C2 0x4202
10657 #define CHIPREV_ID_5752_A0_HW 0x5000
10658 #define CHIPREV_ID_5752_A0 0x6000
10659 -diff -urNp linux-3.1.3/drivers/net/tokenring/abyss.c linux-3.1.3/drivers/net/tokenring/abyss.c
10660 ---- linux-3.1.3/drivers/net/tokenring/abyss.c 2011-11-11 15:19:27.000000000 -0500
10661 -+++ linux-3.1.3/drivers/net/tokenring/abyss.c 2011-11-16 18:39:07.000000000 -0500
10662 +diff -urNp linux-3.1.4/drivers/net/tokenring/abyss.c linux-3.1.4/drivers/net/tokenring/abyss.c
10663 +--- linux-3.1.4/drivers/net/tokenring/abyss.c 2011-11-11 15:19:27.000000000 -0500
10664 ++++ linux-3.1.4/drivers/net/tokenring/abyss.c 2011-11-16 18:39:07.000000000 -0500
10665 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver =
10666
10667 static int __init abyss_init (void)
10668 @@ -32353,9 +33101,9 @@ diff -urNp linux-3.1.3/drivers/net/tokenring/abyss.c linux-3.1.3/drivers/net/tok
10669
10670 return pci_register_driver(&abyss_driver);
10671 }
10672 -diff -urNp linux-3.1.3/drivers/net/tokenring/madgemc.c linux-3.1.3/drivers/net/tokenring/madgemc.c
10673 ---- linux-3.1.3/drivers/net/tokenring/madgemc.c 2011-11-11 15:19:27.000000000 -0500
10674 -+++ linux-3.1.3/drivers/net/tokenring/madgemc.c 2011-11-16 18:39:07.000000000 -0500
10675 +diff -urNp linux-3.1.4/drivers/net/tokenring/madgemc.c linux-3.1.4/drivers/net/tokenring/madgemc.c
10676 +--- linux-3.1.4/drivers/net/tokenring/madgemc.c 2011-11-11 15:19:27.000000000 -0500
10677 ++++ linux-3.1.4/drivers/net/tokenring/madgemc.c 2011-11-16 18:39:07.000000000 -0500
10678 @@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver
10679
10680 static int __init madgemc_init (void)
10681 @@ -32371,9 +33119,9 @@ diff -urNp linux-3.1.3/drivers/net/tokenring/madgemc.c linux-3.1.3/drivers/net/t
10682
10683 return mca_register_driver (&madgemc_driver);
10684 }
10685 -diff -urNp linux-3.1.3/drivers/net/tokenring/proteon.c linux-3.1.3/drivers/net/tokenring/proteon.c
10686 ---- linux-3.1.3/drivers/net/tokenring/proteon.c 2011-11-11 15:19:27.000000000 -0500
10687 -+++ linux-3.1.3/drivers/net/tokenring/proteon.c 2011-11-16 18:39:07.000000000 -0500
10688 +diff -urNp linux-3.1.4/drivers/net/tokenring/proteon.c linux-3.1.4/drivers/net/tokenring/proteon.c
10689 +--- linux-3.1.4/drivers/net/tokenring/proteon.c 2011-11-11 15:19:27.000000000 -0500
10690 ++++ linux-3.1.4/drivers/net/tokenring/proteon.c 2011-11-16 18:39:07.000000000 -0500
10691 @@ -353,9 +353,11 @@ static int __init proteon_init(void)
10692 struct platform_device *pdev;
10693 int i, num = 0, err = 0;
10694 @@ -32389,9 +33137,9 @@ diff -urNp linux-3.1.3/drivers/net/tokenring/proteon.c linux-3.1.3/drivers/net/t
10695
10696 err = platform_driver_register(&proteon_driver);
10697 if (err)
10698 -diff -urNp linux-3.1.3/drivers/net/tokenring/skisa.c linux-3.1.3/drivers/net/tokenring/skisa.c
10699 ---- linux-3.1.3/drivers/net/tokenring/skisa.c 2011-11-11 15:19:27.000000000 -0500
10700 -+++ linux-3.1.3/drivers/net/tokenring/skisa.c 2011-11-16 18:39:07.000000000 -0500
10701 +diff -urNp linux-3.1.4/drivers/net/tokenring/skisa.c linux-3.1.4/drivers/net/tokenring/skisa.c
10702 +--- linux-3.1.4/drivers/net/tokenring/skisa.c 2011-11-11 15:19:27.000000000 -0500
10703 ++++ linux-3.1.4/drivers/net/tokenring/skisa.c 2011-11-16 18:39:07.000000000 -0500
10704 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
10705 struct platform_device *pdev;
10706 int i, num = 0, err = 0;
10707 @@ -32407,9 +33155,9 @@ diff -urNp linux-3.1.3/drivers/net/tokenring/skisa.c linux-3.1.3/drivers/net/tok
10708
10709 err = platform_driver_register(&sk_isa_driver);
10710 if (err)
10711 -diff -urNp linux-3.1.3/drivers/net/tulip/de2104x.c linux-3.1.3/drivers/net/tulip/de2104x.c
10712 ---- linux-3.1.3/drivers/net/tulip/de2104x.c 2011-11-11 15:19:27.000000000 -0500
10713 -+++ linux-3.1.3/drivers/net/tulip/de2104x.c 2011-11-16 18:40:22.000000000 -0500
10714 +diff -urNp linux-3.1.4/drivers/net/tulip/de2104x.c linux-3.1.4/drivers/net/tulip/de2104x.c
10715 +--- linux-3.1.4/drivers/net/tulip/de2104x.c 2011-11-11 15:19:27.000000000 -0500
10716 ++++ linux-3.1.4/drivers/net/tulip/de2104x.c 2011-11-16 18:40:22.000000000 -0500
10717 @@ -1795,6 +1795,8 @@ static void __devinit de21041_get_srom_i
10718 struct de_srom_info_leaf *il;
10719 void *bufp;
10720 @@ -32419,9 +33167,9 @@ diff -urNp linux-3.1.3/drivers/net/tulip/de2104x.c linux-3.1.3/drivers/net/tulip
10721 /* download entire eeprom */
10722 for (i = 0; i < DE_EEPROM_WORDS; i++)
10723 ((__le16 *)ee_data)[i] =
10724 -diff -urNp linux-3.1.3/drivers/net/tulip/de4x5.c linux-3.1.3/drivers/net/tulip/de4x5.c
10725 ---- linux-3.1.3/drivers/net/tulip/de4x5.c 2011-11-11 15:19:27.000000000 -0500
10726 -+++ linux-3.1.3/drivers/net/tulip/de4x5.c 2011-11-16 18:39:07.000000000 -0500
10727 +diff -urNp linux-3.1.4/drivers/net/tulip/de4x5.c linux-3.1.4/drivers/net/tulip/de4x5.c
10728 +--- linux-3.1.4/drivers/net/tulip/de4x5.c 2011-11-11 15:19:27.000000000 -0500
10729 ++++ linux-3.1.4/drivers/net/tulip/de4x5.c 2011-11-16 18:39:07.000000000 -0500
10730 @@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, stru
10731 for (i=0; i<ETH_ALEN; i++) {
10732 tmp.addr[i] = dev->dev_addr[i];
10733 @@ -32440,9 +33188,9 @@ diff -urNp linux-3.1.3/drivers/net/tulip/de4x5.c linux-3.1.3/drivers/net/tulip/d
10734 return -EFAULT;
10735 break;
10736 }
10737 -diff -urNp linux-3.1.3/drivers/net/tulip/eeprom.c linux-3.1.3/drivers/net/tulip/eeprom.c
10738 ---- linux-3.1.3/drivers/net/tulip/eeprom.c 2011-11-11 15:19:27.000000000 -0500
10739 -+++ linux-3.1.3/drivers/net/tulip/eeprom.c 2011-11-16 18:39:07.000000000 -0500
10740 +diff -urNp linux-3.1.4/drivers/net/tulip/eeprom.c linux-3.1.4/drivers/net/tulip/eeprom.c
10741 +--- linux-3.1.4/drivers/net/tulip/eeprom.c 2011-11-11 15:19:27.000000000 -0500
10742 ++++ linux-3.1.4/drivers/net/tulip/eeprom.c 2011-11-16 18:39:07.000000000 -0500
10743 @@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups
10744 {NULL}};
10745
10746 @@ -32452,9 +33200,9 @@ diff -urNp linux-3.1.3/drivers/net/tulip/eeprom.c linux-3.1.3/drivers/net/tulip/
10747 "21140 non-MII",
10748 "21140 MII PHY",
10749 "21142 Serial PHY",
10750 -diff -urNp linux-3.1.3/drivers/net/tulip/winbond-840.c linux-3.1.3/drivers/net/tulip/winbond-840.c
10751 ---- linux-3.1.3/drivers/net/tulip/winbond-840.c 2011-11-11 15:19:27.000000000 -0500
10752 -+++ linux-3.1.3/drivers/net/tulip/winbond-840.c 2011-11-16 18:39:07.000000000 -0500
10753 +diff -urNp linux-3.1.4/drivers/net/tulip/winbond-840.c linux-3.1.4/drivers/net/tulip/winbond-840.c
10754 +--- linux-3.1.4/drivers/net/tulip/winbond-840.c 2011-11-11 15:19:27.000000000 -0500
10755 ++++ linux-3.1.4/drivers/net/tulip/winbond-840.c 2011-11-16 18:39:07.000000000 -0500
10756 @@ -236,7 +236,7 @@ struct pci_id_info {
10757 int drv_flags; /* Driver use, intended as capability flags. */
10758 };
10759 @@ -32464,9 +33212,9 @@ diff -urNp linux-3.1.3/drivers/net/tulip/winbond-840.c linux-3.1.3/drivers/net/t
10760 { /* Sometime a Level-One switch card. */
10761 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
10762 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
10763 -diff -urNp linux-3.1.3/drivers/net/usb/hso.c linux-3.1.3/drivers/net/usb/hso.c
10764 ---- linux-3.1.3/drivers/net/usb/hso.c 2011-11-11 15:19:27.000000000 -0500
10765 -+++ linux-3.1.3/drivers/net/usb/hso.c 2011-11-16 18:39:07.000000000 -0500
10766 +diff -urNp linux-3.1.4/drivers/net/usb/hso.c linux-3.1.4/drivers/net/usb/hso.c
10767 +--- linux-3.1.4/drivers/net/usb/hso.c 2011-11-11 15:19:27.000000000 -0500
10768 ++++ linux-3.1.4/drivers/net/usb/hso.c 2011-11-16 18:39:07.000000000 -0500
10769 @@ -71,7 +71,7 @@
10770 #include <asm/byteorder.h>
10771 #include <linux/serial_core.h>
10772 @@ -32563,9 +33311,9 @@ diff -urNp linux-3.1.3/drivers/net/usb/hso.c linux-3.1.3/drivers/net/usb/hso.c
10773 result =
10774 hso_start_serial_device(serial_table[i], GFP_NOIO);
10775 hso_kick_transmit(dev2ser(serial_table[i]));
10776 -diff -urNp linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c
10777 ---- linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-11 15:19:27.000000000 -0500
10778 -+++ linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-16 18:39:07.000000000 -0500
10779 +diff -urNp linux-3.1.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.1.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
10780 +--- linux-3.1.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-11 15:19:27.000000000 -0500
10781 ++++ linux-3.1.4/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-16 18:39:07.000000000 -0500
10782 @@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device
10783 * Return with error code if any of the queue indices
10784 * is out of range
10785 @@ -32576,9 +33324,9 @@ diff -urNp linux-3.1.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.1.3/drivers
10786 return -EINVAL;
10787 }
10788
10789 -diff -urNp linux-3.1.3/drivers/net/vxge/vxge-config.h linux-3.1.3/drivers/net/vxge/vxge-config.h
10790 ---- linux-3.1.3/drivers/net/vxge/vxge-config.h 2011-11-11 15:19:27.000000000 -0500
10791 -+++ linux-3.1.3/drivers/net/vxge/vxge-config.h 2011-11-16 18:39:07.000000000 -0500
10792 +diff -urNp linux-3.1.4/drivers/net/vxge/vxge-config.h linux-3.1.4/drivers/net/vxge/vxge-config.h
10793 +--- linux-3.1.4/drivers/net/vxge/vxge-config.h 2011-11-11 15:19:27.000000000 -0500
10794 ++++ linux-3.1.4/drivers/net/vxge/vxge-config.h 2011-11-16 18:39:07.000000000 -0500
10795 @@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
10796 void (*link_down)(struct __vxge_hw_device *devh);
10797 void (*crit_err)(struct __vxge_hw_device *devh,
10798 @@ -32588,9 +33336,9 @@ diff -urNp linux-3.1.3/drivers/net/vxge/vxge-config.h linux-3.1.3/drivers/net/vx
10799
10800 /*
10801 * struct __vxge_hw_blockpool_entry - Block private data structure
10802 -diff -urNp linux-3.1.3/drivers/net/vxge/vxge-main.c linux-3.1.3/drivers/net/vxge/vxge-main.c
10803 ---- linux-3.1.3/drivers/net/vxge/vxge-main.c 2011-11-11 15:19:27.000000000 -0500
10804 -+++ linux-3.1.3/drivers/net/vxge/vxge-main.c 2011-11-16 18:40:22.000000000 -0500
10805 +diff -urNp linux-3.1.4/drivers/net/vxge/vxge-main.c linux-3.1.4/drivers/net/vxge/vxge-main.c
10806 +--- linux-3.1.4/drivers/net/vxge/vxge-main.c 2011-11-11 15:19:27.000000000 -0500
10807 ++++ linux-3.1.4/drivers/net/vxge/vxge-main.c 2011-11-16 18:40:22.000000000 -0500
10808 @@ -100,6 +100,8 @@ static inline void VXGE_COMPLETE_VPATH_T
10809 struct sk_buff *completed[NR_SKB_COMPLETED];
10810 int more;
10811 @@ -32609,9 +33357,9 @@ diff -urNp linux-3.1.3/drivers/net/vxge/vxge-main.c linux-3.1.3/drivers/net/vxge
10812 /*
10813 * Filling
10814 * - itable with bucket numbers
10815 -diff -urNp linux-3.1.3/drivers/net/vxge/vxge-traffic.h linux-3.1.3/drivers/net/vxge/vxge-traffic.h
10816 ---- linux-3.1.3/drivers/net/vxge/vxge-traffic.h 2011-11-11 15:19:27.000000000 -0500
10817 -+++ linux-3.1.3/drivers/net/vxge/vxge-traffic.h 2011-11-16 18:39:07.000000000 -0500
10818 +diff -urNp linux-3.1.4/drivers/net/vxge/vxge-traffic.h linux-3.1.4/drivers/net/vxge/vxge-traffic.h
10819 +--- linux-3.1.4/drivers/net/vxge/vxge-traffic.h 2011-11-11 15:19:27.000000000 -0500
10820 ++++ linux-3.1.4/drivers/net/vxge/vxge-traffic.h 2011-11-16 18:39:07.000000000 -0500
10821 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
10822 struct vxge_hw_mempool_dma *dma_object,
10823 u32 index,
10824 @@ -32621,9 +33369,9 @@ diff -urNp linux-3.1.3/drivers/net/vxge/vxge-traffic.h linux-3.1.3/drivers/net/v
10825
10826 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
10827 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
10828 -diff -urNp linux-3.1.3/drivers/net/wan/hdlc_x25.c linux-3.1.3/drivers/net/wan/hdlc_x25.c
10829 ---- linux-3.1.3/drivers/net/wan/hdlc_x25.c 2011-11-11 15:19:27.000000000 -0500
10830 -+++ linux-3.1.3/drivers/net/wan/hdlc_x25.c 2011-11-16 18:39:07.000000000 -0500
10831 +diff -urNp linux-3.1.4/drivers/net/wan/hdlc_x25.c linux-3.1.4/drivers/net/wan/hdlc_x25.c
10832 +--- linux-3.1.4/drivers/net/wan/hdlc_x25.c 2011-11-11 15:19:27.000000000 -0500
10833 ++++ linux-3.1.4/drivers/net/wan/hdlc_x25.c 2011-11-16 18:39:07.000000000 -0500
10834 @@ -134,16 +134,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
10835
10836 static int x25_open(struct net_device *dev)
10837 @@ -32649,9 +33397,9 @@ diff -urNp linux-3.1.3/drivers/net/wan/hdlc_x25.c linux-3.1.3/drivers/net/wan/hd
10838 result = lapb_register(dev, &cb);
10839 if (result != LAPB_OK)
10840 return result;
10841 -diff -urNp linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c
10842 ---- linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c 2011-11-11 15:19:27.000000000 -0500
10843 -+++ linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c 2011-11-16 18:40:22.000000000 -0500
10844 +diff -urNp linux-3.1.4/drivers/net/wimax/i2400m/usb-fw.c linux-3.1.4/drivers/net/wimax/i2400m/usb-fw.c
10845 +--- linux-3.1.4/drivers/net/wimax/i2400m/usb-fw.c 2011-11-11 15:19:27.000000000 -0500
10846 ++++ linux-3.1.4/drivers/net/wimax/i2400m/usb-fw.c 2011-11-16 18:40:22.000000000 -0500
10847 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
10848 int do_autopm = 1;
10849 DECLARE_COMPLETION_ONSTACK(notif_completion);
10850 @@ -32661,9 +33409,9 @@ diff -urNp linux-3.1.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.1.3/drivers/net
10851 d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
10852 i2400m, ack, ack_size);
10853 BUG_ON(_ack == i2400m->bm_ack_buf);
10854 -diff -urNp linux-3.1.3/drivers/net/wireless/airo.c linux-3.1.3/drivers/net/wireless/airo.c
10855 ---- linux-3.1.3/drivers/net/wireless/airo.c 2011-11-11 15:19:27.000000000 -0500
10856 -+++ linux-3.1.3/drivers/net/wireless/airo.c 2011-11-16 18:40:22.000000000 -0500
10857 +diff -urNp linux-3.1.4/drivers/net/wireless/airo.c linux-3.1.4/drivers/net/wireless/airo.c
10858 +--- linux-3.1.4/drivers/net/wireless/airo.c 2011-11-11 15:19:27.000000000 -0500
10859 ++++ linux-3.1.4/drivers/net/wireless/airo.c 2011-11-16 18:40:22.000000000 -0500
10860 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
10861 BSSListElement * loop_net;
10862 BSSListElement * tmp_net;
10863 @@ -32718,9 +33466,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/airo.c linux-3.1.3/drivers/net/wirel
10864 /* Get stats out of the card */
10865 clear_bit(JOB_WSTATS, &local->jobs);
10866 if (local->power.event) {
10867 -diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c
10868 ---- linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c 2011-11-11 15:19:27.000000000 -0500
10869 -+++ linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c 2011-11-16 19:08:21.000000000 -0500
10870 +diff -urNp linux-3.1.4/drivers/net/wireless/ath/ath5k/debug.c linux-3.1.4/drivers/net/wireless/ath/ath5k/debug.c
10871 +--- linux-3.1.4/drivers/net/wireless/ath/ath5k/debug.c 2011-11-11 15:19:27.000000000 -0500
10872 ++++ linux-3.1.4/drivers/net/wireless/ath/ath5k/debug.c 2011-11-16 19:08:21.000000000 -0500
10873 @@ -203,6 +203,8 @@ static ssize_t read_file_beacon(struct f
10874 unsigned int v;
10875 u64 tsf;
10876 @@ -32775,9 +33523,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.1.3/driver
10877 len += snprintf(buf + len, sizeof(buf) - len,
10878 "available txbuffers: %d\n", ah->txbuf_len);
10879
10880 -diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c
10881 ---- linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-11 15:19:27.000000000 -0500
10882 -+++ linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-16 18:40:22.000000000 -0500
10883 +diff -urNp linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c
10884 +--- linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-11 15:19:27.000000000 -0500
10885 ++++ linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-16 18:40:22.000000000 -0500
10886 @@ -758,6 +758,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
10887 int i, im, j;
10888 int nmeasurement;
10889 @@ -32787,9 +33535,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.1.3
10890 for (i = 0; i < AR9300_MAX_CHAINS; i++) {
10891 if (ah->txchainmask & (1 << i))
10892 num_chains++;
10893 -diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
10894 ---- linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-11 15:19:27.000000000 -0500
10895 -+++ linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-16 18:40:22.000000000 -0500
10896 +diff -urNp linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
10897 +--- linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-11 15:19:27.000000000 -0500
10898 ++++ linux-3.1.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-16 18:40:22.000000000 -0500
10899 @@ -406,6 +406,8 @@ static bool create_pa_curve(u32 *data_L,
10900 int theta_low_bin = 0;
10901 int i;
10902 @@ -32799,9 +33547,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.1.3
10903 /* disregard any bin that contains <= 16 samples */
10904 thresh_accum_cnt = 16;
10905 scale_factor = 5;
10906 -diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c
10907 ---- linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c 2011-11-11 15:19:27.000000000 -0500
10908 -+++ linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c 2011-11-16 18:40:22.000000000 -0500
10909 +diff -urNp linux-3.1.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.1.4/drivers/net/wireless/ath/ath9k/debug.c
10910 +--- linux-3.1.4/drivers/net/wireless/ath/ath9k/debug.c 2011-11-11 15:19:27.000000000 -0500
10911 ++++ linux-3.1.4/drivers/net/wireless/ath/ath9k/debug.c 2011-11-16 18:40:22.000000000 -0500
10912 @@ -387,6 +387,8 @@ static ssize_t read_file_interrupt(struc
10913 char buf[512];
10914 unsigned int len = 0;
10915 @@ -32820,9 +33568,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.1.3/driver
10916 len += snprintf(buf + len, sizeof(buf) - len,
10917 "%s (chan=%d center-freq: %d MHz channel-type: %d (%s))\n",
10918 wiphy_name(sc->hw->wiphy),
10919 -diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
10920 ---- linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-11 15:19:27.000000000 -0500
10921 -+++ linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-16 18:40:22.000000000 -0500
10922 +diff -urNp linux-3.1.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.1.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
10923 +--- linux-3.1.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-11 15:19:27.000000000 -0500
10924 ++++ linux-3.1.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-16 18:40:22.000000000 -0500
10925 @@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
10926 unsigned int len = 0;
10927 int ret = 0;
10928 @@ -32877,9 +33625,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.1.
10929 len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n",
10930 "Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue));
10931
10932 -diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h
10933 ---- linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h 2011-11-11 15:19:27.000000000 -0500
10934 -+++ linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h 2011-11-16 18:39:07.000000000 -0500
10935 +diff -urNp linux-3.1.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.1.4/drivers/net/wireless/ath/ath9k/hw.h
10936 +--- linux-3.1.4/drivers/net/wireless/ath/ath9k/hw.h 2011-11-11 15:19:27.000000000 -0500
10937 ++++ linux-3.1.4/drivers/net/wireless/ath/ath9k/hw.h 2011-11-16 18:39:07.000000000 -0500
10938 @@ -588,7 +588,7 @@ struct ath_hw_private_ops {
10939
10940 /* ANI */
10941 @@ -32907,9 +33655,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.1.3/drivers/n
10942
10943 struct ieee80211_hw *hw;
10944 struct ath_common common;
10945 -diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath.h linux-3.1.3/drivers/net/wireless/ath/ath.h
10946 ---- linux-3.1.3/drivers/net/wireless/ath/ath.h 2011-11-11 15:19:27.000000000 -0500
10947 -+++ linux-3.1.3/drivers/net/wireless/ath/ath.h 2011-11-16 18:39:07.000000000 -0500
10948 +diff -urNp linux-3.1.4/drivers/net/wireless/ath/ath.h linux-3.1.4/drivers/net/wireless/ath/ath.h
10949 +--- linux-3.1.4/drivers/net/wireless/ath/ath.h 2011-11-11 15:19:27.000000000 -0500
10950 ++++ linux-3.1.4/drivers/net/wireless/ath/ath.h 2011-11-16 18:39:07.000000000 -0500
10951 @@ -121,6 +121,7 @@ struct ath_ops {
10952 void (*write_flush) (void *);
10953 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
10954 @@ -32918,9 +33666,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ath/ath.h linux-3.1.3/drivers/net/wi
10955
10956 struct ath_common;
10957 struct ath_bus_ops;
10958 -diff -urNp linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c
10959 ---- linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-11 15:19:27.000000000 -0500
10960 -+++ linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-16 18:40:22.000000000 -0500
10961 +diff -urNp linux-3.1.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.1.4/drivers/net/wireless/ipw2x00/ipw2100.c
10962 +--- linux-3.1.4/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-11 15:19:27.000000000 -0500
10963 ++++ linux-3.1.4/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-16 18:40:22.000000000 -0500
10964 @@ -2102,6 +2102,8 @@ static int ipw2100_set_essid(struct ipw2
10965 int err;
10966 DECLARE_SSID_BUF(ssid);
10967 @@ -32939,9 +33687,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.1.3/driver
10968 IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
10969 idx, keylen, len);
10970
10971 -diff -urNp linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c
10972 ---- linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-11 15:19:27.000000000 -0500
10973 -+++ linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-16 18:40:22.000000000 -0500
10974 +diff -urNp linux-3.1.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.1.4/drivers/net/wireless/ipw2x00/libipw_rx.c
10975 +--- linux-3.1.4/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-11 15:19:27.000000000 -0500
10976 ++++ linux-3.1.4/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-16 18:40:22.000000000 -0500
10977 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
10978 unsigned long flags;
10979 DECLARE_SSID_BUF(ssid);
10980 @@ -32951,9 +33699,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.1.3/driv
10981 LIBIPW_DEBUG_SCAN("'%s' (%pM"
10982 "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
10983 print_ssid(ssid, info_element->data, info_element->len),
10984 -diff -urNp linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c
10985 ---- linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-11 15:19:27.000000000 -0500
10986 -+++ linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-16 18:39:07.000000000 -0500
10987 +diff -urNp linux-3.1.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.1.4/drivers/net/wireless/iwlegacy/iwl3945-base.c
10988 +--- linux-3.1.4/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-11 15:19:27.000000000 -0500
10989 ++++ linux-3.1.4/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-16 18:39:07.000000000 -0500
10990 @@ -3687,7 +3687,9 @@ static int iwl3945_pci_probe(struct pci_
10991 */
10992 if (iwl3945_mod_params.disable_hw_scan) {
10993 @@ -32965,9 +33713,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.1.3/
10994 }
10995
10996 IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
10997 -diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
10998 ---- linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-11 15:19:27.000000000 -0500
10999 -+++ linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-16 18:40:22.000000000 -0500
11000 +diff -urNp linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
11001 +--- linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-11 15:19:27.000000000 -0500
11002 ++++ linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-16 18:40:22.000000000 -0500
11003 @@ -920,6 +920,8 @@ static void rs_tx_status(void *priv_r, s
11004 struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
11005 struct iwl_rxon_context *ctx = sta_priv->common.ctx;
11006 @@ -32986,9 +33734,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.1.3/dri
11007 /* Override starting rate (index 0) if needed for debug purposes */
11008 rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
11009
11010 -diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c
11011 ---- linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-11 15:19:27.000000000 -0500
11012 -+++ linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-16 18:40:22.000000000 -0500
11013 +diff -urNp linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c
11014 +--- linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-11 15:19:27.000000000 -0500
11015 ++++ linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-16 18:40:22.000000000 -0500
11016 @@ -561,6 +561,8 @@ static ssize_t iwl_dbgfs_status_read(str
11017 int pos = 0;
11018 const size_t bufsz = sizeof(buf);
11019 @@ -33007,9 +33755,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.1.3/dr
11020 for_each_context(priv, ctx) {
11021 pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
11022 ctx->ctxid);
11023 -diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h
11024 ---- linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-11 15:19:27.000000000 -0500
11025 -+++ linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-16 18:39:07.000000000 -0500
11026 +diff -urNp linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debug.h
11027 +--- linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-11 15:19:27.000000000 -0500
11028 ++++ linux-3.1.4/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-16 18:39:07.000000000 -0500
11029 @@ -68,8 +68,8 @@ do {
11030 } while (0)
11031
11032 @@ -33021,9 +33769,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.1.3/driv
11033 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
11034 const void *p, u32 len)
11035 {}
11036 -diff -urNp linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c
11037 ---- linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-11 15:19:27.000000000 -0500
11038 -+++ linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-16 18:40:22.000000000 -0500
11039 +diff -urNp linux-3.1.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.1.4/drivers/net/wireless/iwmc3200wifi/debugfs.c
11040 +--- linux-3.1.4/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-11 15:19:27.000000000 -0500
11041 ++++ linux-3.1.4/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-16 18:40:22.000000000 -0500
11042 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
11043 int buf_len = 512;
11044 size_t len = 0;
11045 @@ -33033,9 +33781,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.1.3/d
11046 if (*ppos != 0)
11047 return 0;
11048 if (count < sizeof(buf))
11049 -diff -urNp linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c
11050 ---- linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c 2011-11-11 15:19:27.000000000 -0500
11051 -+++ linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c 2011-11-16 18:39:07.000000000 -0500
11052 +diff -urNp linux-3.1.4/drivers/net/wireless/mac80211_hwsim.c linux-3.1.4/drivers/net/wireless/mac80211_hwsim.c
11053 +--- linux-3.1.4/drivers/net/wireless/mac80211_hwsim.c 2011-11-11 15:19:27.000000000 -0500
11054 ++++ linux-3.1.4/drivers/net/wireless/mac80211_hwsim.c 2011-11-16 18:39:07.000000000 -0500
11055 @@ -1670,9 +1670,11 @@ static int __init init_mac80211_hwsim(vo
11056 return -EINVAL;
11057
11058 @@ -33051,9 +33799,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/mac80211_hwsim.c linux-3.1.3/drivers
11059 }
11060
11061 spin_lock_init(&hwsim_radio_lock);
11062 -diff -urNp linux-3.1.3/drivers/net/wireless/mwifiex/main.h linux-3.1.3/drivers/net/wireless/mwifiex/main.h
11063 ---- linux-3.1.3/drivers/net/wireless/mwifiex/main.h 2011-11-11 15:19:27.000000000 -0500
11064 -+++ linux-3.1.3/drivers/net/wireless/mwifiex/main.h 2011-11-16 18:39:07.000000000 -0500
11065 +diff -urNp linux-3.1.4/drivers/net/wireless/mwifiex/main.h linux-3.1.4/drivers/net/wireless/mwifiex/main.h
11066 +--- linux-3.1.4/drivers/net/wireless/mwifiex/main.h 2011-11-11 15:19:27.000000000 -0500
11067 ++++ linux-3.1.4/drivers/net/wireless/mwifiex/main.h 2011-11-16 18:39:07.000000000 -0500
11068 @@ -560,7 +560,7 @@ struct mwifiex_if_ops {
11069
11070 void (*update_mp_end_port) (struct mwifiex_adapter *, u16);
11071 @@ -33063,9 +33811,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/mwifiex/main.h linux-3.1.3/drivers/n
11072
11073 struct mwifiex_adapter {
11074 struct mwifiex_private *priv[MWIFIEX_MAX_BSS_NUM];
11075 -diff -urNp linux-3.1.3/drivers/net/wireless/rndis_wlan.c linux-3.1.3/drivers/net/wireless/rndis_wlan.c
11076 ---- linux-3.1.3/drivers/net/wireless/rndis_wlan.c 2011-11-11 15:19:27.000000000 -0500
11077 -+++ linux-3.1.3/drivers/net/wireless/rndis_wlan.c 2011-11-16 18:39:07.000000000 -0500
11078 +diff -urNp linux-3.1.4/drivers/net/wireless/rndis_wlan.c linux-3.1.4/drivers/net/wireless/rndis_wlan.c
11079 +--- linux-3.1.4/drivers/net/wireless/rndis_wlan.c 2011-11-11 15:19:27.000000000 -0500
11080 ++++ linux-3.1.4/drivers/net/wireless/rndis_wlan.c 2011-11-16 18:39:07.000000000 -0500
11081 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
11082
11083 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
11084 @@ -33075,9 +33823,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/rndis_wlan.c linux-3.1.3/drivers/net
11085 rts_threshold = 2347;
11086
11087 tmp = cpu_to_le32(rts_threshold);
11088 -diff -urNp linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
11089 ---- linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-11 15:19:27.000000000 -0500
11090 -+++ linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-16 18:40:22.000000000 -0500
11091 +diff -urNp linux-3.1.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.1.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
11092 +--- linux-3.1.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-11 15:19:27.000000000 -0500
11093 ++++ linux-3.1.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-16 18:40:22.000000000 -0500
11094 @@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
11095 u8 rfpath;
11096 u8 num_total_rfpath = rtlphy->num_total_rfpath;
11097 @@ -33087,9 +33835,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-
11098 precommoncmdcnt = 0;
11099 _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
11100 MAX_PRECMD_CNT,
11101 -diff -urNp linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h
11102 ---- linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h 2011-11-11 15:19:27.000000000 -0500
11103 -+++ linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h 2011-11-16 18:39:07.000000000 -0500
11104 +diff -urNp linux-3.1.4/drivers/net/wireless/wl1251/wl1251.h linux-3.1.4/drivers/net/wireless/wl1251/wl1251.h
11105 +--- linux-3.1.4/drivers/net/wireless/wl1251/wl1251.h 2011-11-11 15:19:27.000000000 -0500
11106 ++++ linux-3.1.4/drivers/net/wireless/wl1251/wl1251.h 2011-11-16 18:39:07.000000000 -0500
11107 @@ -266,7 +266,7 @@ struct wl1251_if_operations {
11108 void (*reset)(struct wl1251 *wl);
11109 void (*enable_irq)(struct wl1251 *wl);
11110 @@ -33099,9 +33847,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/wl1251/wl1251.h linux-3.1.3/drivers/
11111
11112 struct wl1251 {
11113 struct ieee80211_hw *hw;
11114 -diff -urNp linux-3.1.3/drivers/net/wireless/wl12xx/spi.c linux-3.1.3/drivers/net/wireless/wl12xx/spi.c
11115 ---- linux-3.1.3/drivers/net/wireless/wl12xx/spi.c 2011-11-11 15:19:27.000000000 -0500
11116 -+++ linux-3.1.3/drivers/net/wireless/wl12xx/spi.c 2011-11-16 18:40:22.000000000 -0500
11117 +diff -urNp linux-3.1.4/drivers/net/wireless/wl12xx/spi.c linux-3.1.4/drivers/net/wireless/wl12xx/spi.c
11118 +--- linux-3.1.4/drivers/net/wireless/wl12xx/spi.c 2011-11-11 15:19:27.000000000 -0500
11119 ++++ linux-3.1.4/drivers/net/wireless/wl12xx/spi.c 2011-11-16 18:40:22.000000000 -0500
11120 @@ -281,6 +281,8 @@ static void wl1271_spi_raw_write(struct
11121 u32 chunk_len;
11122 int i;
11123 @@ -33111,9 +33859,9 @@ diff -urNp linux-3.1.3/drivers/net/wireless/wl12xx/spi.c linux-3.1.3/drivers/net
11124 WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
11125
11126 spi_message_init(&m);
11127 -diff -urNp linux-3.1.3/drivers/oprofile/buffer_sync.c linux-3.1.3/drivers/oprofile/buffer_sync.c
11128 ---- linux-3.1.3/drivers/oprofile/buffer_sync.c 2011-11-11 15:19:27.000000000 -0500
11129 -+++ linux-3.1.3/drivers/oprofile/buffer_sync.c 2011-11-16 18:39:07.000000000 -0500
11130 +diff -urNp linux-3.1.4/drivers/oprofile/buffer_sync.c linux-3.1.4/drivers/oprofile/buffer_sync.c
11131 +--- linux-3.1.4/drivers/oprofile/buffer_sync.c 2011-11-11 15:19:27.000000000 -0500
11132 ++++ linux-3.1.4/drivers/oprofile/buffer_sync.c 2011-11-16 18:39:07.000000000 -0500
11133 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
11134 if (cookie == NO_COOKIE)
11135 offset = pc;
11136 @@ -33149,9 +33897,9 @@ diff -urNp linux-3.1.3/drivers/oprofile/buffer_sync.c linux-3.1.3/drivers/oprofi
11137 }
11138 }
11139 release_mm(mm);
11140 -diff -urNp linux-3.1.3/drivers/oprofile/event_buffer.c linux-3.1.3/drivers/oprofile/event_buffer.c
11141 ---- linux-3.1.3/drivers/oprofile/event_buffer.c 2011-11-11 15:19:27.000000000 -0500
11142 -+++ linux-3.1.3/drivers/oprofile/event_buffer.c 2011-11-16 18:39:07.000000000 -0500
11143 +diff -urNp linux-3.1.4/drivers/oprofile/event_buffer.c linux-3.1.4/drivers/oprofile/event_buffer.c
11144 +--- linux-3.1.4/drivers/oprofile/event_buffer.c 2011-11-11 15:19:27.000000000 -0500
11145 ++++ linux-3.1.4/drivers/oprofile/event_buffer.c 2011-11-16 18:39:07.000000000 -0500
11146 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
11147 }
11148
11149 @@ -33161,9 +33909,9 @@ diff -urNp linux-3.1.3/drivers/oprofile/event_buffer.c linux-3.1.3/drivers/oprof
11150 return;
11151 }
11152
11153 -diff -urNp linux-3.1.3/drivers/oprofile/oprof.c linux-3.1.3/drivers/oprofile/oprof.c
11154 ---- linux-3.1.3/drivers/oprofile/oprof.c 2011-11-11 15:19:27.000000000 -0500
11155 -+++ linux-3.1.3/drivers/oprofile/oprof.c 2011-11-16 18:39:07.000000000 -0500
11156 +diff -urNp linux-3.1.4/drivers/oprofile/oprof.c linux-3.1.4/drivers/oprofile/oprof.c
11157 +--- linux-3.1.4/drivers/oprofile/oprof.c 2011-11-11 15:19:27.000000000 -0500
11158 ++++ linux-3.1.4/drivers/oprofile/oprof.c 2011-11-16 18:39:07.000000000 -0500
11159 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
11160 if (oprofile_ops.switch_events())
11161 return;
11162 @@ -33173,9 +33921,9 @@ diff -urNp linux-3.1.3/drivers/oprofile/oprof.c linux-3.1.3/drivers/oprofile/opr
11163 start_switch_worker();
11164 }
11165
11166 -diff -urNp linux-3.1.3/drivers/oprofile/oprofilefs.c linux-3.1.3/drivers/oprofile/oprofilefs.c
11167 ---- linux-3.1.3/drivers/oprofile/oprofilefs.c 2011-11-11 15:19:27.000000000 -0500
11168 -+++ linux-3.1.3/drivers/oprofile/oprofilefs.c 2011-11-16 18:39:07.000000000 -0500
11169 +diff -urNp linux-3.1.4/drivers/oprofile/oprofilefs.c linux-3.1.4/drivers/oprofile/oprofilefs.c
11170 +--- linux-3.1.4/drivers/oprofile/oprofilefs.c 2011-11-11 15:19:27.000000000 -0500
11171 ++++ linux-3.1.4/drivers/oprofile/oprofilefs.c 2011-11-16 18:39:07.000000000 -0500
11172 @@ -186,7 +186,7 @@ static const struct file_operations atom
11173
11174
11175 @@ -33185,9 +33933,9 @@ diff -urNp linux-3.1.3/drivers/oprofile/oprofilefs.c linux-3.1.3/drivers/oprofil
11176 {
11177 return __oprofilefs_create_file(sb, root, name,
11178 &atomic_ro_fops, 0444, val);
11179 -diff -urNp linux-3.1.3/drivers/oprofile/oprofile_stats.c linux-3.1.3/drivers/oprofile/oprofile_stats.c
11180 ---- linux-3.1.3/drivers/oprofile/oprofile_stats.c 2011-11-11 15:19:27.000000000 -0500
11181 -+++ linux-3.1.3/drivers/oprofile/oprofile_stats.c 2011-11-16 18:39:07.000000000 -0500
11182 +diff -urNp linux-3.1.4/drivers/oprofile/oprofile_stats.c linux-3.1.4/drivers/oprofile/oprofile_stats.c
11183 +--- linux-3.1.4/drivers/oprofile/oprofile_stats.c 2011-11-11 15:19:27.000000000 -0500
11184 ++++ linux-3.1.4/drivers/oprofile/oprofile_stats.c 2011-11-16 18:39:07.000000000 -0500
11185 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
11186 cpu_buf->sample_invalid_eip = 0;
11187 }
11188 @@ -33205,9 +33953,9 @@ diff -urNp linux-3.1.3/drivers/oprofile/oprofile_stats.c linux-3.1.3/drivers/opr
11189 }
11190
11191
11192 -diff -urNp linux-3.1.3/drivers/oprofile/oprofile_stats.h linux-3.1.3/drivers/oprofile/oprofile_stats.h
11193 ---- linux-3.1.3/drivers/oprofile/oprofile_stats.h 2011-11-11 15:19:27.000000000 -0500
11194 -+++ linux-3.1.3/drivers/oprofile/oprofile_stats.h 2011-11-16 18:39:07.000000000 -0500
11195 +diff -urNp linux-3.1.4/drivers/oprofile/oprofile_stats.h linux-3.1.4/drivers/oprofile/oprofile_stats.h
11196 +--- linux-3.1.4/drivers/oprofile/oprofile_stats.h 2011-11-11 15:19:27.000000000 -0500
11197 ++++ linux-3.1.4/drivers/oprofile/oprofile_stats.h 2011-11-16 18:39:07.000000000 -0500
11198 @@ -13,11 +13,11 @@
11199 #include <linux/atomic.h>
11200
11201 @@ -33225,9 +33973,9 @@ diff -urNp linux-3.1.3/drivers/oprofile/oprofile_stats.h linux-3.1.3/drivers/opr
11202 };
11203
11204 extern struct oprofile_stat_struct oprofile_stats;
11205 -diff -urNp linux-3.1.3/drivers/parport/procfs.c linux-3.1.3/drivers/parport/procfs.c
11206 ---- linux-3.1.3/drivers/parport/procfs.c 2011-11-11 15:19:27.000000000 -0500
11207 -+++ linux-3.1.3/drivers/parport/procfs.c 2011-11-16 18:39:07.000000000 -0500
11208 +diff -urNp linux-3.1.4/drivers/parport/procfs.c linux-3.1.4/drivers/parport/procfs.c
11209 +--- linux-3.1.4/drivers/parport/procfs.c 2011-11-11 15:19:27.000000000 -0500
11210 ++++ linux-3.1.4/drivers/parport/procfs.c 2011-11-16 18:39:07.000000000 -0500
11211 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
11212
11213 *ppos += len;
11214 @@ -33246,9 +33994,9 @@ diff -urNp linux-3.1.3/drivers/parport/procfs.c linux-3.1.3/drivers/parport/proc
11215 }
11216 #endif /* IEEE1284.3 support. */
11217
11218 -diff -urNp linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h
11219 ---- linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h 2011-11-11 15:19:27.000000000 -0500
11220 -+++ linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h 2011-11-16 18:39:07.000000000 -0500
11221 +diff -urNp linux-3.1.4/drivers/pci/hotplug/cpci_hotplug.h linux-3.1.4/drivers/pci/hotplug/cpci_hotplug.h
11222 +--- linux-3.1.4/drivers/pci/hotplug/cpci_hotplug.h 2011-11-11 15:19:27.000000000 -0500
11223 ++++ linux-3.1.4/drivers/pci/hotplug/cpci_hotplug.h 2011-11-16 18:39:07.000000000 -0500
11224 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
11225 int (*hardware_test) (struct slot* slot, u32 value);
11226 u8 (*get_power) (struct slot* slot);
11227 @@ -33258,9 +34006,9 @@ diff -urNp linux-3.1.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.1.3/drivers/pc
11228
11229 struct cpci_hp_controller {
11230 unsigned int irq;
11231 -diff -urNp linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c
11232 ---- linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-11 15:19:27.000000000 -0500
11233 -+++ linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-16 18:39:07.000000000 -0500
11234 +diff -urNp linux-3.1.4/drivers/pci/hotplug/cpqphp_nvram.c linux-3.1.4/drivers/pci/hotplug/cpqphp_nvram.c
11235 +--- linux-3.1.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-11 15:19:27.000000000 -0500
11236 ++++ linux-3.1.4/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-16 18:39:07.000000000 -0500
11237 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
11238
11239 void compaq_nvram_init (void __iomem *rom_start)
11240 @@ -33275,9 +34023,9 @@ diff -urNp linux-3.1.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.1.3/drivers/pc
11241 dbg("int15 entry = %p\n", compaq_int15_entry_point);
11242
11243 /* initialize our int15 lock */
11244 -diff -urNp linux-3.1.3/drivers/pci/pcie/aspm.c linux-3.1.3/drivers/pci/pcie/aspm.c
11245 ---- linux-3.1.3/drivers/pci/pcie/aspm.c 2011-11-11 15:19:27.000000000 -0500
11246 -+++ linux-3.1.3/drivers/pci/pcie/aspm.c 2011-11-16 18:39:07.000000000 -0500
11247 +diff -urNp linux-3.1.4/drivers/pci/pcie/aspm.c linux-3.1.4/drivers/pci/pcie/aspm.c
11248 +--- linux-3.1.4/drivers/pci/pcie/aspm.c 2011-11-11 15:19:27.000000000 -0500
11249 ++++ linux-3.1.4/drivers/pci/pcie/aspm.c 2011-11-16 18:39:07.000000000 -0500
11250 @@ -27,9 +27,9 @@
11251 #define MODULE_PARAM_PREFIX "pcie_aspm."
11252
11253 @@ -33291,9 +34039,9 @@ diff -urNp linux-3.1.3/drivers/pci/pcie/aspm.c linux-3.1.3/drivers/pci/pcie/aspm
11254 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
11255 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
11256
11257 -diff -urNp linux-3.1.3/drivers/pci/probe.c linux-3.1.3/drivers/pci/probe.c
11258 ---- linux-3.1.3/drivers/pci/probe.c 2011-11-11 15:19:27.000000000 -0500
11259 -+++ linux-3.1.3/drivers/pci/probe.c 2011-11-16 18:39:07.000000000 -0500
11260 +diff -urNp linux-3.1.4/drivers/pci/probe.c linux-3.1.4/drivers/pci/probe.c
11261 +--- linux-3.1.4/drivers/pci/probe.c 2011-11-11 15:19:27.000000000 -0500
11262 ++++ linux-3.1.4/drivers/pci/probe.c 2011-11-16 18:39:07.000000000 -0500
11263 @@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev,
11264 u32 l, sz, mask;
11265 u16 orig_cmd;
11266 @@ -33303,9 +34051,9 @@ diff -urNp linux-3.1.3/drivers/pci/probe.c linux-3.1.3/drivers/pci/probe.c
11267
11268 if (!dev->mmio_always_on) {
11269 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
11270 -diff -urNp linux-3.1.3/drivers/pci/proc.c linux-3.1.3/drivers/pci/proc.c
11271 ---- linux-3.1.3/drivers/pci/proc.c 2011-11-11 15:19:27.000000000 -0500
11272 -+++ linux-3.1.3/drivers/pci/proc.c 2011-11-16 18:40:22.000000000 -0500
11273 +diff -urNp linux-3.1.4/drivers/pci/proc.c linux-3.1.4/drivers/pci/proc.c
11274 +--- linux-3.1.4/drivers/pci/proc.c 2011-11-11 15:19:27.000000000 -0500
11275 ++++ linux-3.1.4/drivers/pci/proc.c 2011-11-16 18:40:22.000000000 -0500
11276 @@ -476,7 +476,16 @@ static const struct file_operations proc
11277 static int __init pci_proc_init(void)
11278 {
11279 @@ -33323,9 +34071,9 @@ diff -urNp linux-3.1.3/drivers/pci/proc.c linux-3.1.3/drivers/pci/proc.c
11280 proc_create("devices", 0, proc_bus_pci_dir,
11281 &proc_bus_pci_dev_operations);
11282 proc_initialized = 1;
11283 -diff -urNp linux-3.1.3/drivers/pci/xen-pcifront.c linux-3.1.3/drivers/pci/xen-pcifront.c
11284 ---- linux-3.1.3/drivers/pci/xen-pcifront.c 2011-11-11 15:19:27.000000000 -0500
11285 -+++ linux-3.1.3/drivers/pci/xen-pcifront.c 2011-11-16 18:40:22.000000000 -0500
11286 +diff -urNp linux-3.1.4/drivers/pci/xen-pcifront.c linux-3.1.4/drivers/pci/xen-pcifront.c
11287 +--- linux-3.1.4/drivers/pci/xen-pcifront.c 2011-11-11 15:19:27.000000000 -0500
11288 ++++ linux-3.1.4/drivers/pci/xen-pcifront.c 2011-11-16 18:40:22.000000000 -0500
11289 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
11290 struct pcifront_sd *sd = bus->sysdata;
11291 struct pcifront_device *pdev = pcifront_get_pdev(sd);
11292 @@ -33371,9 +34119,9 @@ diff -urNp linux-3.1.3/drivers/pci/xen-pcifront.c linux-3.1.3/drivers/pci/xen-pc
11293 err = do_pci_op(pdev, &op);
11294 if (likely(!err)) {
11295 vector[0] = op.value;
11296 -diff -urNp linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c
11297 ---- linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c 2011-11-11 15:19:27.000000000 -0500
11298 -+++ linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c 2011-11-16 18:39:07.000000000 -0500
11299 +diff -urNp linux-3.1.4/drivers/platform/x86/thinkpad_acpi.c linux-3.1.4/drivers/platform/x86/thinkpad_acpi.c
11300 +--- linux-3.1.4/drivers/platform/x86/thinkpad_acpi.c 2011-11-11 15:19:27.000000000 -0500
11301 ++++ linux-3.1.4/drivers/platform/x86/thinkpad_acpi.c 2011-12-02 17:38:47.000000000 -0500
11302 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
11303 return 0;
11304 }
11305 @@ -33383,9 +34131,128 @@ diff -urNp linux-3.1.3/drivers/platform/x86/thinkpad_acpi.c linux-3.1.3/drivers/
11306 {
11307 /* log only what the user can fix... */
11308 const u32 wantedmask = hotkey_driver_mask &
11309 -diff -urNp linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c
11310 ---- linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c 2011-11-11 15:19:27.000000000 -0500
11311 -+++ linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c 2011-11-16 18:39:07.000000000 -0500
11312 +@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_
11313 + }
11314 + }
11315 +
11316 +-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
11317 +- struct tp_nvram_state *newn,
11318 +- const u32 event_mask)
11319 +-{
11320 +-
11321 + #define TPACPI_COMPARE_KEY(__scancode, __member) \
11322 + do { \
11323 + if ((event_mask & (1 << __scancode)) && \
11324 +@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_eve
11325 + tpacpi_hotkey_send_key(__scancode); \
11326 + } while (0)
11327 +
11328 +- void issue_volchange(const unsigned int oldvol,
11329 +- const unsigned int newvol)
11330 +- {
11331 +- unsigned int i = oldvol;
11332 ++static void issue_volchange(const unsigned int oldvol,
11333 ++ const unsigned int newvol,
11334 ++ const u32 event_mask)
11335 ++{
11336 ++ unsigned int i = oldvol;
11337 +
11338 +- while (i > newvol) {
11339 +- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
11340 +- i--;
11341 +- }
11342 +- while (i < newvol) {
11343 +- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
11344 +- i++;
11345 +- }
11346 ++ while (i > newvol) {
11347 ++ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
11348 ++ i--;
11349 + }
11350 ++ while (i < newvol) {
11351 ++ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
11352 ++ i++;
11353 ++ }
11354 ++}
11355 +
11356 +- void issue_brightnesschange(const unsigned int oldbrt,
11357 +- const unsigned int newbrt)
11358 +- {
11359 +- unsigned int i = oldbrt;
11360 ++static void issue_brightnesschange(const unsigned int oldbrt,
11361 ++ const unsigned int newbrt,
11362 ++ const u32 event_mask)
11363 ++{
11364 ++ unsigned int i = oldbrt;
11365 +
11366 +- while (i > newbrt) {
11367 +- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
11368 +- i--;
11369 +- }
11370 +- while (i < newbrt) {
11371 +- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
11372 +- i++;
11373 +- }
11374 ++ while (i > newbrt) {
11375 ++ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
11376 ++ i--;
11377 ++ }
11378 ++ while (i < newbrt) {
11379 ++ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
11380 ++ i++;
11381 + }
11382 ++}
11383 +
11384 ++static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
11385 ++ struct tp_nvram_state *newn,
11386 ++ const u32 event_mask)
11387 ++{
11388 + TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
11389 + TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
11390 + TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
11391 +@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_eve
11392 + oldn->volume_level != newn->volume_level) {
11393 + /* recently muted, or repeated mute keypress, or
11394 + * multiple presses ending in mute */
11395 +- issue_volchange(oldn->volume_level, newn->volume_level);
11396 ++ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
11397 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
11398 + }
11399 + } else {
11400 +@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_eve
11401 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
11402 + }
11403 + if (oldn->volume_level != newn->volume_level) {
11404 +- issue_volchange(oldn->volume_level, newn->volume_level);
11405 ++ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
11406 + } else if (oldn->volume_toggle != newn->volume_toggle) {
11407 + /* repeated vol up/down keypress at end of scale ? */
11408 + if (newn->volume_level == 0)
11409 +@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_eve
11410 + /* handle brightness */
11411 + if (oldn->brightness_level != newn->brightness_level) {
11412 + issue_brightnesschange(oldn->brightness_level,
11413 +- newn->brightness_level);
11414 ++ newn->brightness_level,
11415 ++ event_mask);
11416 + } else if (oldn->brightness_toggle != newn->brightness_toggle) {
11417 + /* repeated key presses that didn't change state */
11418 + if (newn->brightness_level == 0)
11419 +@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_eve
11420 + && !tp_features.bright_unkfw)
11421 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
11422 + }
11423 ++}
11424 +
11425 + #undef TPACPI_COMPARE_KEY
11426 + #undef TPACPI_MAY_SEND_KEY
11427 +-}
11428 +
11429 + /*
11430 + * Polling driver
11431 +diff -urNp linux-3.1.4/drivers/pnp/pnpbios/bioscalls.c linux-3.1.4/drivers/pnp/pnpbios/bioscalls.c
11432 +--- linux-3.1.4/drivers/pnp/pnpbios/bioscalls.c 2011-11-11 15:19:27.000000000 -0500
11433 ++++ linux-3.1.4/drivers/pnp/pnpbios/bioscalls.c 2011-11-16 18:39:07.000000000 -0500
11434 @@ -59,7 +59,7 @@ do { \
11435 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
11436 } while(0)
11437 @@ -33442,9 +34309,9 @@ diff -urNp linux-3.1.3/drivers/pnp/pnpbios/bioscalls.c linux-3.1.3/drivers/pnp/p
11438 +
11439 + pax_close_kernel();
11440 }
11441 -diff -urNp linux-3.1.3/drivers/pnp/resource.c linux-3.1.3/drivers/pnp/resource.c
11442 ---- linux-3.1.3/drivers/pnp/resource.c 2011-11-11 15:19:27.000000000 -0500
11443 -+++ linux-3.1.3/drivers/pnp/resource.c 2011-11-16 18:39:07.000000000 -0500
11444 +diff -urNp linux-3.1.4/drivers/pnp/resource.c linux-3.1.4/drivers/pnp/resource.c
11445 +--- linux-3.1.4/drivers/pnp/resource.c 2011-11-11 15:19:27.000000000 -0500
11446 ++++ linux-3.1.4/drivers/pnp/resource.c 2011-11-16 18:39:07.000000000 -0500
11447 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
11448 return 1;
11449
11450 @@ -33463,9 +34330,9 @@ diff -urNp linux-3.1.3/drivers/pnp/resource.c linux-3.1.3/drivers/pnp/resource.c
11451 return 0;
11452
11453 /* check if the resource is reserved */
11454 -diff -urNp linux-3.1.3/drivers/power/bq27x00_battery.c linux-3.1.3/drivers/power/bq27x00_battery.c
11455 ---- linux-3.1.3/drivers/power/bq27x00_battery.c 2011-11-11 15:19:27.000000000 -0500
11456 -+++ linux-3.1.3/drivers/power/bq27x00_battery.c 2011-11-16 18:39:07.000000000 -0500
11457 +diff -urNp linux-3.1.4/drivers/power/bq27x00_battery.c linux-3.1.4/drivers/power/bq27x00_battery.c
11458 +--- linux-3.1.4/drivers/power/bq27x00_battery.c 2011-11-11 15:19:27.000000000 -0500
11459 ++++ linux-3.1.4/drivers/power/bq27x00_battery.c 2011-11-16 18:39:07.000000000 -0500
11460 @@ -67,7 +67,7 @@
11461 struct bq27x00_device_info;
11462 struct bq27x00_access_methods {
11463 @@ -33475,9 +34342,9 @@ diff -urNp linux-3.1.3/drivers/power/bq27x00_battery.c linux-3.1.3/drivers/power
11464
11465 enum bq27x00_chip { BQ27000, BQ27500 };
11466
11467 -diff -urNp linux-3.1.3/drivers/regulator/max8660.c linux-3.1.3/drivers/regulator/max8660.c
11468 ---- linux-3.1.3/drivers/regulator/max8660.c 2011-11-11 15:19:27.000000000 -0500
11469 -+++ linux-3.1.3/drivers/regulator/max8660.c 2011-11-16 18:39:07.000000000 -0500
11470 +diff -urNp linux-3.1.4/drivers/regulator/max8660.c linux-3.1.4/drivers/regulator/max8660.c
11471 +--- linux-3.1.4/drivers/regulator/max8660.c 2011-11-11 15:19:27.000000000 -0500
11472 ++++ linux-3.1.4/drivers/regulator/max8660.c 2011-11-16 18:39:07.000000000 -0500
11473 @@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
11474 max8660->shadow_regs[MAX8660_OVER1] = 5;
11475 } else {
11476 @@ -33491,9 +34358,9 @@ diff -urNp linux-3.1.3/drivers/regulator/max8660.c linux-3.1.3/drivers/regulator
11477 }
11478
11479 /*
11480 -diff -urNp linux-3.1.3/drivers/regulator/mc13892-regulator.c linux-3.1.3/drivers/regulator/mc13892-regulator.c
11481 ---- linux-3.1.3/drivers/regulator/mc13892-regulator.c 2011-11-11 15:19:27.000000000 -0500
11482 -+++ linux-3.1.3/drivers/regulator/mc13892-regulator.c 2011-11-16 18:39:07.000000000 -0500
11483 +diff -urNp linux-3.1.4/drivers/regulator/mc13892-regulator.c linux-3.1.4/drivers/regulator/mc13892-regulator.c
11484 +--- linux-3.1.4/drivers/regulator/mc13892-regulator.c 2011-11-11 15:19:27.000000000 -0500
11485 ++++ linux-3.1.4/drivers/regulator/mc13892-regulator.c 2011-11-16 18:39:07.000000000 -0500
11486 @@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
11487 }
11488 mc13xxx_unlock(mc13892);
11489 @@ -33509,9 +34376,9 @@ diff -urNp linux-3.1.3/drivers/regulator/mc13892-regulator.c linux-3.1.3/drivers
11490 for (i = 0; i < pdata->num_regulators; i++) {
11491 init_data = &pdata->regulators[i];
11492 priv->regulators[i] = regulator_register(
11493 -diff -urNp linux-3.1.3/drivers/rtc/rtc-dev.c linux-3.1.3/drivers/rtc/rtc-dev.c
11494 ---- linux-3.1.3/drivers/rtc/rtc-dev.c 2011-11-11 15:19:27.000000000 -0500
11495 -+++ linux-3.1.3/drivers/rtc/rtc-dev.c 2011-11-16 18:40:22.000000000 -0500
11496 +diff -urNp linux-3.1.4/drivers/rtc/rtc-dev.c linux-3.1.4/drivers/rtc/rtc-dev.c
11497 +--- linux-3.1.4/drivers/rtc/rtc-dev.c 2011-11-11 15:19:27.000000000 -0500
11498 ++++ linux-3.1.4/drivers/rtc/rtc-dev.c 2011-11-16 18:40:22.000000000 -0500
11499 @@ -14,6 +14,7 @@
11500 #include <linux/module.h>
11501 #include <linux/rtc.h>
11502 @@ -33529,9 +34396,9 @@ diff -urNp linux-3.1.3/drivers/rtc/rtc-dev.c linux-3.1.3/drivers/rtc/rtc-dev.c
11503 return rtc_set_time(rtc, &tm);
11504
11505 case RTC_PIE_ON:
11506 -diff -urNp linux-3.1.3/drivers/scsi/aacraid/aacraid.h linux-3.1.3/drivers/scsi/aacraid/aacraid.h
11507 ---- linux-3.1.3/drivers/scsi/aacraid/aacraid.h 2011-11-11 15:19:27.000000000 -0500
11508 -+++ linux-3.1.3/drivers/scsi/aacraid/aacraid.h 2011-11-16 18:39:07.000000000 -0500
11509 +diff -urNp linux-3.1.4/drivers/scsi/aacraid/aacraid.h linux-3.1.4/drivers/scsi/aacraid/aacraid.h
11510 +--- linux-3.1.4/drivers/scsi/aacraid/aacraid.h 2011-11-11 15:19:27.000000000 -0500
11511 ++++ linux-3.1.4/drivers/scsi/aacraid/aacraid.h 2011-11-16 18:39:07.000000000 -0500
11512 @@ -492,7 +492,7 @@ struct adapter_ops
11513 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
11514 /* Administrative operations */
11515 @@ -33541,9 +34408,9 @@ diff -urNp linux-3.1.3/drivers/scsi/aacraid/aacraid.h linux-3.1.3/drivers/scsi/a
11516
11517 /*
11518 * Define which interrupt handler needs to be installed
11519 -diff -urNp linux-3.1.3/drivers/scsi/aacraid/commctrl.c linux-3.1.3/drivers/scsi/aacraid/commctrl.c
11520 ---- linux-3.1.3/drivers/scsi/aacraid/commctrl.c 2011-11-11 15:19:27.000000000 -0500
11521 -+++ linux-3.1.3/drivers/scsi/aacraid/commctrl.c 2011-11-16 18:40:22.000000000 -0500
11522 +diff -urNp linux-3.1.4/drivers/scsi/aacraid/commctrl.c linux-3.1.4/drivers/scsi/aacraid/commctrl.c
11523 +--- linux-3.1.4/drivers/scsi/aacraid/commctrl.c 2011-11-11 15:19:27.000000000 -0500
11524 ++++ linux-3.1.4/drivers/scsi/aacraid/commctrl.c 2011-11-16 18:40:22.000000000 -0500
11525 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
11526 u32 actual_fibsize64, actual_fibsize = 0;
11527 int i;
11528 @@ -33552,9 +34419,9 @@ diff -urNp linux-3.1.3/drivers/scsi/aacraid/commctrl.c linux-3.1.3/drivers/scsi/
11529
11530 if (dev->in_reset) {
11531 dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
11532 -diff -urNp linux-3.1.3/drivers/scsi/aacraid/linit.c linux-3.1.3/drivers/scsi/aacraid/linit.c
11533 ---- linux-3.1.3/drivers/scsi/aacraid/linit.c 2011-11-26 19:57:29.000000000 -0500
11534 -+++ linux-3.1.3/drivers/scsi/aacraid/linit.c 2011-11-26 20:00:43.000000000 -0500
11535 +diff -urNp linux-3.1.4/drivers/scsi/aacraid/linit.c linux-3.1.4/drivers/scsi/aacraid/linit.c
11536 +--- linux-3.1.4/drivers/scsi/aacraid/linit.c 2011-11-26 19:57:29.000000000 -0500
11537 ++++ linux-3.1.4/drivers/scsi/aacraid/linit.c 2011-11-26 20:00:43.000000000 -0500
11538 @@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_
11539 #elif defined(__devinitconst)
11540 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
11541 @@ -33564,9 +34431,9 @@ diff -urNp linux-3.1.3/drivers/scsi/aacraid/linit.c linux-3.1.3/drivers/scsi/aac
11542 #endif
11543 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
11544 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
11545 -diff -urNp linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c
11546 ---- linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-11 15:19:27.000000000 -0500
11547 -+++ linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-16 18:39:07.000000000 -0500
11548 +diff -urNp linux-3.1.4/drivers/scsi/aic94xx/aic94xx_init.c linux-3.1.4/drivers/scsi/aic94xx/aic94xx_init.c
11549 +--- linux-3.1.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-11 15:19:27.000000000 -0500
11550 ++++ linux-3.1.4/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-16 18:39:07.000000000 -0500
11551 @@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa
11552 .lldd_control_phy = asd_control_phy,
11553 };
11554 @@ -33576,9 +34443,9 @@ diff -urNp linux-3.1.3/drivers/scsi/aic94xx/aic94xx_init.c linux-3.1.3/drivers/s
11555 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
11556 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
11557 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
11558 -diff -urNp linux-3.1.3/drivers/scsi/bfa/bfad.c linux-3.1.3/drivers/scsi/bfa/bfad.c
11559 ---- linux-3.1.3/drivers/scsi/bfa/bfad.c 2011-11-11 15:19:27.000000000 -0500
11560 -+++ linux-3.1.3/drivers/scsi/bfa/bfad.c 2011-11-16 19:01:15.000000000 -0500
11561 +diff -urNp linux-3.1.4/drivers/scsi/bfa/bfad.c linux-3.1.4/drivers/scsi/bfa/bfad.c
11562 +--- linux-3.1.4/drivers/scsi/bfa/bfad.c 2011-11-11 15:19:27.000000000 -0500
11563 ++++ linux-3.1.4/drivers/scsi/bfa/bfad.c 2011-11-16 19:01:15.000000000 -0500
11564 @@ -1019,6 +1019,8 @@ bfad_start_ops(struct bfad_s *bfad) {
11565 struct bfad_vport_s *vport, *vport_new;
11566 struct bfa_fcs_driver_info_s driver_info;
11567 @@ -33588,9 +34455,9 @@ diff -urNp linux-3.1.3/drivers/scsi/bfa/bfad.c linux-3.1.3/drivers/scsi/bfa/bfad
11568 /* Limit min/max. xfer size to [64k-32MB] */
11569 if (max_xfer_size < BFAD_MIN_SECTORS >> 1)
11570 max_xfer_size = BFAD_MIN_SECTORS >> 1;
11571 -diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c
11572 ---- linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c 2011-11-11 15:19:27.000000000 -0500
11573 -+++ linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c 2011-11-16 18:39:07.000000000 -0500
11574 +diff -urNp linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.c linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.c
11575 +--- linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.c 2011-11-11 15:19:27.000000000 -0500
11576 ++++ linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.c 2011-11-16 18:39:07.000000000 -0500
11577 @@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct
11578 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
11579 {
11580 @@ -33600,9 +34467,9 @@ diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.c linux-3.1.3/drivers/scsi/bfa
11581
11582 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
11583 itn->isr = isr;
11584 -diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h
11585 ---- linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h 2011-11-11 15:19:27.000000000 -0500
11586 -+++ linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h 2011-11-16 18:39:07.000000000 -0500
11587 +diff -urNp linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.h linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.h
11588 +--- linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.h 2011-11-11 15:19:27.000000000 -0500
11589 ++++ linux-3.1.4/drivers/scsi/bfa/bfa_fcpim.h 2011-11-16 18:39:07.000000000 -0500
11590 @@ -37,6 +37,7 @@ struct bfa_iotag_s {
11591 struct bfa_itn_s {
11592 bfa_isr_func_t isr;
11593 @@ -33620,9 +34487,9 @@ diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcpim.h linux-3.1.3/drivers/scsi/bfa
11594 int num_ioim_reqs;
11595 int num_fwtio_reqs;
11596 int num_itns;
11597 -diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c
11598 ---- linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-11 15:19:27.000000000 -0500
11599 -+++ linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-16 18:40:22.000000000 -0500
11600 +diff -urNp linux-3.1.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.1.4/drivers/scsi/bfa/bfa_fcs_lport.c
11601 +--- linux-3.1.4/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-11 15:19:27.000000000 -0500
11602 ++++ linux-3.1.4/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-16 18:40:22.000000000 -0500
11603 @@ -1700,6 +1700,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
11604 u16 len, count;
11605 u16 templen;
11606 @@ -33641,9 +34508,9 @@ diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.1.3/drivers/scsi
11607 /*
11608 * get port attributes
11609 */
11610 -diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c
11611 ---- linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-11 15:19:27.000000000 -0500
11612 -+++ linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-16 18:40:22.000000000 -0500
11613 +diff -urNp linux-3.1.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.1.4/drivers/scsi/bfa/bfa_fcs_rport.c
11614 +--- linux-3.1.4/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-11 15:19:27.000000000 -0500
11615 ++++ linux-3.1.4/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-16 18:40:22.000000000 -0500
11616 @@ -1871,6 +1871,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
11617 struct fc_rpsc_speed_info_s speeds;
11618 struct bfa_port_attr_s pport_attr;
11619 @@ -33653,9 +34520,9 @@ diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.1.3/drivers/scsi
11620 bfa_trc(port->fcs, rx_fchs->s_id);
11621 bfa_trc(port->fcs, rx_fchs->d_id);
11622
11623 -diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa.h linux-3.1.3/drivers/scsi/bfa/bfa.h
11624 ---- linux-3.1.3/drivers/scsi/bfa/bfa.h 2011-11-11 15:19:27.000000000 -0500
11625 -+++ linux-3.1.3/drivers/scsi/bfa/bfa.h 2011-11-16 18:39:07.000000000 -0500
11626 +diff -urNp linux-3.1.4/drivers/scsi/bfa/bfa.h linux-3.1.4/drivers/scsi/bfa/bfa.h
11627 +--- linux-3.1.4/drivers/scsi/bfa/bfa.h 2011-11-11 15:19:27.000000000 -0500
11628 ++++ linux-3.1.4/drivers/scsi/bfa/bfa.h 2011-11-16 18:39:07.000000000 -0500
11629 @@ -196,7 +196,7 @@ struct bfa_hwif_s {
11630 u32 *end);
11631 int cpe_vec_q0;
11632 @@ -33665,9 +34532,9 @@ diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa.h linux-3.1.3/drivers/scsi/bfa/bfa.h
11633 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
11634
11635 struct bfa_faa_cbfn_s {
11636 -diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h
11637 ---- linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h 2011-11-11 15:19:27.000000000 -0500
11638 -+++ linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h 2011-11-16 18:39:07.000000000 -0500
11639 +diff -urNp linux-3.1.4/drivers/scsi/bfa/bfa_ioc.h linux-3.1.4/drivers/scsi/bfa/bfa_ioc.h
11640 +--- linux-3.1.4/drivers/scsi/bfa/bfa_ioc.h 2011-11-11 15:19:27.000000000 -0500
11641 ++++ linux-3.1.4/drivers/scsi/bfa/bfa_ioc.h 2011-11-16 18:39:07.000000000 -0500
11642 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
11643 bfa_ioc_disable_cbfn_t disable_cbfn;
11644 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
11645 @@ -33686,9 +34553,9 @@ diff -urNp linux-3.1.3/drivers/scsi/bfa/bfa_ioc.h linux-3.1.3/drivers/scsi/bfa/b
11646
11647 /*
11648 * Queue element to wait for room in request queue. FIFO order is
11649 -diff -urNp linux-3.1.3/drivers/scsi/BusLogic.c linux-3.1.3/drivers/scsi/BusLogic.c
11650 ---- linux-3.1.3/drivers/scsi/BusLogic.c 2011-11-11 15:19:27.000000000 -0500
11651 -+++ linux-3.1.3/drivers/scsi/BusLogic.c 2011-11-16 18:40:22.000000000 -0500
11652 +diff -urNp linux-3.1.4/drivers/scsi/BusLogic.c linux-3.1.4/drivers/scsi/BusLogic.c
11653 +--- linux-3.1.4/drivers/scsi/BusLogic.c 2011-11-11 15:19:27.000000000 -0500
11654 ++++ linux-3.1.4/drivers/scsi/BusLogic.c 2011-11-16 18:40:22.000000000 -0500
11655 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
11656 static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
11657 *PrototypeHostAdapter)
11658 @@ -33698,9 +34565,9 @@ diff -urNp linux-3.1.3/drivers/scsi/BusLogic.c linux-3.1.3/drivers/scsi/BusLogic
11659 /*
11660 If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
11661 Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
11662 -diff -urNp linux-3.1.3/drivers/scsi/dpt_i2o.c linux-3.1.3/drivers/scsi/dpt_i2o.c
11663 ---- linux-3.1.3/drivers/scsi/dpt_i2o.c 2011-11-11 15:19:27.000000000 -0500
11664 -+++ linux-3.1.3/drivers/scsi/dpt_i2o.c 2011-11-16 18:40:22.000000000 -0500
11665 +diff -urNp linux-3.1.4/drivers/scsi/dpt_i2o.c linux-3.1.4/drivers/scsi/dpt_i2o.c
11666 +--- linux-3.1.4/drivers/scsi/dpt_i2o.c 2011-11-11 15:19:27.000000000 -0500
11667 ++++ linux-3.1.4/drivers/scsi/dpt_i2o.c 2011-11-16 18:40:22.000000000 -0500
11668 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
11669 dma_addr_t addr;
11670 ulong flags = 0;
11671 @@ -33719,9 +34586,9 @@ diff -urNp linux-3.1.3/drivers/scsi/dpt_i2o.c linux-3.1.3/drivers/scsi/dpt_i2o.c
11672 memset(msg, 0 , sizeof(msg));
11673 len = scsi_bufflen(cmd);
11674 direction = 0x00000000;
11675 -diff -urNp linux-3.1.3/drivers/scsi/eata.c linux-3.1.3/drivers/scsi/eata.c
11676 ---- linux-3.1.3/drivers/scsi/eata.c 2011-11-11 15:19:27.000000000 -0500
11677 -+++ linux-3.1.3/drivers/scsi/eata.c 2011-11-16 18:40:22.000000000 -0500
11678 +diff -urNp linux-3.1.4/drivers/scsi/eata.c linux-3.1.4/drivers/scsi/eata.c
11679 +--- linux-3.1.4/drivers/scsi/eata.c 2011-11-11 15:19:27.000000000 -0500
11680 ++++ linux-3.1.4/drivers/scsi/eata.c 2011-11-16 18:40:22.000000000 -0500
11681 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
11682 struct hostdata *ha;
11683 char name[16];
11684 @@ -33731,9 +34598,9 @@ diff -urNp linux-3.1.3/drivers/scsi/eata.c linux-3.1.3/drivers/scsi/eata.c
11685 sprintf(name, "%s%d", driver_name, j);
11686
11687 if (!request_region(port_base, REGION_SIZE, driver_name)) {
11688 -diff -urNp linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c
11689 ---- linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-11 15:19:27.000000000 -0500
11690 -+++ linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-16 18:40:22.000000000 -0500
11691 +diff -urNp linux-3.1.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.1.4/drivers/scsi/fcoe/fcoe_ctlr.c
11692 +--- linux-3.1.4/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-11 15:19:27.000000000 -0500
11693 ++++ linux-3.1.4/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-16 18:40:22.000000000 -0500
11694 @@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
11695 } buf;
11696 int rc;
11697 @@ -33743,9 +34610,9 @@ diff -urNp linux-3.1.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.1.3/drivers/scsi/fc
11698 fiph = (struct fip_header *)skb->data;
11699 sub = fiph->fip_subcode;
11700
11701 -diff -urNp linux-3.1.3/drivers/scsi/gdth.c linux-3.1.3/drivers/scsi/gdth.c
11702 ---- linux-3.1.3/drivers/scsi/gdth.c 2011-11-11 15:19:27.000000000 -0500
11703 -+++ linux-3.1.3/drivers/scsi/gdth.c 2011-11-16 18:40:22.000000000 -0500
11704 +diff -urNp linux-3.1.4/drivers/scsi/gdth.c linux-3.1.4/drivers/scsi/gdth.c
11705 +--- linux-3.1.4/drivers/scsi/gdth.c 2011-11-11 15:19:27.000000000 -0500
11706 ++++ linux-3.1.4/drivers/scsi/gdth.c 2011-11-16 18:40:22.000000000 -0500
11707 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
11708 unsigned long flags;
11709 gdth_ha_str *ha;
11710 @@ -33783,9 +34650,9 @@ diff -urNp linux-3.1.3/drivers/scsi/gdth.c linux-3.1.3/drivers/scsi/gdth.c
11711 memset(cmnd, 0xff, MAX_COMMAND_SIZE);
11712
11713 TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
11714 -diff -urNp linux-3.1.3/drivers/scsi/gdth_proc.c linux-3.1.3/drivers/scsi/gdth_proc.c
11715 ---- linux-3.1.3/drivers/scsi/gdth_proc.c 2011-11-11 15:19:27.000000000 -0500
11716 -+++ linux-3.1.3/drivers/scsi/gdth_proc.c 2011-11-16 18:40:22.000000000 -0500
11717 +diff -urNp linux-3.1.4/drivers/scsi/gdth_proc.c linux-3.1.4/drivers/scsi/gdth_proc.c
11718 +--- linux-3.1.4/drivers/scsi/gdth_proc.c 2011-11-11 15:19:27.000000000 -0500
11719 ++++ linux-3.1.4/drivers/scsi/gdth_proc.c 2011-11-16 18:40:22.000000000 -0500
11720 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
11721 u64 paddr;
11722
11723 @@ -33805,9 +34672,9 @@ diff -urNp linux-3.1.3/drivers/scsi/gdth_proc.c linux-3.1.3/drivers/scsi/gdth_pr
11724 gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
11725 estr = kmalloc(sizeof(*estr), GFP_KERNEL);
11726 if (!gdtcmd || !estr)
11727 -diff -urNp linux-3.1.3/drivers/scsi/hosts.c linux-3.1.3/drivers/scsi/hosts.c
11728 ---- linux-3.1.3/drivers/scsi/hosts.c 2011-11-11 15:19:27.000000000 -0500
11729 -+++ linux-3.1.3/drivers/scsi/hosts.c 2011-11-16 18:39:07.000000000 -0500
11730 +diff -urNp linux-3.1.4/drivers/scsi/hosts.c linux-3.1.4/drivers/scsi/hosts.c
11731 +--- linux-3.1.4/drivers/scsi/hosts.c 2011-11-11 15:19:27.000000000 -0500
11732 ++++ linux-3.1.4/drivers/scsi/hosts.c 2011-11-16 18:39:07.000000000 -0500
11733 @@ -42,7 +42,7 @@
11734 #include "scsi_logging.h"
11735
11736 @@ -33826,9 +34693,9 @@ diff -urNp linux-3.1.3/drivers/scsi/hosts.c linux-3.1.3/drivers/scsi/hosts.c
11737 shost->dma_channel = 0xff;
11738
11739 /* These three are default values which can be overridden */
11740 -diff -urNp linux-3.1.3/drivers/scsi/hpsa.c linux-3.1.3/drivers/scsi/hpsa.c
11741 ---- linux-3.1.3/drivers/scsi/hpsa.c 2011-11-26 19:57:29.000000000 -0500
11742 -+++ linux-3.1.3/drivers/scsi/hpsa.c 2011-11-26 20:00:43.000000000 -0500
11743 +diff -urNp linux-3.1.4/drivers/scsi/hpsa.c linux-3.1.4/drivers/scsi/hpsa.c
11744 +--- linux-3.1.4/drivers/scsi/hpsa.c 2011-11-26 19:57:29.000000000 -0500
11745 ++++ linux-3.1.4/drivers/scsi/hpsa.c 2011-11-26 20:00:43.000000000 -0500
11746 @@ -499,7 +499,7 @@ static inline u32 next_command(struct ct
11747 u32 a;
11748
11749 @@ -33943,9 +34810,9 @@ diff -urNp linux-3.1.3/drivers/scsi/hpsa.c linux-3.1.3/drivers/scsi/hpsa.c
11750 h->transMethod = CFGTBL_Trans_Performant;
11751 }
11752
11753 -diff -urNp linux-3.1.3/drivers/scsi/hpsa.h linux-3.1.3/drivers/scsi/hpsa.h
11754 ---- linux-3.1.3/drivers/scsi/hpsa.h 2011-11-11 15:19:27.000000000 -0500
11755 -+++ linux-3.1.3/drivers/scsi/hpsa.h 2011-11-16 18:39:07.000000000 -0500
11756 +diff -urNp linux-3.1.4/drivers/scsi/hpsa.h linux-3.1.4/drivers/scsi/hpsa.h
11757 +--- linux-3.1.4/drivers/scsi/hpsa.h 2011-11-11 15:19:27.000000000 -0500
11758 ++++ linux-3.1.4/drivers/scsi/hpsa.h 2011-11-16 18:39:07.000000000 -0500
11759 @@ -73,7 +73,7 @@ struct ctlr_info {
11760 unsigned int msix_vector;
11761 unsigned int msi_vector;
11762 @@ -33955,9 +34822,9 @@ diff -urNp linux-3.1.3/drivers/scsi/hpsa.h linux-3.1.3/drivers/scsi/hpsa.h
11763
11764 /* queue and queue Info */
11765 struct list_head reqQ;
11766 -diff -urNp linux-3.1.3/drivers/scsi/ips.h linux-3.1.3/drivers/scsi/ips.h
11767 ---- linux-3.1.3/drivers/scsi/ips.h 2011-11-11 15:19:27.000000000 -0500
11768 -+++ linux-3.1.3/drivers/scsi/ips.h 2011-11-16 18:39:07.000000000 -0500
11769 +diff -urNp linux-3.1.4/drivers/scsi/ips.h linux-3.1.4/drivers/scsi/ips.h
11770 +--- linux-3.1.4/drivers/scsi/ips.h 2011-11-11 15:19:27.000000000 -0500
11771 ++++ linux-3.1.4/drivers/scsi/ips.h 2011-11-16 18:39:07.000000000 -0500
11772 @@ -1027,7 +1027,7 @@ typedef struct {
11773 int (*intr)(struct ips_ha *);
11774 void (*enableint)(struct ips_ha *);
11775 @@ -33967,9 +34834,9 @@ diff -urNp linux-3.1.3/drivers/scsi/ips.h linux-3.1.3/drivers/scsi/ips.h
11776
11777 typedef struct ips_ha {
11778 uint8_t ha_id[IPS_MAX_CHANNELS+1];
11779 -diff -urNp linux-3.1.3/drivers/scsi/libfc/fc_exch.c linux-3.1.3/drivers/scsi/libfc/fc_exch.c
11780 ---- linux-3.1.3/drivers/scsi/libfc/fc_exch.c 2011-11-11 15:19:27.000000000 -0500
11781 -+++ linux-3.1.3/drivers/scsi/libfc/fc_exch.c 2011-11-16 18:39:07.000000000 -0500
11782 +diff -urNp linux-3.1.4/drivers/scsi/libfc/fc_exch.c linux-3.1.4/drivers/scsi/libfc/fc_exch.c
11783 +--- linux-3.1.4/drivers/scsi/libfc/fc_exch.c 2011-11-11 15:19:27.000000000 -0500
11784 ++++ linux-3.1.4/drivers/scsi/libfc/fc_exch.c 2011-11-16 18:39:07.000000000 -0500
11785 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
11786 * all together if not used XXX
11787 */
11788 @@ -34091,9 +34958,9 @@ diff -urNp linux-3.1.3/drivers/scsi/libfc/fc_exch.c linux-3.1.3/drivers/scsi/lib
11789
11790 fc_frame_free(fp);
11791 }
11792 -diff -urNp linux-3.1.3/drivers/scsi/libsas/sas_ata.c linux-3.1.3/drivers/scsi/libsas/sas_ata.c
11793 ---- linux-3.1.3/drivers/scsi/libsas/sas_ata.c 2011-11-11 15:19:27.000000000 -0500
11794 -+++ linux-3.1.3/drivers/scsi/libsas/sas_ata.c 2011-11-16 18:39:07.000000000 -0500
11795 +diff -urNp linux-3.1.4/drivers/scsi/libsas/sas_ata.c linux-3.1.4/drivers/scsi/libsas/sas_ata.c
11796 +--- linux-3.1.4/drivers/scsi/libsas/sas_ata.c 2011-11-11 15:19:27.000000000 -0500
11797 ++++ linux-3.1.4/drivers/scsi/libsas/sas_ata.c 2011-11-16 18:39:07.000000000 -0500
11798 @@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
11799 .postreset = ata_std_postreset,
11800 .error_handler = ata_std_error_handler,
11801 @@ -34103,9 +34970,9 @@ diff -urNp linux-3.1.3/drivers/scsi/libsas/sas_ata.c linux-3.1.3/drivers/scsi/li
11802 .qc_prep = ata_noop_qc_prep,
11803 .qc_issue = sas_ata_qc_issue,
11804 .qc_fill_rtf = sas_ata_qc_fill_rtf,
11805 -diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c
11806 ---- linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-11 15:19:27.000000000 -0500
11807 -+++ linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-16 18:40:22.000000000 -0500
11808 +diff -urNp linux-3.1.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.1.4/drivers/scsi/lpfc/lpfc_debugfs.c
11809 +--- linux-3.1.4/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-11 15:19:27.000000000 -0500
11810 ++++ linux-3.1.4/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-16 18:40:22.000000000 -0500
11811 @@ -105,7 +105,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
11812
11813 #include <linux/debugfs.h>
11814 @@ -34185,9 +35052,9 @@ diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.1.3/drivers/scsi
11815
11816 snprintf(name, sizeof(name), "discovery_trace");
11817 vport->debug_disc_trc =
11818 -diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc.h linux-3.1.3/drivers/scsi/lpfc/lpfc.h
11819 ---- linux-3.1.3/drivers/scsi/lpfc/lpfc.h 2011-11-11 15:19:27.000000000 -0500
11820 -+++ linux-3.1.3/drivers/scsi/lpfc/lpfc.h 2011-11-16 18:39:07.000000000 -0500
11821 +diff -urNp linux-3.1.4/drivers/scsi/lpfc/lpfc.h linux-3.1.4/drivers/scsi/lpfc/lpfc.h
11822 +--- linux-3.1.4/drivers/scsi/lpfc/lpfc.h 2011-11-11 15:19:27.000000000 -0500
11823 ++++ linux-3.1.4/drivers/scsi/lpfc/lpfc.h 2011-11-16 18:39:07.000000000 -0500
11824 @@ -425,7 +425,7 @@ struct lpfc_vport {
11825 struct dentry *debug_nodelist;
11826 struct dentry *vport_debugfs_root;
11827 @@ -34217,9 +35084,9 @@ diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc.h linux-3.1.3/drivers/scsi/lpfc/lp
11828 /* iDiag debugfs sub-directory */
11829 struct dentry *idiag_root;
11830 struct dentry *idiag_pci_cfg;
11831 -diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c
11832 ---- linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c 2011-11-11 15:19:27.000000000 -0500
11833 -+++ linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c 2011-11-16 18:39:07.000000000 -0500
11834 +diff -urNp linux-3.1.4/drivers/scsi/lpfc/lpfc_init.c linux-3.1.4/drivers/scsi/lpfc/lpfc_init.c
11835 +--- linux-3.1.4/drivers/scsi/lpfc/lpfc_init.c 2011-11-11 15:19:27.000000000 -0500
11836 ++++ linux-3.1.4/drivers/scsi/lpfc/lpfc_init.c 2011-11-16 18:39:07.000000000 -0500
11837 @@ -9969,8 +9969,10 @@ lpfc_init(void)
11838 printk(LPFC_COPYRIGHT "\n");
11839
11840 @@ -34233,9 +35100,9 @@ diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_init.c linux-3.1.3/drivers/scsi/lp
11841 }
11842 lpfc_transport_template =
11843 fc_attach_transport(&lpfc_transport_functions);
11844 -diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c
11845 ---- linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-11 15:19:27.000000000 -0500
11846 -+++ linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-16 18:39:07.000000000 -0500
11847 +diff -urNp linux-3.1.4/drivers/scsi/lpfc/lpfc_scsi.c linux-3.1.4/drivers/scsi/lpfc/lpfc_scsi.c
11848 +--- linux-3.1.4/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-11 15:19:27.000000000 -0500
11849 ++++ linux-3.1.4/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-16 18:39:07.000000000 -0500
11850 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
11851 uint32_t evt_posted;
11852
11853 @@ -34287,9 +35154,9 @@ diff -urNp linux-3.1.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.1.3/drivers/scsi/lp
11854 }
11855
11856 /**
11857 -diff -urNp linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c
11858 ---- linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-11 15:19:27.000000000 -0500
11859 -+++ linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-16 18:40:22.000000000 -0500
11860 +diff -urNp linux-3.1.4/drivers/scsi/megaraid/megaraid_mbox.c linux-3.1.4/drivers/scsi/megaraid/megaraid_mbox.c
11861 +--- linux-3.1.4/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-11 15:19:27.000000000 -0500
11862 ++++ linux-3.1.4/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-16 18:40:22.000000000 -0500
11863 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
11864 int rval;
11865 int i;
11866 @@ -34299,9 +35166,9 @@ diff -urNp linux-3.1.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.1.3/drivers
11867 // Allocate memory for the base list of scb for management module.
11868 adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
11869
11870 -diff -urNp linux-3.1.3/drivers/scsi/osd/osd_initiator.c linux-3.1.3/drivers/scsi/osd/osd_initiator.c
11871 ---- linux-3.1.3/drivers/scsi/osd/osd_initiator.c 2011-11-11 15:19:27.000000000 -0500
11872 -+++ linux-3.1.3/drivers/scsi/osd/osd_initiator.c 2011-11-16 18:40:22.000000000 -0500
11873 +diff -urNp linux-3.1.4/drivers/scsi/osd/osd_initiator.c linux-3.1.4/drivers/scsi/osd/osd_initiator.c
11874 +--- linux-3.1.4/drivers/scsi/osd/osd_initiator.c 2011-11-11 15:19:27.000000000 -0500
11875 ++++ linux-3.1.4/drivers/scsi/osd/osd_initiator.c 2011-11-16 18:40:22.000000000 -0500
11876 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
11877 int nelem = ARRAY_SIZE(get_attrs), a = 0;
11878 int ret;
11879 @@ -34311,9 +35178,9 @@ diff -urNp linux-3.1.3/drivers/scsi/osd/osd_initiator.c linux-3.1.3/drivers/scsi
11880 or = osd_start_request(od, GFP_KERNEL);
11881 if (!or)
11882 return -ENOMEM;
11883 -diff -urNp linux-3.1.3/drivers/scsi/pmcraid.c linux-3.1.3/drivers/scsi/pmcraid.c
11884 ---- linux-3.1.3/drivers/scsi/pmcraid.c 2011-11-11 15:19:27.000000000 -0500
11885 -+++ linux-3.1.3/drivers/scsi/pmcraid.c 2011-11-16 18:39:07.000000000 -0500
11886 +diff -urNp linux-3.1.4/drivers/scsi/pmcraid.c linux-3.1.4/drivers/scsi/pmcraid.c
11887 +--- linux-3.1.4/drivers/scsi/pmcraid.c 2011-11-11 15:19:27.000000000 -0500
11888 ++++ linux-3.1.4/drivers/scsi/pmcraid.c 2011-11-16 18:39:07.000000000 -0500
11889 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
11890 res->scsi_dev = scsi_dev;
11891 scsi_dev->hostdata = res;
11892 @@ -34384,9 +35251,9 @@ diff -urNp linux-3.1.3/drivers/scsi/pmcraid.c linux-3.1.3/drivers/scsi/pmcraid.c
11893 schedule_work(&pinstance->worker_q);
11894 return rc;
11895
11896 -diff -urNp linux-3.1.3/drivers/scsi/pmcraid.h linux-3.1.3/drivers/scsi/pmcraid.h
11897 ---- linux-3.1.3/drivers/scsi/pmcraid.h 2011-11-11 15:19:27.000000000 -0500
11898 -+++ linux-3.1.3/drivers/scsi/pmcraid.h 2011-11-16 18:39:07.000000000 -0500
11899 +diff -urNp linux-3.1.4/drivers/scsi/pmcraid.h linux-3.1.4/drivers/scsi/pmcraid.h
11900 +--- linux-3.1.4/drivers/scsi/pmcraid.h 2011-11-11 15:19:27.000000000 -0500
11901 ++++ linux-3.1.4/drivers/scsi/pmcraid.h 2011-11-16 18:39:07.000000000 -0500
11902 @@ -749,7 +749,7 @@ struct pmcraid_instance {
11903 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
11904
11905 @@ -34416,9 +35283,9 @@ diff -urNp linux-3.1.3/drivers/scsi/pmcraid.h linux-3.1.3/drivers/scsi/pmcraid.h
11906
11907 /* To indicate add/delete/modify during CCN */
11908 u8 change_detected;
11909 -diff -urNp linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h
11910 ---- linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h 2011-11-11 15:19:27.000000000 -0500
11911 -+++ linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h 2011-11-16 18:39:07.000000000 -0500
11912 +diff -urNp linux-3.1.4/drivers/scsi/qla2xxx/qla_def.h linux-3.1.4/drivers/scsi/qla2xxx/qla_def.h
11913 +--- linux-3.1.4/drivers/scsi/qla2xxx/qla_def.h 2011-11-11 15:19:27.000000000 -0500
11914 ++++ linux-3.1.4/drivers/scsi/qla2xxx/qla_def.h 2011-11-16 18:39:07.000000000 -0500
11915 @@ -2244,7 +2244,7 @@ struct isp_operations {
11916 int (*get_flash_version) (struct scsi_qla_host *, void *);
11917 int (*start_scsi) (srb_t *);
11918 @@ -34428,9 +35295,9 @@ diff -urNp linux-3.1.3/drivers/scsi/qla2xxx/qla_def.h linux-3.1.3/drivers/scsi/q
11919
11920 /* MSI-X Support *************************************************************/
11921
11922 -diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h
11923 ---- linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h 2011-11-11 15:19:27.000000000 -0500
11924 -+++ linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h 2011-11-16 18:39:07.000000000 -0500
11925 +diff -urNp linux-3.1.4/drivers/scsi/qla4xxx/ql4_def.h linux-3.1.4/drivers/scsi/qla4xxx/ql4_def.h
11926 +--- linux-3.1.4/drivers/scsi/qla4xxx/ql4_def.h 2011-11-11 15:19:27.000000000 -0500
11927 ++++ linux-3.1.4/drivers/scsi/qla4xxx/ql4_def.h 2011-11-16 18:39:07.000000000 -0500
11928 @@ -256,7 +256,7 @@ struct ddb_entry {
11929 atomic_t retry_relogin_timer; /* Min Time between relogins
11930 * (4000 only) */
11931 @@ -34440,9 +35307,9 @@ diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.1.3/drivers/scsi/q
11932 * retried */
11933
11934 uint16_t port;
11935 -diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c
11936 ---- linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c 2011-11-11 15:19:27.000000000 -0500
11937 -+++ linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c 2011-11-16 18:39:07.000000000 -0500
11938 +diff -urNp linux-3.1.4/drivers/scsi/qla4xxx/ql4_init.c linux-3.1.4/drivers/scsi/qla4xxx/ql4_init.c
11939 +--- linux-3.1.4/drivers/scsi/qla4xxx/ql4_init.c 2011-11-11 15:19:27.000000000 -0500
11940 ++++ linux-3.1.4/drivers/scsi/qla4xxx/ql4_init.c 2011-11-16 18:39:07.000000000 -0500
11941 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
11942 ddb_entry->fw_ddb_index = fw_ddb_index;
11943 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
11944 @@ -34461,9 +35328,9 @@ diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.1.3/drivers/scsi/
11945 atomic_set(&ddb_entry->relogin_timer, 0);
11946 clear_bit(DF_RELOGIN, &ddb_entry->flags);
11947 iscsi_unblock_session(ddb_entry->sess);
11948 -diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c
11949 ---- linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c 2011-11-11 15:19:27.000000000 -0500
11950 -+++ linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c 2011-11-16 18:39:07.000000000 -0500
11951 +diff -urNp linux-3.1.4/drivers/scsi/qla4xxx/ql4_os.c linux-3.1.4/drivers/scsi/qla4xxx/ql4_os.c
11952 +--- linux-3.1.4/drivers/scsi/qla4xxx/ql4_os.c 2011-11-11 15:19:27.000000000 -0500
11953 ++++ linux-3.1.4/drivers/scsi/qla4xxx/ql4_os.c 2011-11-16 18:39:07.000000000 -0500
11954 @@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
11955 ddb_entry->fw_ddb_device_state ==
11956 DDB_DS_SESSION_FAILED) {
11957 @@ -34480,9 +35347,9 @@ diff -urNp linux-3.1.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.1.3/drivers/scsi/ql
11958 relogin_retry_count))
11959 );
11960 start_dpc++;
11961 -diff -urNp linux-3.1.3/drivers/scsi/scsi.c linux-3.1.3/drivers/scsi/scsi.c
11962 ---- linux-3.1.3/drivers/scsi/scsi.c 2011-11-11 15:19:27.000000000 -0500
11963 -+++ linux-3.1.3/drivers/scsi/scsi.c 2011-11-16 18:39:07.000000000 -0500
11964 +diff -urNp linux-3.1.4/drivers/scsi/scsi.c linux-3.1.4/drivers/scsi/scsi.c
11965 +--- linux-3.1.4/drivers/scsi/scsi.c 2011-11-11 15:19:27.000000000 -0500
11966 ++++ linux-3.1.4/drivers/scsi/scsi.c 2011-11-16 18:39:07.000000000 -0500
11967 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
11968 unsigned long timeout;
11969 int rtn = 0;
11970 @@ -34492,9 +35359,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi.c linux-3.1.3/drivers/scsi/scsi.c
11971
11972 /* check if the device is still usable */
11973 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
11974 -diff -urNp linux-3.1.3/drivers/scsi/scsi_debug.c linux-3.1.3/drivers/scsi/scsi_debug.c
11975 ---- linux-3.1.3/drivers/scsi/scsi_debug.c 2011-11-11 15:19:27.000000000 -0500
11976 -+++ linux-3.1.3/drivers/scsi/scsi_debug.c 2011-11-16 18:40:22.000000000 -0500
11977 +diff -urNp linux-3.1.4/drivers/scsi/scsi_debug.c linux-3.1.4/drivers/scsi/scsi_debug.c
11978 +--- linux-3.1.4/drivers/scsi/scsi_debug.c 2011-11-11 15:19:27.000000000 -0500
11979 ++++ linux-3.1.4/drivers/scsi/scsi_debug.c 2011-11-16 18:40:22.000000000 -0500
11980 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
11981 unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
11982 unsigned char *cmd = (unsigned char *)scp->cmnd;
11983 @@ -34513,9 +35380,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi_debug.c linux-3.1.3/drivers/scsi/scsi_d
11984 if ((errsts = check_readiness(scp, 1, devip)))
11985 return errsts;
11986 memset(arr, 0, sizeof(arr));
11987 -diff -urNp linux-3.1.3/drivers/scsi/scsi_lib.c linux-3.1.3/drivers/scsi/scsi_lib.c
11988 ---- linux-3.1.3/drivers/scsi/scsi_lib.c 2011-11-11 15:19:27.000000000 -0500
11989 -+++ linux-3.1.3/drivers/scsi/scsi_lib.c 2011-11-16 18:39:07.000000000 -0500
11990 +diff -urNp linux-3.1.4/drivers/scsi/scsi_lib.c linux-3.1.4/drivers/scsi/scsi_lib.c
11991 +--- linux-3.1.4/drivers/scsi/scsi_lib.c 2011-11-11 15:19:27.000000000 -0500
11992 ++++ linux-3.1.4/drivers/scsi/scsi_lib.c 2011-11-16 18:39:07.000000000 -0500
11993 @@ -1413,7 +1413,7 @@ static void scsi_kill_request(struct req
11994 shost = sdev->host;
11995 scsi_init_cmd_errh(cmd);
11996 @@ -34537,9 +35404,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi_lib.c linux-3.1.3/drivers/scsi/scsi_lib
11997
11998 disposition = scsi_decide_disposition(cmd);
11999 if (disposition != SUCCESS &&
12000 -diff -urNp linux-3.1.3/drivers/scsi/scsi_sysfs.c linux-3.1.3/drivers/scsi/scsi_sysfs.c
12001 ---- linux-3.1.3/drivers/scsi/scsi_sysfs.c 2011-11-11 15:19:27.000000000 -0500
12002 -+++ linux-3.1.3/drivers/scsi/scsi_sysfs.c 2011-11-16 18:39:07.000000000 -0500
12003 +diff -urNp linux-3.1.4/drivers/scsi/scsi_sysfs.c linux-3.1.4/drivers/scsi/scsi_sysfs.c
12004 +--- linux-3.1.4/drivers/scsi/scsi_sysfs.c 2011-11-11 15:19:27.000000000 -0500
12005 ++++ linux-3.1.4/drivers/scsi/scsi_sysfs.c 2011-11-16 18:39:07.000000000 -0500
12006 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev,
12007 char *buf) \
12008 { \
12009 @@ -34549,9 +35416,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi_sysfs.c linux-3.1.3/drivers/scsi/scsi_s
12010 return snprintf(buf, 20, "0x%llx\n", count); \
12011 } \
12012 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
12013 -diff -urNp linux-3.1.3/drivers/scsi/scsi_tgt_lib.c linux-3.1.3/drivers/scsi/scsi_tgt_lib.c
12014 ---- linux-3.1.3/drivers/scsi/scsi_tgt_lib.c 2011-11-11 15:19:27.000000000 -0500
12015 -+++ linux-3.1.3/drivers/scsi/scsi_tgt_lib.c 2011-11-16 18:39:07.000000000 -0500
12016 +diff -urNp linux-3.1.4/drivers/scsi/scsi_tgt_lib.c linux-3.1.4/drivers/scsi/scsi_tgt_lib.c
12017 +--- linux-3.1.4/drivers/scsi/scsi_tgt_lib.c 2011-11-11 15:19:27.000000000 -0500
12018 ++++ linux-3.1.4/drivers/scsi/scsi_tgt_lib.c 2011-11-16 18:39:07.000000000 -0500
12019 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
12020 int err;
12021
12022 @@ -34561,9 +35428,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi_tgt_lib.c linux-3.1.3/drivers/scsi/scsi
12023 if (err) {
12024 /*
12025 * TODO: need to fixup sg_tablesize, max_segment_size,
12026 -diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_fc.c linux-3.1.3/drivers/scsi/scsi_transport_fc.c
12027 ---- linux-3.1.3/drivers/scsi/scsi_transport_fc.c 2011-11-11 15:19:27.000000000 -0500
12028 -+++ linux-3.1.3/drivers/scsi/scsi_transport_fc.c 2011-11-16 18:39:07.000000000 -0500
12029 +diff -urNp linux-3.1.4/drivers/scsi/scsi_transport_fc.c linux-3.1.4/drivers/scsi/scsi_transport_fc.c
12030 +--- linux-3.1.4/drivers/scsi/scsi_transport_fc.c 2011-11-11 15:19:27.000000000 -0500
12031 ++++ linux-3.1.4/drivers/scsi/scsi_transport_fc.c 2011-11-16 18:39:07.000000000 -0500
12032 @@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
12033 * Netlink Infrastructure
12034 */
12035 @@ -34600,9 +35467,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_fc.c linux-3.1.3/drivers/scsi
12036 return -EINVAL;
12037 /*
12038 * Check for overflow; dev_loss_tmo is u32
12039 -diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c
12040 ---- linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c 2011-11-11 15:19:27.000000000 -0500
12041 -+++ linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c 2011-11-16 18:39:07.000000000 -0500
12042 +diff -urNp linux-3.1.4/drivers/scsi/scsi_transport_iscsi.c linux-3.1.4/drivers/scsi/scsi_transport_iscsi.c
12043 +--- linux-3.1.4/drivers/scsi/scsi_transport_iscsi.c 2011-11-11 15:19:27.000000000 -0500
12044 ++++ linux-3.1.4/drivers/scsi/scsi_transport_iscsi.c 2011-11-16 18:39:07.000000000 -0500
12045 @@ -83,7 +83,7 @@ struct iscsi_internal {
12046 struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
12047 };
12048 @@ -34630,9 +35497,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_iscsi.c linux-3.1.3/drivers/s
12049
12050 err = class_register(&iscsi_transport_class);
12051 if (err)
12052 -diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_srp.c linux-3.1.3/drivers/scsi/scsi_transport_srp.c
12053 ---- linux-3.1.3/drivers/scsi/scsi_transport_srp.c 2011-11-11 15:19:27.000000000 -0500
12054 -+++ linux-3.1.3/drivers/scsi/scsi_transport_srp.c 2011-11-16 18:39:07.000000000 -0500
12055 +diff -urNp linux-3.1.4/drivers/scsi/scsi_transport_srp.c linux-3.1.4/drivers/scsi/scsi_transport_srp.c
12056 +--- linux-3.1.4/drivers/scsi/scsi_transport_srp.c 2011-11-11 15:19:27.000000000 -0500
12057 ++++ linux-3.1.4/drivers/scsi/scsi_transport_srp.c 2011-11-16 18:39:07.000000000 -0500
12058 @@ -33,7 +33,7 @@
12059 #include "scsi_transport_srp_internal.h"
12060
12061 @@ -34660,9 +35527,9 @@ diff -urNp linux-3.1.3/drivers/scsi/scsi_transport_srp.c linux-3.1.3/drivers/scs
12062 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
12063
12064 transport_setup_device(&rport->dev);
12065 -diff -urNp linux-3.1.3/drivers/scsi/sg.c linux-3.1.3/drivers/scsi/sg.c
12066 ---- linux-3.1.3/drivers/scsi/sg.c 2011-11-11 15:19:27.000000000 -0500
12067 -+++ linux-3.1.3/drivers/scsi/sg.c 2011-11-16 18:39:07.000000000 -0500
12068 +diff -urNp linux-3.1.4/drivers/scsi/sg.c linux-3.1.4/drivers/scsi/sg.c
12069 +--- linux-3.1.4/drivers/scsi/sg.c 2011-11-11 15:19:27.000000000 -0500
12070 ++++ linux-3.1.4/drivers/scsi/sg.c 2011-11-16 18:39:07.000000000 -0500
12071 @@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int
12072 sdp->disk->disk_name,
12073 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
12074 @@ -34690,9 +35557,9 @@ diff -urNp linux-3.1.3/drivers/scsi/sg.c linux-3.1.3/drivers/scsi/sg.c
12075
12076 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
12077 if (!sg_proc_sgp)
12078 -diff -urNp linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c
12079 ---- linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-11 15:19:27.000000000 -0500
12080 -+++ linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-16 18:40:22.000000000 -0500
12081 +diff -urNp linux-3.1.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.1.4/drivers/scsi/sym53c8xx_2/sym_glue.c
12082 +--- linux-3.1.4/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-11 15:19:27.000000000 -0500
12083 ++++ linux-3.1.4/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-16 18:40:22.000000000 -0500
12084 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
12085 int do_iounmap = 0;
12086 int do_disable_device = 1;
12087 @@ -34702,9 +35569,9 @@ diff -urNp linux-3.1.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.1.3/drivers/s
12088 memset(&sym_dev, 0, sizeof(sym_dev));
12089 memset(&nvram, 0, sizeof(nvram));
12090 sym_dev.pdev = pdev;
12091 -diff -urNp linux-3.1.3/drivers/scsi/vmw_pvscsi.c linux-3.1.3/drivers/scsi/vmw_pvscsi.c
12092 ---- linux-3.1.3/drivers/scsi/vmw_pvscsi.c 2011-11-11 15:19:27.000000000 -0500
12093 -+++ linux-3.1.3/drivers/scsi/vmw_pvscsi.c 2011-11-16 18:40:22.000000000 -0500
12094 +diff -urNp linux-3.1.4/drivers/scsi/vmw_pvscsi.c linux-3.1.4/drivers/scsi/vmw_pvscsi.c
12095 +--- linux-3.1.4/drivers/scsi/vmw_pvscsi.c 2011-11-11 15:19:27.000000000 -0500
12096 ++++ linux-3.1.4/drivers/scsi/vmw_pvscsi.c 2011-11-16 18:40:22.000000000 -0500
12097 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
12098 dma_addr_t base;
12099 unsigned i;
12100 @@ -34714,9 +35581,9 @@ diff -urNp linux-3.1.3/drivers/scsi/vmw_pvscsi.c linux-3.1.3/drivers/scsi/vmw_pv
12101 cmd.ringsStatePPN = adapter->ringStatePA >> PAGE_SHIFT;
12102 cmd.reqRingNumPages = adapter->req_pages;
12103 cmd.cmpRingNumPages = adapter->cmp_pages;
12104 -diff -urNp linux-3.1.3/drivers/spi/spi.c linux-3.1.3/drivers/spi/spi.c
12105 ---- linux-3.1.3/drivers/spi/spi.c 2011-11-11 15:19:27.000000000 -0500
12106 -+++ linux-3.1.3/drivers/spi/spi.c 2011-11-16 18:39:07.000000000 -0500
12107 +diff -urNp linux-3.1.4/drivers/spi/spi.c linux-3.1.4/drivers/spi/spi.c
12108 +--- linux-3.1.4/drivers/spi/spi.c 2011-11-11 15:19:27.000000000 -0500
12109 ++++ linux-3.1.4/drivers/spi/spi.c 2011-11-16 18:39:07.000000000 -0500
12110 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
12111 EXPORT_SYMBOL_GPL(spi_bus_unlock);
12112
12113 @@ -34726,9 +35593,9 @@ diff -urNp linux-3.1.3/drivers/spi/spi.c linux-3.1.3/drivers/spi/spi.c
12114
12115 static u8 *buf;
12116
12117 -diff -urNp linux-3.1.3/drivers/spi/spi-dw-pci.c linux-3.1.3/drivers/spi/spi-dw-pci.c
12118 ---- linux-3.1.3/drivers/spi/spi-dw-pci.c 2011-11-11 15:19:27.000000000 -0500
12119 -+++ linux-3.1.3/drivers/spi/spi-dw-pci.c 2011-11-16 18:39:07.000000000 -0500
12120 +diff -urNp linux-3.1.4/drivers/spi/spi-dw-pci.c linux-3.1.4/drivers/spi/spi-dw-pci.c
12121 +--- linux-3.1.4/drivers/spi/spi-dw-pci.c 2011-11-11 15:19:27.000000000 -0500
12122 ++++ linux-3.1.4/drivers/spi/spi-dw-pci.c 2011-11-16 18:39:07.000000000 -0500
12123 @@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pd
12124 #define spi_resume NULL
12125 #endif
12126 @@ -34738,9 +35605,9 @@ diff -urNp linux-3.1.3/drivers/spi/spi-dw-pci.c linux-3.1.3/drivers/spi/spi-dw-p
12127 /* Intel MID platform SPI controller 0 */
12128 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
12129 {},
12130 -diff -urNp linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c
12131 ---- linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-11 15:19:27.000000000 -0500
12132 -+++ linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-16 18:39:07.000000000 -0500
12133 +diff -urNp linux-3.1.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.1.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c
12134 +--- linux-3.1.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-11 15:19:27.000000000 -0500
12135 ++++ linux-3.1.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-16 18:39:07.000000000 -0500
12136 @@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
12137 (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
12138
12139 @@ -34750,9 +35617,9 @@ diff -urNp linux-3.1.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.1.3/
12140 .ndo_init = NULL,
12141 .ndo_open = ar6000_open,
12142 .ndo_stop = ar6000_close,
12143 -diff -urNp linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
12144 ---- linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-11 15:19:27.000000000 -0500
12145 -+++ linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-16 18:39:07.000000000 -0500
12146 +diff -urNp linux-3.1.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.1.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
12147 +--- linux-3.1.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-11 15:19:27.000000000 -0500
12148 ++++ linux-3.1.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-16 18:39:07.000000000 -0500
12149 @@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
12150 typedef struct ar6k_pal_config_s
12151 {
12152 @@ -34762,9 +35629,9 @@ diff -urNp linux-3.1.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-
12153
12154 void register_pal_cb(ar6k_pal_config_t *palConfig_p);
12155 #endif /* _AR6K_PAL_H_ */
12156 -diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
12157 ---- linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-11 15:19:27.000000000 -0500
12158 -+++ linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-16 18:39:07.000000000 -0500
12159 +diff -urNp linux-3.1.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.1.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
12160 +--- linux-3.1.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-11 15:19:27.000000000 -0500
12161 ++++ linux-3.1.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-16 18:39:07.000000000 -0500
12162 @@ -451,14 +451,14 @@ static void brcmf_op_if(struct brcmf_if
12163 free_netdev(ifp->net);
12164 }
12165 @@ -34809,9 +35676,9 @@ diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.1.
12166
12167 #if defined(CONFIG_PM_SLEEP)
12168 atomic_set(&brcmf_mmc_suspend, false);
12169 -diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h
12170 ---- linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-11 15:19:27.000000000 -0500
12171 -+++ linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-16 18:39:07.000000000 -0500
12172 +diff -urNp linux-3.1.4/drivers/staging/brcm80211/brcmfmac/sdio_host.h linux-3.1.4/drivers/staging/brcm80211/brcmfmac/sdio_host.h
12173 +--- linux-3.1.4/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-11 15:19:27.000000000 -0500
12174 ++++ linux-3.1.4/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-16 18:39:07.000000000 -0500
12175 @@ -263,7 +263,7 @@ struct brcmf_sdioh_driver {
12176 u16 func, uint bustype, u32 regsva, void *param);
12177 /* detach from device */
12178 @@ -34821,9 +35688,9 @@ diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmfmac/sdio_host.h linux-3.1.
12179
12180 struct sdioh_info;
12181
12182 -diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
12183 ---- linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-11 15:19:27.000000000 -0500
12184 -+++ linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-16 18:39:07.000000000 -0500
12185 +diff -urNp linux-3.1.4/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h linux-3.1.4/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
12186 +--- linux-3.1.4/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-11 15:19:27.000000000 -0500
12187 ++++ linux-3.1.4/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h 2011-11-16 18:39:07.000000000 -0500
12188 @@ -591,7 +591,7 @@ struct phy_func_ptr {
12189 initfn_t carrsuppr;
12190 rxsigpwrfn_t rxsigpwr;
12191 @@ -34833,9 +35700,9 @@ diff -urNp linux-3.1.3/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h linux-3.
12192
12193 struct brcms_phy {
12194 struct brcms_phy_pub pubpi_ro;
12195 -diff -urNp linux-3.1.3/drivers/staging/et131x/et1310_tx.c linux-3.1.3/drivers/staging/et131x/et1310_tx.c
12196 ---- linux-3.1.3/drivers/staging/et131x/et1310_tx.c 2011-11-11 15:19:27.000000000 -0500
12197 -+++ linux-3.1.3/drivers/staging/et131x/et1310_tx.c 2011-11-16 18:39:07.000000000 -0500
12198 +diff -urNp linux-3.1.4/drivers/staging/et131x/et1310_tx.c linux-3.1.4/drivers/staging/et131x/et1310_tx.c
12199 +--- linux-3.1.4/drivers/staging/et131x/et1310_tx.c 2011-11-11 15:19:27.000000000 -0500
12200 ++++ linux-3.1.4/drivers/staging/et131x/et1310_tx.c 2011-11-16 18:39:07.000000000 -0500
12201 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
12202 struct net_device_stats *stats = &etdev->net_stats;
12203
12204 @@ -34851,9 +35718,9 @@ diff -urNp linux-3.1.3/drivers/staging/et131x/et1310_tx.c linux-3.1.3/drivers/st
12205
12206 if (tcb->skb) {
12207 stats->tx_bytes += tcb->skb->len;
12208 -diff -urNp linux-3.1.3/drivers/staging/et131x/et131x_adapter.h linux-3.1.3/drivers/staging/et131x/et131x_adapter.h
12209 ---- linux-3.1.3/drivers/staging/et131x/et131x_adapter.h 2011-11-11 15:19:27.000000000 -0500
12210 -+++ linux-3.1.3/drivers/staging/et131x/et131x_adapter.h 2011-11-16 18:39:07.000000000 -0500
12211 +diff -urNp linux-3.1.4/drivers/staging/et131x/et131x_adapter.h linux-3.1.4/drivers/staging/et131x/et131x_adapter.h
12212 +--- linux-3.1.4/drivers/staging/et131x/et131x_adapter.h 2011-11-11 15:19:27.000000000 -0500
12213 ++++ linux-3.1.4/drivers/staging/et131x/et131x_adapter.h 2011-11-16 18:39:07.000000000 -0500
12214 @@ -106,11 +106,11 @@ struct ce_stats {
12215 * operations
12216 */
12217 @@ -34869,9 +35736,9 @@ diff -urNp linux-3.1.3/drivers/staging/et131x/et131x_adapter.h linux-3.1.3/drive
12218 u32 norcvbuf; /* # Rx packets discarded */
12219 u32 noxmtbuf; /* # Tx packets discarded */
12220
12221 -diff -urNp linux-3.1.3/drivers/staging/hv/channel.c linux-3.1.3/drivers/staging/hv/channel.c
12222 ---- linux-3.1.3/drivers/staging/hv/channel.c 2011-11-11 15:19:27.000000000 -0500
12223 -+++ linux-3.1.3/drivers/staging/hv/channel.c 2011-11-16 18:39:07.000000000 -0500
12224 +diff -urNp linux-3.1.4/drivers/staging/hv/channel.c linux-3.1.4/drivers/staging/hv/channel.c
12225 +--- linux-3.1.4/drivers/staging/hv/channel.c 2011-11-11 15:19:27.000000000 -0500
12226 ++++ linux-3.1.4/drivers/staging/hv/channel.c 2011-11-16 18:39:07.000000000 -0500
12227 @@ -447,8 +447,8 @@ int vmbus_establish_gpadl(struct vmbus_c
12228 int ret = 0;
12229 int t;
12230 @@ -34883,9 +35750,9 @@ diff -urNp linux-3.1.3/drivers/staging/hv/channel.c linux-3.1.3/drivers/staging/
12231
12232 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
12233 if (ret)
12234 -diff -urNp linux-3.1.3/drivers/staging/hv/hv.c linux-3.1.3/drivers/staging/hv/hv.c
12235 ---- linux-3.1.3/drivers/staging/hv/hv.c 2011-11-11 15:19:27.000000000 -0500
12236 -+++ linux-3.1.3/drivers/staging/hv/hv.c 2011-11-16 18:39:07.000000000 -0500
12237 +diff -urNp linux-3.1.4/drivers/staging/hv/hv.c linux-3.1.4/drivers/staging/hv/hv.c
12238 +--- linux-3.1.4/drivers/staging/hv/hv.c 2011-11-11 15:19:27.000000000 -0500
12239 ++++ linux-3.1.4/drivers/staging/hv/hv.c 2011-11-16 18:39:07.000000000 -0500
12240 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi
12241 u64 output_address = (output) ? virt_to_phys(output) : 0;
12242 u32 output_address_hi = output_address >> 32;
12243 @@ -34895,9 +35762,9 @@ diff -urNp linux-3.1.3/drivers/staging/hv/hv.c linux-3.1.3/drivers/staging/hv/hv
12244
12245 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
12246 "=a"(hv_status_lo) : "d" (control_hi),
12247 -diff -urNp linux-3.1.3/drivers/staging/hv/hv_mouse.c linux-3.1.3/drivers/staging/hv/hv_mouse.c
12248 ---- linux-3.1.3/drivers/staging/hv/hv_mouse.c 2011-11-11 15:19:27.000000000 -0500
12249 -+++ linux-3.1.3/drivers/staging/hv/hv_mouse.c 2011-11-16 18:39:07.000000000 -0500
12250 +diff -urNp linux-3.1.4/drivers/staging/hv/hv_mouse.c linux-3.1.4/drivers/staging/hv/hv_mouse.c
12251 +--- linux-3.1.4/drivers/staging/hv/hv_mouse.c 2011-11-11 15:19:27.000000000 -0500
12252 ++++ linux-3.1.4/drivers/staging/hv/hv_mouse.c 2011-11-16 18:39:07.000000000 -0500
12253 @@ -878,8 +878,10 @@ static void reportdesc_callback(struct h
12254 if (hid_dev) {
12255 DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
12256 @@ -34911,9 +35778,9 @@ diff -urNp linux-3.1.3/drivers/staging/hv/hv_mouse.c linux-3.1.3/drivers/staging
12257
12258 hid_dev->bus = BUS_VIRTUAL;
12259 hid_dev->vendor = input_device_ctx->device_info.vendor;
12260 -diff -urNp linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h
12261 ---- linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h 2011-11-11 15:19:27.000000000 -0500
12262 -+++ linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h 2011-11-16 18:39:07.000000000 -0500
12263 +diff -urNp linux-3.1.4/drivers/staging/hv/hyperv_vmbus.h linux-3.1.4/drivers/staging/hv/hyperv_vmbus.h
12264 +--- linux-3.1.4/drivers/staging/hv/hyperv_vmbus.h 2011-11-11 15:19:27.000000000 -0500
12265 ++++ linux-3.1.4/drivers/staging/hv/hyperv_vmbus.h 2011-11-16 18:39:07.000000000 -0500
12266 @@ -559,7 +559,7 @@ enum vmbus_connect_state {
12267 struct vmbus_connection {
12268 enum vmbus_connect_state conn_state;
12269 @@ -34923,9 +35790,9 @@ diff -urNp linux-3.1.3/drivers/staging/hv/hyperv_vmbus.h linux-3.1.3/drivers/sta
12270
12271 /*
12272 * Represents channel interrupts. Each bit position represents a
12273 -diff -urNp linux-3.1.3/drivers/staging/hv/rndis_filter.c linux-3.1.3/drivers/staging/hv/rndis_filter.c
12274 ---- linux-3.1.3/drivers/staging/hv/rndis_filter.c 2011-11-11 15:19:27.000000000 -0500
12275 -+++ linux-3.1.3/drivers/staging/hv/rndis_filter.c 2011-11-16 18:39:07.000000000 -0500
12276 +diff -urNp linux-3.1.4/drivers/staging/hv/rndis_filter.c linux-3.1.4/drivers/staging/hv/rndis_filter.c
12277 +--- linux-3.1.4/drivers/staging/hv/rndis_filter.c 2011-11-11 15:19:27.000000000 -0500
12278 ++++ linux-3.1.4/drivers/staging/hv/rndis_filter.c 2011-11-16 18:39:07.000000000 -0500
12279 @@ -43,7 +43,7 @@ struct rndis_device {
12280
12281 enum rndis_device_state state;
12282 @@ -34953,9 +35820,9 @@ diff -urNp linux-3.1.3/drivers/staging/hv/rndis_filter.c linux-3.1.3/drivers/sta
12283
12284 /* Ignore return since this msg is optional. */
12285 rndis_filter_send_request(dev, request);
12286 -diff -urNp linux-3.1.3/drivers/staging/hv/vmbus_drv.c linux-3.1.3/drivers/staging/hv/vmbus_drv.c
12287 ---- linux-3.1.3/drivers/staging/hv/vmbus_drv.c 2011-11-11 15:19:27.000000000 -0500
12288 -+++ linux-3.1.3/drivers/staging/hv/vmbus_drv.c 2011-11-16 18:39:07.000000000 -0500
12289 +diff -urNp linux-3.1.4/drivers/staging/hv/vmbus_drv.c linux-3.1.4/drivers/staging/hv/vmbus_drv.c
12290 +--- linux-3.1.4/drivers/staging/hv/vmbus_drv.c 2011-11-11 15:19:27.000000000 -0500
12291 ++++ linux-3.1.4/drivers/staging/hv/vmbus_drv.c 2011-11-16 18:39:07.000000000 -0500
12292 @@ -660,11 +660,11 @@ int vmbus_child_device_register(struct h
12293 {
12294 int ret = 0;
12295 @@ -34970,9 +35837,9 @@ diff -urNp linux-3.1.3/drivers/staging/hv/vmbus_drv.c linux-3.1.3/drivers/stagin
12296
12297 /* The new device belongs to this bus */
12298 child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
12299 -diff -urNp linux-3.1.3/drivers/staging/iio/ring_generic.h linux-3.1.3/drivers/staging/iio/ring_generic.h
12300 ---- linux-3.1.3/drivers/staging/iio/ring_generic.h 2011-11-11 15:19:27.000000000 -0500
12301 -+++ linux-3.1.3/drivers/staging/iio/ring_generic.h 2011-11-16 18:39:07.000000000 -0500
12302 +diff -urNp linux-3.1.4/drivers/staging/iio/ring_generic.h linux-3.1.4/drivers/staging/iio/ring_generic.h
12303 +--- linux-3.1.4/drivers/staging/iio/ring_generic.h 2011-11-11 15:19:27.000000000 -0500
12304 ++++ linux-3.1.4/drivers/staging/iio/ring_generic.h 2011-11-16 18:39:07.000000000 -0500
12305 @@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
12306
12307 int (*is_enabled)(struct iio_ring_buffer *ring);
12308 @@ -34982,9 +35849,9 @@ diff -urNp linux-3.1.3/drivers/staging/iio/ring_generic.h linux-3.1.3/drivers/st
12309
12310 struct iio_ring_setup_ops {
12311 int (*preenable)(struct iio_dev *);
12312 -diff -urNp linux-3.1.3/drivers/staging/mei/interface.c linux-3.1.3/drivers/staging/mei/interface.c
12313 ---- linux-3.1.3/drivers/staging/mei/interface.c 2011-11-11 15:19:27.000000000 -0500
12314 -+++ linux-3.1.3/drivers/staging/mei/interface.c 2011-11-17 18:39:18.000000000 -0500
12315 +diff -urNp linux-3.1.4/drivers/staging/mei/interface.c linux-3.1.4/drivers/staging/mei/interface.c
12316 +--- linux-3.1.4/drivers/staging/mei/interface.c 2011-11-11 15:19:27.000000000 -0500
12317 ++++ linux-3.1.4/drivers/staging/mei/interface.c 2011-11-17 18:39:18.000000000 -0500
12318 @@ -332,7 +332,7 @@ int mei_send_flow_control(struct mei_dev
12319 mei_hdr->reserved = 0;
12320
12321 @@ -35003,9 +35870,9 @@ diff -urNp linux-3.1.3/drivers/staging/mei/interface.c linux-3.1.3/drivers/stagi
12322 mei_cli_disconnect->host_addr = cl->host_client_id;
12323 mei_cli_disconnect->me_addr = cl->me_client_id;
12324 mei_cli_disconnect->cmd.cmd = CLIENT_DISCONNECT_REQ_CMD;
12325 -diff -urNp linux-3.1.3/drivers/staging/octeon/ethernet.c linux-3.1.3/drivers/staging/octeon/ethernet.c
12326 ---- linux-3.1.3/drivers/staging/octeon/ethernet.c 2011-11-11 15:19:27.000000000 -0500
12327 -+++ linux-3.1.3/drivers/staging/octeon/ethernet.c 2011-11-16 18:39:07.000000000 -0500
12328 +diff -urNp linux-3.1.4/drivers/staging/octeon/ethernet.c linux-3.1.4/drivers/staging/octeon/ethernet.c
12329 +--- linux-3.1.4/drivers/staging/octeon/ethernet.c 2011-11-11 15:19:27.000000000 -0500
12330 ++++ linux-3.1.4/drivers/staging/octeon/ethernet.c 2011-11-16 18:39:07.000000000 -0500
12331 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
12332 * since the RX tasklet also increments it.
12333 */
12334 @@ -35022,9 +35889,9 @@ diff -urNp linux-3.1.3/drivers/staging/octeon/ethernet.c linux-3.1.3/drivers/sta
12335 #endif
12336 }
12337
12338 -diff -urNp linux-3.1.3/drivers/staging/octeon/ethernet-rx.c linux-3.1.3/drivers/staging/octeon/ethernet-rx.c
12339 ---- linux-3.1.3/drivers/staging/octeon/ethernet-rx.c 2011-11-11 15:19:27.000000000 -0500
12340 -+++ linux-3.1.3/drivers/staging/octeon/ethernet-rx.c 2011-11-16 18:39:07.000000000 -0500
12341 +diff -urNp linux-3.1.4/drivers/staging/octeon/ethernet-rx.c linux-3.1.4/drivers/staging/octeon/ethernet-rx.c
12342 +--- linux-3.1.4/drivers/staging/octeon/ethernet-rx.c 2011-11-11 15:19:27.000000000 -0500
12343 ++++ linux-3.1.4/drivers/staging/octeon/ethernet-rx.c 2011-11-16 18:39:07.000000000 -0500
12344 @@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi
12345 /* Increment RX stats for virtual ports */
12346 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
12347 @@ -35053,9 +35920,9 @@ diff -urNp linux-3.1.3/drivers/staging/octeon/ethernet-rx.c linux-3.1.3/drivers/
12348 #endif
12349 dev_kfree_skb_irq(skb);
12350 }
12351 -diff -urNp linux-3.1.3/drivers/staging/pohmelfs/inode.c linux-3.1.3/drivers/staging/pohmelfs/inode.c
12352 ---- linux-3.1.3/drivers/staging/pohmelfs/inode.c 2011-11-11 15:19:27.000000000 -0500
12353 -+++ linux-3.1.3/drivers/staging/pohmelfs/inode.c 2011-11-16 18:39:07.000000000 -0500
12354 +diff -urNp linux-3.1.4/drivers/staging/pohmelfs/inode.c linux-3.1.4/drivers/staging/pohmelfs/inode.c
12355 +--- linux-3.1.4/drivers/staging/pohmelfs/inode.c 2011-11-11 15:19:27.000000000 -0500
12356 ++++ linux-3.1.4/drivers/staging/pohmelfs/inode.c 2011-11-16 18:39:07.000000000 -0500
12357 @@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct su
12358 mutex_init(&psb->mcache_lock);
12359 psb->mcache_root = RB_ROOT;
12360 @@ -35074,9 +35941,9 @@ diff -urNp linux-3.1.3/drivers/staging/pohmelfs/inode.c linux-3.1.3/drivers/stag
12361 atomic_long_set(&psb->total_inodes, 0);
12362
12363 mutex_init(&psb->state_lock);
12364 -diff -urNp linux-3.1.3/drivers/staging/pohmelfs/mcache.c linux-3.1.3/drivers/staging/pohmelfs/mcache.c
12365 ---- linux-3.1.3/drivers/staging/pohmelfs/mcache.c 2011-11-11 15:19:27.000000000 -0500
12366 -+++ linux-3.1.3/drivers/staging/pohmelfs/mcache.c 2011-11-16 18:39:07.000000000 -0500
12367 +diff -urNp linux-3.1.4/drivers/staging/pohmelfs/mcache.c linux-3.1.4/drivers/staging/pohmelfs/mcache.c
12368 +--- linux-3.1.4/drivers/staging/pohmelfs/mcache.c 2011-11-11 15:19:27.000000000 -0500
12369 ++++ linux-3.1.4/drivers/staging/pohmelfs/mcache.c 2011-11-16 18:39:07.000000000 -0500
12370 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
12371 m->data = data;
12372 m->start = start;
12373 @@ -35086,9 +35953,9 @@ diff -urNp linux-3.1.3/drivers/staging/pohmelfs/mcache.c linux-3.1.3/drivers/sta
12374
12375 mutex_lock(&psb->mcache_lock);
12376 err = pohmelfs_mcache_insert(psb, m);
12377 -diff -urNp linux-3.1.3/drivers/staging/pohmelfs/netfs.h linux-3.1.3/drivers/staging/pohmelfs/netfs.h
12378 ---- linux-3.1.3/drivers/staging/pohmelfs/netfs.h 2011-11-11 15:19:27.000000000 -0500
12379 -+++ linux-3.1.3/drivers/staging/pohmelfs/netfs.h 2011-11-16 18:39:07.000000000 -0500
12380 +diff -urNp linux-3.1.4/drivers/staging/pohmelfs/netfs.h linux-3.1.4/drivers/staging/pohmelfs/netfs.h
12381 +--- linux-3.1.4/drivers/staging/pohmelfs/netfs.h 2011-11-11 15:19:27.000000000 -0500
12382 ++++ linux-3.1.4/drivers/staging/pohmelfs/netfs.h 2011-11-16 18:39:07.000000000 -0500
12383 @@ -571,14 +571,14 @@ struct pohmelfs_config;
12384 struct pohmelfs_sb {
12385 struct rb_root mcache_root;
12386 @@ -35106,9 +35973,9 @@ diff -urNp linux-3.1.3/drivers/staging/pohmelfs/netfs.h linux-3.1.3/drivers/stag
12387
12388 unsigned int crypto_attached_size;
12389 unsigned int crypto_align_size;
12390 -diff -urNp linux-3.1.3/drivers/staging/pohmelfs/trans.c linux-3.1.3/drivers/staging/pohmelfs/trans.c
12391 ---- linux-3.1.3/drivers/staging/pohmelfs/trans.c 2011-11-11 15:19:27.000000000 -0500
12392 -+++ linux-3.1.3/drivers/staging/pohmelfs/trans.c 2011-11-16 18:39:07.000000000 -0500
12393 +diff -urNp linux-3.1.4/drivers/staging/pohmelfs/trans.c linux-3.1.4/drivers/staging/pohmelfs/trans.c
12394 +--- linux-3.1.4/drivers/staging/pohmelfs/trans.c 2011-11-11 15:19:27.000000000 -0500
12395 ++++ linux-3.1.4/drivers/staging/pohmelfs/trans.c 2011-11-16 18:39:07.000000000 -0500
12396 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
12397 int err;
12398 struct netfs_cmd *cmd = t->iovec.iov_base;
12399 @@ -35118,9 +35985,9 @@ diff -urNp linux-3.1.3/drivers/staging/pohmelfs/trans.c linux-3.1.3/drivers/stag
12400
12401 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
12402 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
12403 -diff -urNp linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h
12404 ---- linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h 2011-11-11 15:19:27.000000000 -0500
12405 -+++ linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h 2011-11-16 18:39:07.000000000 -0500
12406 +diff -urNp linux-3.1.4/drivers/staging/rtl8712/rtl871x_io.h linux-3.1.4/drivers/staging/rtl8712/rtl871x_io.h
12407 +--- linux-3.1.4/drivers/staging/rtl8712/rtl871x_io.h 2011-11-11 15:19:27.000000000 -0500
12408 ++++ linux-3.1.4/drivers/staging/rtl8712/rtl871x_io.h 2011-11-16 18:39:07.000000000 -0500
12409 @@ -83,7 +83,7 @@ struct _io_ops {
12410 u8 *pmem);
12411 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
12412 @@ -35130,9 +35997,9 @@ diff -urNp linux-3.1.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.1.3/drivers/
12413
12414 struct io_req {
12415 struct list_head list;
12416 -diff -urNp linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c
12417 ---- linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c 2011-11-11 15:19:27.000000000 -0500
12418 -+++ linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c 2011-11-16 18:39:08.000000000 -0500
12419 +diff -urNp linux-3.1.4/drivers/staging/sbe-2t3e3/netdev.c linux-3.1.4/drivers/staging/sbe-2t3e3/netdev.c
12420 +--- linux-3.1.4/drivers/staging/sbe-2t3e3/netdev.c 2011-11-11 15:19:27.000000000 -0500
12421 ++++ linux-3.1.4/drivers/staging/sbe-2t3e3/netdev.c 2011-11-16 18:39:08.000000000 -0500
12422 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
12423 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
12424
12425 @@ -35142,9 +36009,9 @@ diff -urNp linux-3.1.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.1.3/drivers/st
12426 return -EFAULT;
12427
12428 return 0;
12429 -diff -urNp linux-3.1.3/drivers/staging/usbip/usbip_common.h linux-3.1.3/drivers/staging/usbip/usbip_common.h
12430 ---- linux-3.1.3/drivers/staging/usbip/usbip_common.h 2011-11-11 15:19:27.000000000 -0500
12431 -+++ linux-3.1.3/drivers/staging/usbip/usbip_common.h 2011-11-16 18:39:08.000000000 -0500
12432 +diff -urNp linux-3.1.4/drivers/staging/usbip/usbip_common.h linux-3.1.4/drivers/staging/usbip/usbip_common.h
12433 +--- linux-3.1.4/drivers/staging/usbip/usbip_common.h 2011-11-11 15:19:27.000000000 -0500
12434 ++++ linux-3.1.4/drivers/staging/usbip/usbip_common.h 2011-11-16 18:39:08.000000000 -0500
12435 @@ -289,7 +289,7 @@ struct usbip_device {
12436 void (*shutdown)(struct usbip_device *);
12437 void (*reset)(struct usbip_device *);
12438 @@ -35154,9 +36021,9 @@ diff -urNp linux-3.1.3/drivers/staging/usbip/usbip_common.h linux-3.1.3/drivers/
12439 };
12440
12441 #if 0
12442 -diff -urNp linux-3.1.3/drivers/staging/usbip/vhci.h linux-3.1.3/drivers/staging/usbip/vhci.h
12443 ---- linux-3.1.3/drivers/staging/usbip/vhci.h 2011-11-11 15:19:27.000000000 -0500
12444 -+++ linux-3.1.3/drivers/staging/usbip/vhci.h 2011-11-16 18:39:08.000000000 -0500
12445 +diff -urNp linux-3.1.4/drivers/staging/usbip/vhci.h linux-3.1.4/drivers/staging/usbip/vhci.h
12446 +--- linux-3.1.4/drivers/staging/usbip/vhci.h 2011-11-11 15:19:27.000000000 -0500
12447 ++++ linux-3.1.4/drivers/staging/usbip/vhci.h 2011-11-16 18:39:08.000000000 -0500
12448 @@ -85,7 +85,7 @@ struct vhci_hcd {
12449 unsigned resuming:1;
12450 unsigned long re_timeout;
12451 @@ -35166,9 +36033,9 @@ diff -urNp linux-3.1.3/drivers/staging/usbip/vhci.h linux-3.1.3/drivers/staging/
12452
12453 /*
12454 * NOTE:
12455 -diff -urNp linux-3.1.3/drivers/staging/usbip/vhci_hcd.c linux-3.1.3/drivers/staging/usbip/vhci_hcd.c
12456 ---- linux-3.1.3/drivers/staging/usbip/vhci_hcd.c 2011-11-11 15:19:27.000000000 -0500
12457 -+++ linux-3.1.3/drivers/staging/usbip/vhci_hcd.c 2011-11-16 18:39:08.000000000 -0500
12458 +diff -urNp linux-3.1.4/drivers/staging/usbip/vhci_hcd.c linux-3.1.4/drivers/staging/usbip/vhci_hcd.c
12459 +--- linux-3.1.4/drivers/staging/usbip/vhci_hcd.c 2011-11-11 15:19:27.000000000 -0500
12460 ++++ linux-3.1.4/drivers/staging/usbip/vhci_hcd.c 2011-11-16 18:39:08.000000000 -0500
12461 @@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
12462 return;
12463 }
12464 @@ -35196,9 +36063,9 @@ diff -urNp linux-3.1.3/drivers/staging/usbip/vhci_hcd.c linux-3.1.3/drivers/stag
12465 spin_lock_init(&vhci->lock);
12466
12467 hcd->power_budget = 0; /* no limit */
12468 -diff -urNp linux-3.1.3/drivers/staging/usbip/vhci_rx.c linux-3.1.3/drivers/staging/usbip/vhci_rx.c
12469 ---- linux-3.1.3/drivers/staging/usbip/vhci_rx.c 2011-11-11 15:19:27.000000000 -0500
12470 -+++ linux-3.1.3/drivers/staging/usbip/vhci_rx.c 2011-11-16 18:39:08.000000000 -0500
12471 +diff -urNp linux-3.1.4/drivers/staging/usbip/vhci_rx.c linux-3.1.4/drivers/staging/usbip/vhci_rx.c
12472 +--- linux-3.1.4/drivers/staging/usbip/vhci_rx.c 2011-11-11 15:19:27.000000000 -0500
12473 ++++ linux-3.1.4/drivers/staging/usbip/vhci_rx.c 2011-11-16 18:39:08.000000000 -0500
12474 @@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct
12475 if (!urb) {
12476 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
12477 @@ -35208,9 +36075,9 @@ diff -urNp linux-3.1.3/drivers/staging/usbip/vhci_rx.c linux-3.1.3/drivers/stagi
12478 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
12479 return;
12480 }
12481 -diff -urNp linux-3.1.3/drivers/staging/vt6655/hostap.c linux-3.1.3/drivers/staging/vt6655/hostap.c
12482 ---- linux-3.1.3/drivers/staging/vt6655/hostap.c 2011-11-11 15:19:27.000000000 -0500
12483 -+++ linux-3.1.3/drivers/staging/vt6655/hostap.c 2011-11-16 18:39:08.000000000 -0500
12484 +diff -urNp linux-3.1.4/drivers/staging/vt6655/hostap.c linux-3.1.4/drivers/staging/vt6655/hostap.c
12485 +--- linux-3.1.4/drivers/staging/vt6655/hostap.c 2011-11-11 15:19:27.000000000 -0500
12486 ++++ linux-3.1.4/drivers/staging/vt6655/hostap.c 2011-11-16 18:39:08.000000000 -0500
12487 @@ -79,14 +79,13 @@ static int msglevel
12488 *
12489 */
12490 @@ -35237,9 +36104,9 @@ diff -urNp linux-3.1.3/drivers/staging/vt6655/hostap.c linux-3.1.3/drivers/stagi
12491 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
12492
12493 pDevice->apdev->type = ARPHRD_IEEE80211;
12494 -diff -urNp linux-3.1.3/drivers/staging/vt6656/hostap.c linux-3.1.3/drivers/staging/vt6656/hostap.c
12495 ---- linux-3.1.3/drivers/staging/vt6656/hostap.c 2011-11-11 15:19:27.000000000 -0500
12496 -+++ linux-3.1.3/drivers/staging/vt6656/hostap.c 2011-11-16 18:39:08.000000000 -0500
12497 +diff -urNp linux-3.1.4/drivers/staging/vt6656/hostap.c linux-3.1.4/drivers/staging/vt6656/hostap.c
12498 +--- linux-3.1.4/drivers/staging/vt6656/hostap.c 2011-11-11 15:19:27.000000000 -0500
12499 ++++ linux-3.1.4/drivers/staging/vt6656/hostap.c 2011-11-16 18:39:08.000000000 -0500
12500 @@ -80,14 +80,13 @@ static int msglevel
12501 *
12502 */
12503 @@ -35266,9 +36133,9 @@ diff -urNp linux-3.1.3/drivers/staging/vt6656/hostap.c linux-3.1.3/drivers/stagi
12504 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
12505
12506 pDevice->apdev->type = ARPHRD_IEEE80211;
12507 -diff -urNp linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c
12508 ---- linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-11 15:19:27.000000000 -0500
12509 -+++ linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-16 18:39:08.000000000 -0500
12510 +diff -urNp linux-3.1.4/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.1.4/drivers/staging/wlan-ng/hfa384x_usb.c
12511 +--- linux-3.1.4/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-11 15:19:27.000000000 -0500
12512 ++++ linux-3.1.4/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-16 18:39:08.000000000 -0500
12513 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
12514
12515 struct usbctlx_completor {
12516 @@ -35278,9 +36145,9 @@ diff -urNp linux-3.1.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.1.3/drivers
12517
12518 static int
12519 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
12520 -diff -urNp linux-3.1.3/drivers/staging/zcache/tmem.c linux-3.1.3/drivers/staging/zcache/tmem.c
12521 ---- linux-3.1.3/drivers/staging/zcache/tmem.c 2011-11-11 15:19:27.000000000 -0500
12522 -+++ linux-3.1.3/drivers/staging/zcache/tmem.c 2011-11-16 18:39:08.000000000 -0500
12523 +diff -urNp linux-3.1.4/drivers/staging/zcache/tmem.c linux-3.1.4/drivers/staging/zcache/tmem.c
12524 +--- linux-3.1.4/drivers/staging/zcache/tmem.c 2011-11-11 15:19:27.000000000 -0500
12525 ++++ linux-3.1.4/drivers/staging/zcache/tmem.c 2011-11-16 18:39:08.000000000 -0500
12526 @@ -39,7 +39,7 @@
12527 * A tmem host implementation must use this function to register callbacks
12528 * for memory allocation.
12529 @@ -35299,9 +36166,9 @@ diff -urNp linux-3.1.3/drivers/staging/zcache/tmem.c linux-3.1.3/drivers/staging
12530
12531 void tmem_register_pamops(struct tmem_pamops *m)
12532 {
12533 -diff -urNp linux-3.1.3/drivers/staging/zcache/tmem.h linux-3.1.3/drivers/staging/zcache/tmem.h
12534 ---- linux-3.1.3/drivers/staging/zcache/tmem.h 2011-11-11 15:19:27.000000000 -0500
12535 -+++ linux-3.1.3/drivers/staging/zcache/tmem.h 2011-11-16 18:39:08.000000000 -0500
12536 +diff -urNp linux-3.1.4/drivers/staging/zcache/tmem.h linux-3.1.4/drivers/staging/zcache/tmem.h
12537 +--- linux-3.1.4/drivers/staging/zcache/tmem.h 2011-11-11 15:19:27.000000000 -0500
12538 ++++ linux-3.1.4/drivers/staging/zcache/tmem.h 2011-11-16 18:39:08.000000000 -0500
12539 @@ -180,6 +180,7 @@ struct tmem_pamops {
12540 void (*new_obj)(struct tmem_obj *);
12541 int (*replace_in_obj)(void *, struct tmem_obj *);
12542 @@ -35318,9 +36185,9 @@ diff -urNp linux-3.1.3/drivers/staging/zcache/tmem.h linux-3.1.3/drivers/staging
12543 extern void tmem_register_hostops(struct tmem_hostops *m);
12544
12545 /* core tmem accessor functions */
12546 -diff -urNp linux-3.1.3/drivers/target/iscsi/iscsi_target.c linux-3.1.3/drivers/target/iscsi/iscsi_target.c
12547 ---- linux-3.1.3/drivers/target/iscsi/iscsi_target.c 2011-11-11 15:19:27.000000000 -0500
12548 -+++ linux-3.1.3/drivers/target/iscsi/iscsi_target.c 2011-11-16 18:39:08.000000000 -0500
12549 +diff -urNp linux-3.1.4/drivers/target/iscsi/iscsi_target.c linux-3.1.4/drivers/target/iscsi/iscsi_target.c
12550 +--- linux-3.1.4/drivers/target/iscsi/iscsi_target.c 2011-11-11 15:19:27.000000000 -0500
12551 ++++ linux-3.1.4/drivers/target/iscsi/iscsi_target.c 2011-11-16 18:39:08.000000000 -0500
12552 @@ -1368,7 +1368,7 @@ static int iscsit_handle_data_out(struct
12553 * outstanding_r2ts reaches zero, go ahead and send the delayed
12554 * TASK_ABORTED status.
12555 @@ -35330,9 +36197,9 @@ diff -urNp linux-3.1.3/drivers/target/iscsi/iscsi_target.c linux-3.1.3/drivers/t
12556 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
12557 if (--cmd->outstanding_r2ts < 1) {
12558 iscsit_stop_dataout_timer(cmd);
12559 -diff -urNp linux-3.1.3/drivers/target/target_core_alua.c linux-3.1.3/drivers/target/target_core_alua.c
12560 ---- linux-3.1.3/drivers/target/target_core_alua.c 2011-11-11 15:19:27.000000000 -0500
12561 -+++ linux-3.1.3/drivers/target/target_core_alua.c 2011-11-16 18:40:29.000000000 -0500
12562 +diff -urNp linux-3.1.4/drivers/target/target_core_alua.c linux-3.1.4/drivers/target/target_core_alua.c
12563 +--- linux-3.1.4/drivers/target/target_core_alua.c 2011-11-11 15:19:27.000000000 -0500
12564 ++++ linux-3.1.4/drivers/target/target_core_alua.c 2011-11-16 18:40:29.000000000 -0500
12565 @@ -723,6 +723,8 @@ static int core_alua_update_tpg_primary_
12566 char path[ALUA_METADATA_PATH_LEN];
12567 int len;
12568 @@ -35351,9 +36218,9 @@ diff -urNp linux-3.1.3/drivers/target/target_core_alua.c linux-3.1.3/drivers/tar
12569 memset(path, 0, ALUA_METADATA_PATH_LEN);
12570 memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
12571
12572 -diff -urNp linux-3.1.3/drivers/target/target_core_cdb.c linux-3.1.3/drivers/target/target_core_cdb.c
12573 ---- linux-3.1.3/drivers/target/target_core_cdb.c 2011-11-11 15:19:27.000000000 -0500
12574 -+++ linux-3.1.3/drivers/target/target_core_cdb.c 2011-11-16 18:40:29.000000000 -0500
12575 +diff -urNp linux-3.1.4/drivers/target/target_core_cdb.c linux-3.1.4/drivers/target/target_core_cdb.c
12576 +--- linux-3.1.4/drivers/target/target_core_cdb.c 2011-11-11 15:19:27.000000000 -0500
12577 ++++ linux-3.1.4/drivers/target/target_core_cdb.c 2011-11-16 18:40:29.000000000 -0500
12578 @@ -933,6 +933,8 @@ target_emulate_modesense(struct se_cmd *
12579 int length = 0;
12580 unsigned char buf[SE_MODE_PAGE_BUF];
12581 @@ -35363,9 +36230,9 @@ diff -urNp linux-3.1.3/drivers/target/target_core_cdb.c linux-3.1.3/drivers/targ
12582 memset(buf, 0, SE_MODE_PAGE_BUF);
12583
12584 switch (cdb[2] & 0x3f) {
12585 -diff -urNp linux-3.1.3/drivers/target/target_core_configfs.c linux-3.1.3/drivers/target/target_core_configfs.c
12586 ---- linux-3.1.3/drivers/target/target_core_configfs.c 2011-11-11 15:19:27.000000000 -0500
12587 -+++ linux-3.1.3/drivers/target/target_core_configfs.c 2011-11-16 19:04:37.000000000 -0500
12588 +diff -urNp linux-3.1.4/drivers/target/target_core_configfs.c linux-3.1.4/drivers/target/target_core_configfs.c
12589 +--- linux-3.1.4/drivers/target/target_core_configfs.c 2011-11-11 15:19:27.000000000 -0500
12590 ++++ linux-3.1.4/drivers/target/target_core_configfs.c 2011-11-16 19:04:37.000000000 -0500
12591 @@ -1267,6 +1267,8 @@ static ssize_t target_core_dev_pr_show_a
12592 ssize_t len = 0;
12593 int reg_count = 0, prf_isid;
12594 @@ -35375,9 +36242,9 @@ diff -urNp linux-3.1.3/drivers/target/target_core_configfs.c linux-3.1.3/drivers
12595 if (!su_dev->se_dev_ptr)
12596 return -ENODEV;
12597
12598 -diff -urNp linux-3.1.3/drivers/target/target_core_pr.c linux-3.1.3/drivers/target/target_core_pr.c
12599 ---- linux-3.1.3/drivers/target/target_core_pr.c 2011-11-11 15:19:27.000000000 -0500
12600 -+++ linux-3.1.3/drivers/target/target_core_pr.c 2011-11-16 18:40:29.000000000 -0500
12601 +diff -urNp linux-3.1.4/drivers/target/target_core_pr.c linux-3.1.4/drivers/target/target_core_pr.c
12602 +--- linux-3.1.4/drivers/target/target_core_pr.c 2011-11-11 15:19:27.000000000 -0500
12603 ++++ linux-3.1.4/drivers/target/target_core_pr.c 2011-11-16 18:40:29.000000000 -0500
12604 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
12605 unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
12606 u16 tpgt;
12607 @@ -35405,9 +36272,9 @@ diff -urNp linux-3.1.3/drivers/target/target_core_pr.c linux-3.1.3/drivers/targe
12608 memset(iov, 0, sizeof(struct iovec));
12609 memset(path, 0, 512);
12610
12611 -diff -urNp linux-3.1.3/drivers/target/target_core_tmr.c linux-3.1.3/drivers/target/target_core_tmr.c
12612 ---- linux-3.1.3/drivers/target/target_core_tmr.c 2011-11-11 15:19:27.000000000 -0500
12613 -+++ linux-3.1.3/drivers/target/target_core_tmr.c 2011-11-16 18:39:08.000000000 -0500
12614 +diff -urNp linux-3.1.4/drivers/target/target_core_tmr.c linux-3.1.4/drivers/target/target_core_tmr.c
12615 +--- linux-3.1.4/drivers/target/target_core_tmr.c 2011-11-11 15:19:27.000000000 -0500
12616 ++++ linux-3.1.4/drivers/target/target_core_tmr.c 2011-11-16 18:39:08.000000000 -0500
12617 @@ -255,7 +255,7 @@ static void core_tmr_drain_task_list(
12618 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
12619 cmd->t_task_list_num,
12620 @@ -35435,9 +36302,9 @@ diff -urNp linux-3.1.3/drivers/target/target_core_tmr.c linux-3.1.3/drivers/targ
12621 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
12622
12623 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
12624 -diff -urNp linux-3.1.3/drivers/target/target_core_transport.c linux-3.1.3/drivers/target/target_core_transport.c
12625 ---- linux-3.1.3/drivers/target/target_core_transport.c 2011-11-11 15:19:27.000000000 -0500
12626 -+++ linux-3.1.3/drivers/target/target_core_transport.c 2011-11-16 18:39:08.000000000 -0500
12627 +diff -urNp linux-3.1.4/drivers/target/target_core_transport.c linux-3.1.4/drivers/target/target_core_transport.c
12628 +--- linux-3.1.4/drivers/target/target_core_transport.c 2011-11-11 15:19:27.000000000 -0500
12629 ++++ linux-3.1.4/drivers/target/target_core_transport.c 2011-11-16 18:39:08.000000000 -0500
12630 @@ -1445,7 +1445,7 @@ struct se_device *transport_add_device_t
12631
12632 dev->queue_depth = dev_limits->queue_depth;
12633 @@ -35513,9 +36380,9 @@ diff -urNp linux-3.1.3/drivers/target/target_core_transport.c linux-3.1.3/driver
12634 atomic_read(&cmd->t_transport_active),
12635 atomic_read(&cmd->t_transport_stop),
12636 atomic_read(&cmd->t_transport_sent));
12637 -diff -urNp linux-3.1.3/drivers/telephony/ixj.c linux-3.1.3/drivers/telephony/ixj.c
12638 ---- linux-3.1.3/drivers/telephony/ixj.c 2011-11-11 15:19:27.000000000 -0500
12639 -+++ linux-3.1.3/drivers/telephony/ixj.c 2011-11-16 18:40:29.000000000 -0500
12640 +diff -urNp linux-3.1.4/drivers/telephony/ixj.c linux-3.1.4/drivers/telephony/ixj.c
12641 +--- linux-3.1.4/drivers/telephony/ixj.c 2011-11-11 15:19:27.000000000 -0500
12642 ++++ linux-3.1.4/drivers/telephony/ixj.c 2011-11-16 18:40:29.000000000 -0500
12643 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
12644 bool mContinue;
12645 char *pIn, *pOut;
12646 @@ -35525,9 +36392,9 @@ diff -urNp linux-3.1.3/drivers/telephony/ixj.c linux-3.1.3/drivers/telephony/ixj
12647 if (!SCI_Prepare(j))
12648 return 0;
12649
12650 -diff -urNp linux-3.1.3/drivers/tty/hvc/hvcs.c linux-3.1.3/drivers/tty/hvc/hvcs.c
12651 ---- linux-3.1.3/drivers/tty/hvc/hvcs.c 2011-11-11 15:19:27.000000000 -0500
12652 -+++ linux-3.1.3/drivers/tty/hvc/hvcs.c 2011-11-16 18:39:08.000000000 -0500
12653 +diff -urNp linux-3.1.4/drivers/tty/hvc/hvcs.c linux-3.1.4/drivers/tty/hvc/hvcs.c
12654 +--- linux-3.1.4/drivers/tty/hvc/hvcs.c 2011-11-11 15:19:27.000000000 -0500
12655 ++++ linux-3.1.4/drivers/tty/hvc/hvcs.c 2011-11-16 18:39:08.000000000 -0500
12656 @@ -83,6 +83,7 @@
12657 #include <asm/hvcserver.h>
12658 #include <asm/uaccess.h>
12659 @@ -35630,9 +36497,9 @@ diff -urNp linux-3.1.3/drivers/tty/hvc/hvcs.c linux-3.1.3/drivers/tty/hvc/hvcs.c
12660 return 0;
12661
12662 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
12663 -diff -urNp linux-3.1.3/drivers/tty/ipwireless/tty.c linux-3.1.3/drivers/tty/ipwireless/tty.c
12664 ---- linux-3.1.3/drivers/tty/ipwireless/tty.c 2011-11-11 15:19:27.000000000 -0500
12665 -+++ linux-3.1.3/drivers/tty/ipwireless/tty.c 2011-11-16 18:39:08.000000000 -0500
12666 +diff -urNp linux-3.1.4/drivers/tty/ipwireless/tty.c linux-3.1.4/drivers/tty/ipwireless/tty.c
12667 +--- linux-3.1.4/drivers/tty/ipwireless/tty.c 2011-11-11 15:19:27.000000000 -0500
12668 ++++ linux-3.1.4/drivers/tty/ipwireless/tty.c 2011-11-16 18:39:08.000000000 -0500
12669 @@ -29,6 +29,7 @@
12670 #include <linux/tty_driver.h>
12671 #include <linux/tty_flip.h>
12672 @@ -35755,9 +36622,9 @@ diff -urNp linux-3.1.3/drivers/tty/ipwireless/tty.c linux-3.1.3/drivers/tty/ipwi
12673 do_ipw_close(ttyj);
12674 ipwireless_disassociate_network_ttys(network,
12675 ttyj->channel_idx);
12676 -diff -urNp linux-3.1.3/drivers/tty/n_gsm.c linux-3.1.3/drivers/tty/n_gsm.c
12677 ---- linux-3.1.3/drivers/tty/n_gsm.c 2011-11-11 15:19:27.000000000 -0500
12678 -+++ linux-3.1.3/drivers/tty/n_gsm.c 2011-11-16 18:39:08.000000000 -0500
12679 +diff -urNp linux-3.1.4/drivers/tty/n_gsm.c linux-3.1.4/drivers/tty/n_gsm.c
12680 +--- linux-3.1.4/drivers/tty/n_gsm.c 2011-11-11 15:19:27.000000000 -0500
12681 ++++ linux-3.1.4/drivers/tty/n_gsm.c 2011-11-16 18:39:08.000000000 -0500
12682 @@ -1625,7 +1625,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
12683 kref_init(&dlci->ref);
12684 mutex_init(&dlci->mutex);
12685 @@ -35767,9 +36634,9 @@ diff -urNp linux-3.1.3/drivers/tty/n_gsm.c linux-3.1.3/drivers/tty/n_gsm.c
12686 kfree(dlci);
12687 return NULL;
12688 }
12689 -diff -urNp linux-3.1.3/drivers/tty/n_tty.c linux-3.1.3/drivers/tty/n_tty.c
12690 ---- linux-3.1.3/drivers/tty/n_tty.c 2011-11-11 15:19:27.000000000 -0500
12691 -+++ linux-3.1.3/drivers/tty/n_tty.c 2011-11-16 18:39:08.000000000 -0500
12692 +diff -urNp linux-3.1.4/drivers/tty/n_tty.c linux-3.1.4/drivers/tty/n_tty.c
12693 +--- linux-3.1.4/drivers/tty/n_tty.c 2011-11-11 15:19:27.000000000 -0500
12694 ++++ linux-3.1.4/drivers/tty/n_tty.c 2011-11-16 18:39:08.000000000 -0500
12695 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
12696 {
12697 *ops = tty_ldisc_N_TTY;
12698 @@ -35779,9 +36646,9 @@ diff -urNp linux-3.1.3/drivers/tty/n_tty.c linux-3.1.3/drivers/tty/n_tty.c
12699 + ops->flags = 0;
12700 }
12701 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
12702 -diff -urNp linux-3.1.3/drivers/tty/pty.c linux-3.1.3/drivers/tty/pty.c
12703 ---- linux-3.1.3/drivers/tty/pty.c 2011-11-11 15:19:27.000000000 -0500
12704 -+++ linux-3.1.3/drivers/tty/pty.c 2011-11-16 18:39:08.000000000 -0500
12705 +diff -urNp linux-3.1.4/drivers/tty/pty.c linux-3.1.4/drivers/tty/pty.c
12706 +--- linux-3.1.4/drivers/tty/pty.c 2011-11-11 15:19:27.000000000 -0500
12707 ++++ linux-3.1.4/drivers/tty/pty.c 2011-11-16 18:39:08.000000000 -0500
12708 @@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
12709 register_sysctl_table(pty_root_table);
12710
12711 @@ -35794,9 +36661,9 @@ diff -urNp linux-3.1.3/drivers/tty/pty.c linux-3.1.3/drivers/tty/pty.c
12712
12713 cdev_init(&ptmx_cdev, &ptmx_fops);
12714 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
12715 -diff -urNp linux-3.1.3/drivers/tty/rocket.c linux-3.1.3/drivers/tty/rocket.c
12716 ---- linux-3.1.3/drivers/tty/rocket.c 2011-11-11 15:19:27.000000000 -0500
12717 -+++ linux-3.1.3/drivers/tty/rocket.c 2011-11-16 18:40:29.000000000 -0500
12718 +diff -urNp linux-3.1.4/drivers/tty/rocket.c linux-3.1.4/drivers/tty/rocket.c
12719 +--- linux-3.1.4/drivers/tty/rocket.c 2011-11-11 15:19:27.000000000 -0500
12720 ++++ linux-3.1.4/drivers/tty/rocket.c 2011-11-16 18:40:29.000000000 -0500
12721 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
12722 struct rocket_ports tmp;
12723 int board;
12724 @@ -35806,9 +36673,9 @@ diff -urNp linux-3.1.3/drivers/tty/rocket.c linux-3.1.3/drivers/tty/rocket.c
12725 if (!retports)
12726 return -EFAULT;
12727 memset(&tmp, 0, sizeof (tmp));
12728 -diff -urNp linux-3.1.3/drivers/tty/serial/kgdboc.c linux-3.1.3/drivers/tty/serial/kgdboc.c
12729 ---- linux-3.1.3/drivers/tty/serial/kgdboc.c 2011-11-11 15:19:27.000000000 -0500
12730 -+++ linux-3.1.3/drivers/tty/serial/kgdboc.c 2011-11-16 18:39:08.000000000 -0500
12731 +diff -urNp linux-3.1.4/drivers/tty/serial/kgdboc.c linux-3.1.4/drivers/tty/serial/kgdboc.c
12732 +--- linux-3.1.4/drivers/tty/serial/kgdboc.c 2011-11-11 15:19:27.000000000 -0500
12733 ++++ linux-3.1.4/drivers/tty/serial/kgdboc.c 2011-11-16 18:39:08.000000000 -0500
12734 @@ -23,8 +23,9 @@
12735 #define MAX_CONFIG_LEN 40
12736
12737 @@ -35907,9 +36774,9 @@ diff -urNp linux-3.1.3/drivers/tty/serial/kgdboc.c linux-3.1.3/drivers/tty/seria
12738 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
12739 /* This is only available if kgdboc is a built in for early debugging */
12740 static int __init kgdboc_early_init(char *opt)
12741 -diff -urNp linux-3.1.3/drivers/tty/serial/mfd.c linux-3.1.3/drivers/tty/serial/mfd.c
12742 ---- linux-3.1.3/drivers/tty/serial/mfd.c 2011-11-11 15:19:27.000000000 -0500
12743 -+++ linux-3.1.3/drivers/tty/serial/mfd.c 2011-11-16 18:39:08.000000000 -0500
12744 +diff -urNp linux-3.1.4/drivers/tty/serial/mfd.c linux-3.1.4/drivers/tty/serial/mfd.c
12745 +--- linux-3.1.4/drivers/tty/serial/mfd.c 2011-11-11 15:19:27.000000000 -0500
12746 ++++ linux-3.1.4/drivers/tty/serial/mfd.c 2011-11-16 18:39:08.000000000 -0500
12747 @@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci
12748 }
12749
12750 @@ -35919,9 +36786,9 @@ diff -urNp linux-3.1.3/drivers/tty/serial/mfd.c linux-3.1.3/drivers/tty/serial/m
12751 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) },
12752 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) },
12753 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },
12754 -diff -urNp linux-3.1.3/drivers/tty/serial/mrst_max3110.c linux-3.1.3/drivers/tty/serial/mrst_max3110.c
12755 ---- linux-3.1.3/drivers/tty/serial/mrst_max3110.c 2011-11-11 15:19:27.000000000 -0500
12756 -+++ linux-3.1.3/drivers/tty/serial/mrst_max3110.c 2011-11-16 18:40:29.000000000 -0500
12757 +diff -urNp linux-3.1.4/drivers/tty/serial/mrst_max3110.c linux-3.1.4/drivers/tty/serial/mrst_max3110.c
12758 +--- linux-3.1.4/drivers/tty/serial/mrst_max3110.c 2011-11-11 15:19:27.000000000 -0500
12759 ++++ linux-3.1.4/drivers/tty/serial/mrst_max3110.c 2011-11-16 18:40:29.000000000 -0500
12760 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
12761 int loop = 1, num, total = 0;
12762 u8 recv_buf[512], *pbuf;
12763 @@ -35931,9 +36798,9 @@ diff -urNp linux-3.1.3/drivers/tty/serial/mrst_max3110.c linux-3.1.3/drivers/tty
12764 pbuf = recv_buf;
12765 do {
12766 num = max3110_read_multi(max, pbuf);
12767 -diff -urNp linux-3.1.3/drivers/tty/tty_io.c linux-3.1.3/drivers/tty/tty_io.c
12768 ---- linux-3.1.3/drivers/tty/tty_io.c 2011-11-11 15:19:27.000000000 -0500
12769 -+++ linux-3.1.3/drivers/tty/tty_io.c 2011-11-16 18:39:08.000000000 -0500
12770 +diff -urNp linux-3.1.4/drivers/tty/tty_io.c linux-3.1.4/drivers/tty/tty_io.c
12771 +--- linux-3.1.4/drivers/tty/tty_io.c 2011-11-11 15:19:27.000000000 -0500
12772 ++++ linux-3.1.4/drivers/tty/tty_io.c 2011-11-16 18:39:08.000000000 -0500
12773 @@ -3238,7 +3238,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
12774
12775 void tty_default_fops(struct file_operations *fops)
12776 @@ -35943,9 +36810,9 @@ diff -urNp linux-3.1.3/drivers/tty/tty_io.c linux-3.1.3/drivers/tty/tty_io.c
12777 }
12778
12779 /*
12780 -diff -urNp linux-3.1.3/drivers/tty/tty_ldisc.c linux-3.1.3/drivers/tty/tty_ldisc.c
12781 ---- linux-3.1.3/drivers/tty/tty_ldisc.c 2011-11-26 19:57:29.000000000 -0500
12782 -+++ linux-3.1.3/drivers/tty/tty_ldisc.c 2011-11-26 20:00:43.000000000 -0500
12783 +diff -urNp linux-3.1.4/drivers/tty/tty_ldisc.c linux-3.1.4/drivers/tty/tty_ldisc.c
12784 +--- linux-3.1.4/drivers/tty/tty_ldisc.c 2011-11-26 19:57:29.000000000 -0500
12785 ++++ linux-3.1.4/drivers/tty/tty_ldisc.c 2011-11-26 20:00:43.000000000 -0500
12786 @@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *
12787 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
12788 struct tty_ldisc_ops *ldo = ld->ops;
12789 @@ -35991,9 +36858,9 @@ diff -urNp linux-3.1.3/drivers/tty/tty_ldisc.c linux-3.1.3/drivers/tty/tty_ldisc
12790 module_put(ldops->owner);
12791 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
12792 }
12793 -diff -urNp linux-3.1.3/drivers/tty/vt/keyboard.c linux-3.1.3/drivers/tty/vt/keyboard.c
12794 ---- linux-3.1.3/drivers/tty/vt/keyboard.c 2011-11-11 15:19:27.000000000 -0500
12795 -+++ linux-3.1.3/drivers/tty/vt/keyboard.c 2011-11-16 18:40:29.000000000 -0500
12796 +diff -urNp linux-3.1.4/drivers/tty/vt/keyboard.c linux-3.1.4/drivers/tty/vt/keyboard.c
12797 +--- linux-3.1.4/drivers/tty/vt/keyboard.c 2011-11-11 15:19:27.000000000 -0500
12798 ++++ linux-3.1.4/drivers/tty/vt/keyboard.c 2011-11-16 18:40:29.000000000 -0500
12799 @@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
12800 kbd->kbdmode == VC_OFF) &&
12801 value != KVAL(K_SAK))
12802 @@ -36011,9 +36878,9 @@ diff -urNp linux-3.1.3/drivers/tty/vt/keyboard.c linux-3.1.3/drivers/tty/vt/keyb
12803 fn_handler[value](vc);
12804 }
12805
12806 -diff -urNp linux-3.1.3/drivers/tty/vt/vt.c linux-3.1.3/drivers/tty/vt/vt.c
12807 ---- linux-3.1.3/drivers/tty/vt/vt.c 2011-11-11 15:19:27.000000000 -0500
12808 -+++ linux-3.1.3/drivers/tty/vt/vt.c 2011-11-16 18:39:08.000000000 -0500
12809 +diff -urNp linux-3.1.4/drivers/tty/vt/vt.c linux-3.1.4/drivers/tty/vt/vt.c
12810 +--- linux-3.1.4/drivers/tty/vt/vt.c 2011-11-11 15:19:27.000000000 -0500
12811 ++++ linux-3.1.4/drivers/tty/vt/vt.c 2011-11-16 18:39:08.000000000 -0500
12812 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
12813
12814 static void notify_write(struct vc_data *vc, unsigned int unicode)
12815 @@ -36023,9 +36890,9 @@ diff -urNp linux-3.1.3/drivers/tty/vt/vt.c linux-3.1.3/drivers/tty/vt/vt.c
12816 atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
12817 }
12818
12819 -diff -urNp linux-3.1.3/drivers/tty/vt/vt_ioctl.c linux-3.1.3/drivers/tty/vt/vt_ioctl.c
12820 ---- linux-3.1.3/drivers/tty/vt/vt_ioctl.c 2011-11-11 15:19:27.000000000 -0500
12821 -+++ linux-3.1.3/drivers/tty/vt/vt_ioctl.c 2011-11-16 18:40:29.000000000 -0500
12822 +diff -urNp linux-3.1.4/drivers/tty/vt/vt_ioctl.c linux-3.1.4/drivers/tty/vt/vt_ioctl.c
12823 +--- linux-3.1.4/drivers/tty/vt/vt_ioctl.c 2011-11-11 15:19:27.000000000 -0500
12824 ++++ linux-3.1.4/drivers/tty/vt/vt_ioctl.c 2011-11-16 18:40:29.000000000 -0500
12825 @@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
12826 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
12827 return -EFAULT;
12828 @@ -36066,9 +36933,9 @@ diff -urNp linux-3.1.3/drivers/tty/vt/vt_ioctl.c linux-3.1.3/drivers/tty/vt/vt_i
12829 if (!perm) {
12830 ret = -EPERM;
12831 goto reterr;
12832 -diff -urNp linux-3.1.3/drivers/uio/uio.c linux-3.1.3/drivers/uio/uio.c
12833 ---- linux-3.1.3/drivers/uio/uio.c 2011-11-11 15:19:27.000000000 -0500
12834 -+++ linux-3.1.3/drivers/uio/uio.c 2011-11-16 18:39:08.000000000 -0500
12835 +diff -urNp linux-3.1.4/drivers/uio/uio.c linux-3.1.4/drivers/uio/uio.c
12836 +--- linux-3.1.4/drivers/uio/uio.c 2011-11-11 15:19:27.000000000 -0500
12837 ++++ linux-3.1.4/drivers/uio/uio.c 2011-11-16 18:39:08.000000000 -0500
12838 @@ -25,6 +25,7 @@
12839 #include <linux/kobject.h>
12840 #include <linux/cdev.h>
12841 @@ -36160,9 +37027,9 @@ diff -urNp linux-3.1.3/drivers/uio/uio.c linux-3.1.3/drivers/uio/uio.c
12842
12843 ret = uio_get_minor(idev);
12844 if (ret)
12845 -diff -urNp linux-3.1.3/drivers/usb/atm/cxacru.c linux-3.1.3/drivers/usb/atm/cxacru.c
12846 ---- linux-3.1.3/drivers/usb/atm/cxacru.c 2011-11-11 15:19:27.000000000 -0500
12847 -+++ linux-3.1.3/drivers/usb/atm/cxacru.c 2011-11-16 18:39:08.000000000 -0500
12848 +diff -urNp linux-3.1.4/drivers/usb/atm/cxacru.c linux-3.1.4/drivers/usb/atm/cxacru.c
12849 +--- linux-3.1.4/drivers/usb/atm/cxacru.c 2011-11-11 15:19:27.000000000 -0500
12850 ++++ linux-3.1.4/drivers/usb/atm/cxacru.c 2011-11-16 18:39:08.000000000 -0500
12851 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
12852 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
12853 if (ret < 2)
12854 @@ -36172,9 +37039,9 @@ diff -urNp linux-3.1.3/drivers/usb/atm/cxacru.c linux-3.1.3/drivers/usb/atm/cxac
12855 return -EINVAL;
12856 pos += tmp;
12857
12858 -diff -urNp linux-3.1.3/drivers/usb/atm/usbatm.c linux-3.1.3/drivers/usb/atm/usbatm.c
12859 ---- linux-3.1.3/drivers/usb/atm/usbatm.c 2011-11-11 15:19:27.000000000 -0500
12860 -+++ linux-3.1.3/drivers/usb/atm/usbatm.c 2011-11-16 18:39:08.000000000 -0500
12861 +diff -urNp linux-3.1.4/drivers/usb/atm/usbatm.c linux-3.1.4/drivers/usb/atm/usbatm.c
12862 +--- linux-3.1.4/drivers/usb/atm/usbatm.c 2011-11-11 15:19:27.000000000 -0500
12863 ++++ linux-3.1.4/drivers/usb/atm/usbatm.c 2011-11-16 18:39:08.000000000 -0500
12864 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
12865 if (printk_ratelimit())
12866 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
12867 @@ -36254,9 +37121,9 @@ diff -urNp linux-3.1.3/drivers/usb/atm/usbatm.c linux-3.1.3/drivers/usb/atm/usba
12868
12869 if (!left--) {
12870 if (instance->disconnected)
12871 -diff -urNp linux-3.1.3/drivers/usb/core/devices.c linux-3.1.3/drivers/usb/core/devices.c
12872 ---- linux-3.1.3/drivers/usb/core/devices.c 2011-11-11 15:19:27.000000000 -0500
12873 -+++ linux-3.1.3/drivers/usb/core/devices.c 2011-11-16 18:39:08.000000000 -0500
12874 +diff -urNp linux-3.1.4/drivers/usb/core/devices.c linux-3.1.4/drivers/usb/core/devices.c
12875 +--- linux-3.1.4/drivers/usb/core/devices.c 2011-11-11 15:19:27.000000000 -0500
12876 ++++ linux-3.1.4/drivers/usb/core/devices.c 2011-11-16 18:39:08.000000000 -0500
12877 @@ -126,7 +126,7 @@ static const char format_endpt[] =
12878 * time it gets called.
12879 */
12880 @@ -36284,9 +37151,9 @@ diff -urNp linux-3.1.3/drivers/usb/core/devices.c linux-3.1.3/drivers/usb/core/d
12881 if (file->f_version != event_count) {
12882 file->f_version = event_count;
12883 return POLLIN | POLLRDNORM;
12884 -diff -urNp linux-3.1.3/drivers/usb/core/message.c linux-3.1.3/drivers/usb/core/message.c
12885 ---- linux-3.1.3/drivers/usb/core/message.c 2011-11-11 15:19:27.000000000 -0500
12886 -+++ linux-3.1.3/drivers/usb/core/message.c 2011-11-16 18:39:08.000000000 -0500
12887 +diff -urNp linux-3.1.4/drivers/usb/core/message.c linux-3.1.4/drivers/usb/core/message.c
12888 +--- linux-3.1.4/drivers/usb/core/message.c 2011-11-11 15:19:27.000000000 -0500
12889 ++++ linux-3.1.4/drivers/usb/core/message.c 2011-11-16 18:39:08.000000000 -0500
12890 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
12891 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
12892 if (buf) {
12893 @@ -36298,9 +37165,9 @@ diff -urNp linux-3.1.3/drivers/usb/core/message.c linux-3.1.3/drivers/usb/core/m
12894 if (!smallbuf)
12895 return buf;
12896 memcpy(smallbuf, buf, len);
12897 -diff -urNp linux-3.1.3/drivers/usb/early/ehci-dbgp.c linux-3.1.3/drivers/usb/early/ehci-dbgp.c
12898 ---- linux-3.1.3/drivers/usb/early/ehci-dbgp.c 2011-11-11 15:19:27.000000000 -0500
12899 -+++ linux-3.1.3/drivers/usb/early/ehci-dbgp.c 2011-11-16 18:39:08.000000000 -0500
12900 +diff -urNp linux-3.1.4/drivers/usb/early/ehci-dbgp.c linux-3.1.4/drivers/usb/early/ehci-dbgp.c
12901 +--- linux-3.1.4/drivers/usb/early/ehci-dbgp.c 2011-11-11 15:19:27.000000000 -0500
12902 ++++ linux-3.1.4/drivers/usb/early/ehci-dbgp.c 2011-11-16 18:39:08.000000000 -0500
12903 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
12904
12905 #ifdef CONFIG_KGDB
12906 @@ -36338,9 +37205,9 @@ diff -urNp linux-3.1.3/drivers/usb/early/ehci-dbgp.c linux-3.1.3/drivers/usb/ear
12907
12908 return 0;
12909 }
12910 -diff -urNp linux-3.1.3/drivers/usb/host/xhci-mem.c linux-3.1.3/drivers/usb/host/xhci-mem.c
12911 ---- linux-3.1.3/drivers/usb/host/xhci-mem.c 2011-11-26 19:57:29.000000000 -0500
12912 -+++ linux-3.1.3/drivers/usb/host/xhci-mem.c 2011-11-26 20:00:43.000000000 -0500
12913 +diff -urNp linux-3.1.4/drivers/usb/host/xhci-mem.c linux-3.1.4/drivers/usb/host/xhci-mem.c
12914 +--- linux-3.1.4/drivers/usb/host/xhci-mem.c 2011-11-26 19:57:29.000000000 -0500
12915 ++++ linux-3.1.4/drivers/usb/host/xhci-mem.c 2011-11-26 20:00:43.000000000 -0500
12916 @@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str
12917 unsigned int num_tests;
12918 int i, ret;
12919 @@ -36350,9 +37217,9 @@ diff -urNp linux-3.1.3/drivers/usb/host/xhci-mem.c linux-3.1.3/drivers/usb/host/
12920 num_tests = ARRAY_SIZE(simple_test_vector);
12921 for (i = 0; i < num_tests; i++) {
12922 ret = xhci_test_trb_in_td(xhci,
12923 -diff -urNp linux-3.1.3/drivers/usb/wusbcore/wa-hc.h linux-3.1.3/drivers/usb/wusbcore/wa-hc.h
12924 ---- linux-3.1.3/drivers/usb/wusbcore/wa-hc.h 2011-11-11 15:19:27.000000000 -0500
12925 -+++ linux-3.1.3/drivers/usb/wusbcore/wa-hc.h 2011-11-16 18:39:08.000000000 -0500
12926 +diff -urNp linux-3.1.4/drivers/usb/wusbcore/wa-hc.h linux-3.1.4/drivers/usb/wusbcore/wa-hc.h
12927 +--- linux-3.1.4/drivers/usb/wusbcore/wa-hc.h 2011-11-11 15:19:27.000000000 -0500
12928 ++++ linux-3.1.4/drivers/usb/wusbcore/wa-hc.h 2011-11-16 18:39:08.000000000 -0500
12929 @@ -192,7 +192,7 @@ struct wahc {
12930 struct list_head xfer_delayed_list;
12931 spinlock_t xfer_list_lock;
12932 @@ -36371,9 +37238,9 @@ diff -urNp linux-3.1.3/drivers/usb/wusbcore/wa-hc.h linux-3.1.3/drivers/usb/wusb
12933 }
12934
12935 /**
12936 -diff -urNp linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c
12937 ---- linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c 2011-11-11 15:19:27.000000000 -0500
12938 -+++ linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c 2011-11-16 18:39:08.000000000 -0500
12939 +diff -urNp linux-3.1.4/drivers/usb/wusbcore/wa-xfer.c linux-3.1.4/drivers/usb/wusbcore/wa-xfer.c
12940 +--- linux-3.1.4/drivers/usb/wusbcore/wa-xfer.c 2011-11-11 15:19:27.000000000 -0500
12941 ++++ linux-3.1.4/drivers/usb/wusbcore/wa-xfer.c 2011-11-16 18:39:08.000000000 -0500
12942 @@ -295,7 +295,7 @@ out:
12943 */
12944 static void wa_xfer_id_init(struct wa_xfer *xfer)
12945 @@ -36383,9 +37250,9 @@ diff -urNp linux-3.1.3/drivers/usb/wusbcore/wa-xfer.c linux-3.1.3/drivers/usb/wu
12946 }
12947
12948 /*
12949 -diff -urNp linux-3.1.3/drivers/vhost/vhost.c linux-3.1.3/drivers/vhost/vhost.c
12950 ---- linux-3.1.3/drivers/vhost/vhost.c 2011-11-11 15:19:27.000000000 -0500
12951 -+++ linux-3.1.3/drivers/vhost/vhost.c 2011-11-16 18:39:08.000000000 -0500
12952 +diff -urNp linux-3.1.4/drivers/vhost/vhost.c linux-3.1.4/drivers/vhost/vhost.c
12953 +--- linux-3.1.4/drivers/vhost/vhost.c 2011-11-11 15:19:27.000000000 -0500
12954 ++++ linux-3.1.4/drivers/vhost/vhost.c 2011-11-16 18:39:08.000000000 -0500
12955 @@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhos
12956 return 0;
12957 }
12958 @@ -36395,9 +37262,9 @@ diff -urNp linux-3.1.3/drivers/vhost/vhost.c linux-3.1.3/drivers/vhost/vhost.c
12959 {
12960 struct file *eventfp, *filep = NULL,
12961 *pollstart = NULL, *pollstop = NULL;
12962 -diff -urNp linux-3.1.3/drivers/video/aty/aty128fb.c linux-3.1.3/drivers/video/aty/aty128fb.c
12963 ---- linux-3.1.3/drivers/video/aty/aty128fb.c 2011-11-11 15:19:27.000000000 -0500
12964 -+++ linux-3.1.3/drivers/video/aty/aty128fb.c 2011-11-16 18:39:08.000000000 -0500
12965 +diff -urNp linux-3.1.4/drivers/video/aty/aty128fb.c linux-3.1.4/drivers/video/aty/aty128fb.c
12966 +--- linux-3.1.4/drivers/video/aty/aty128fb.c 2011-11-11 15:19:27.000000000 -0500
12967 ++++ linux-3.1.4/drivers/video/aty/aty128fb.c 2011-11-16 18:39:08.000000000 -0500
12968 @@ -148,7 +148,7 @@ enum {
12969 };
12970
12971 @@ -36407,9 +37274,9 @@ diff -urNp linux-3.1.3/drivers/video/aty/aty128fb.c linux-3.1.3/drivers/video/at
12972 "AGP",
12973 "PCI",
12974 "PRO AGP",
12975 -diff -urNp linux-3.1.3/drivers/video/fbcmap.c linux-3.1.3/drivers/video/fbcmap.c
12976 ---- linux-3.1.3/drivers/video/fbcmap.c 2011-11-11 15:19:27.000000000 -0500
12977 -+++ linux-3.1.3/drivers/video/fbcmap.c 2011-11-16 18:39:08.000000000 -0500
12978 +diff -urNp linux-3.1.4/drivers/video/fbcmap.c linux-3.1.4/drivers/video/fbcmap.c
12979 +--- linux-3.1.4/drivers/video/fbcmap.c 2011-11-11 15:19:27.000000000 -0500
12980 ++++ linux-3.1.4/drivers/video/fbcmap.c 2011-11-16 18:39:08.000000000 -0500
12981 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
12982 rc = -ENODEV;
12983 goto out;
12984 @@ -36420,9 +37287,9 @@ diff -urNp linux-3.1.3/drivers/video/fbcmap.c linux-3.1.3/drivers/video/fbcmap.c
12985 rc = -EINVAL;
12986 goto out1;
12987 }
12988 -diff -urNp linux-3.1.3/drivers/video/fbmem.c linux-3.1.3/drivers/video/fbmem.c
12989 ---- linux-3.1.3/drivers/video/fbmem.c 2011-11-11 15:19:27.000000000 -0500
12990 -+++ linux-3.1.3/drivers/video/fbmem.c 2011-11-16 18:40:29.000000000 -0500
12991 +diff -urNp linux-3.1.4/drivers/video/fbmem.c linux-3.1.4/drivers/video/fbmem.c
12992 +--- linux-3.1.4/drivers/video/fbmem.c 2011-11-11 15:19:27.000000000 -0500
12993 ++++ linux-3.1.4/drivers/video/fbmem.c 2011-11-16 18:40:29.000000000 -0500
12994 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
12995 image->dx += image->width + 8;
12996 }
12997 @@ -36468,9 +37335,9 @@ diff -urNp linux-3.1.3/drivers/video/fbmem.c linux-3.1.3/drivers/video/fbmem.c
12998 return -EINVAL;
12999 if (!registered_fb[con2fb.framebuffer])
13000 request_module("fb%d", con2fb.framebuffer);
13001 -diff -urNp linux-3.1.3/drivers/video/geode/gx1fb_core.c linux-3.1.3/drivers/video/geode/gx1fb_core.c
13002 ---- linux-3.1.3/drivers/video/geode/gx1fb_core.c 2011-11-11 15:19:27.000000000 -0500
13003 -+++ linux-3.1.3/drivers/video/geode/gx1fb_core.c 2011-11-16 18:39:08.000000000 -0500
13004 +diff -urNp linux-3.1.4/drivers/video/geode/gx1fb_core.c linux-3.1.4/drivers/video/geode/gx1fb_core.c
13005 +--- linux-3.1.4/drivers/video/geode/gx1fb_core.c 2011-11-11 15:19:27.000000000 -0500
13006 ++++ linux-3.1.4/drivers/video/geode/gx1fb_core.c 2011-11-16 18:39:08.000000000 -0500
13007 @@ -29,7 +29,7 @@ static int crt_option = 1;
13008 static char panel_option[32] = "";
13009
13010 @@ -36480,9 +37347,9 @@ diff -urNp linux-3.1.3/drivers/video/geode/gx1fb_core.c linux-3.1.3/drivers/vide
13011 /* 640x480-60 VESA */
13012 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
13013 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
13014 -diff -urNp linux-3.1.3/drivers/video/gxt4500.c linux-3.1.3/drivers/video/gxt4500.c
13015 ---- linux-3.1.3/drivers/video/gxt4500.c 2011-11-11 15:19:27.000000000 -0500
13016 -+++ linux-3.1.3/drivers/video/gxt4500.c 2011-11-16 18:39:08.000000000 -0500
13017 +diff -urNp linux-3.1.4/drivers/video/gxt4500.c linux-3.1.4/drivers/video/gxt4500.c
13018 +--- linux-3.1.4/drivers/video/gxt4500.c 2011-11-11 15:19:27.000000000 -0500
13019 ++++ linux-3.1.4/drivers/video/gxt4500.c 2011-11-16 18:39:08.000000000 -0500
13020 @@ -156,7 +156,7 @@ struct gxt4500_par {
13021 static char *mode_option;
13022
13023 @@ -36501,9 +37368,9 @@ diff -urNp linux-3.1.3/drivers/video/gxt4500.c linux-3.1.3/drivers/video/gxt4500
13024 .id = "IBM GXT4500P",
13025 .type = FB_TYPE_PACKED_PIXELS,
13026 .visual = FB_VISUAL_PSEUDOCOLOR,
13027 -diff -urNp linux-3.1.3/drivers/video/i810/i810_accel.c linux-3.1.3/drivers/video/i810/i810_accel.c
13028 ---- linux-3.1.3/drivers/video/i810/i810_accel.c 2011-11-11 15:19:27.000000000 -0500
13029 -+++ linux-3.1.3/drivers/video/i810/i810_accel.c 2011-11-16 18:39:08.000000000 -0500
13030 +diff -urNp linux-3.1.4/drivers/video/i810/i810_accel.c linux-3.1.4/drivers/video/i810/i810_accel.c
13031 +--- linux-3.1.4/drivers/video/i810/i810_accel.c 2011-11-11 15:19:27.000000000 -0500
13032 ++++ linux-3.1.4/drivers/video/i810/i810_accel.c 2011-11-16 18:39:08.000000000 -0500
13033 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct
13034 }
13035 }
13036 @@ -36512,9 +37379,9 @@ diff -urNp linux-3.1.3/drivers/video/i810/i810_accel.c linux-3.1.3/drivers/video
13037 i810_report_error(mmio);
13038 par->dev_flags |= LOCKUP;
13039 info->pixmap.scan_align = 1;
13040 -diff -urNp linux-3.1.3/drivers/video/i810/i810_main.c linux-3.1.3/drivers/video/i810/i810_main.c
13041 ---- linux-3.1.3/drivers/video/i810/i810_main.c 2011-11-11 15:19:27.000000000 -0500
13042 -+++ linux-3.1.3/drivers/video/i810/i810_main.c 2011-11-16 18:39:08.000000000 -0500
13043 +diff -urNp linux-3.1.4/drivers/video/i810/i810_main.c linux-3.1.4/drivers/video/i810/i810_main.c
13044 +--- linux-3.1.4/drivers/video/i810/i810_main.c 2011-11-11 15:19:27.000000000 -0500
13045 ++++ linux-3.1.4/drivers/video/i810/i810_main.c 2011-11-16 18:39:08.000000000 -0500
13046 @@ -97,7 +97,7 @@ static int i810fb_blank (int blank_
13047 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
13048
13049 @@ -36524,9 +37391,9 @@ diff -urNp linux-3.1.3/drivers/video/i810/i810_main.c linux-3.1.3/drivers/video/
13050 "Intel(R) 810 Framebuffer Device" ,
13051 "Intel(R) 810-DC100 Framebuffer Device" ,
13052 "Intel(R) 810E Framebuffer Device" ,
13053 -diff -urNp linux-3.1.3/drivers/video/jz4740_fb.c linux-3.1.3/drivers/video/jz4740_fb.c
13054 ---- linux-3.1.3/drivers/video/jz4740_fb.c 2011-11-11 15:19:27.000000000 -0500
13055 -+++ linux-3.1.3/drivers/video/jz4740_fb.c 2011-11-16 18:39:08.000000000 -0500
13056 +diff -urNp linux-3.1.4/drivers/video/jz4740_fb.c linux-3.1.4/drivers/video/jz4740_fb.c
13057 +--- linux-3.1.4/drivers/video/jz4740_fb.c 2011-11-11 15:19:27.000000000 -0500
13058 ++++ linux-3.1.4/drivers/video/jz4740_fb.c 2011-11-16 18:39:08.000000000 -0500
13059 @@ -136,7 +136,7 @@ struct jzfb {
13060 uint32_t pseudo_palette[16];
13061 };
13062 @@ -36536,9 +37403,9 @@ diff -urNp linux-3.1.3/drivers/video/jz4740_fb.c linux-3.1.3/drivers/video/jz474
13063 .id = "JZ4740 FB",
13064 .type = FB_TYPE_PACKED_PIXELS,
13065 .visual = FB_VISUAL_TRUECOLOR,
13066 -diff -urNp linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm
13067 ---- linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm 2011-11-11 15:19:27.000000000 -0500
13068 -+++ linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm 2011-11-16 18:40:29.000000000 -0500
13069 +diff -urNp linux-3.1.4/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.4/drivers/video/logo/logo_linux_clut224.ppm
13070 +--- linux-3.1.4/drivers/video/logo/logo_linux_clut224.ppm 2011-11-11 15:19:27.000000000 -0500
13071 ++++ linux-3.1.4/drivers/video/logo/logo_linux_clut224.ppm 2011-11-16 18:40:29.000000000 -0500
13072 @@ -1,1604 +1,1123 @@
13073 P3
13074 -# Standard 224-color Linux logo
13075 @@ -39264,9 +40131,9 @@ diff -urNp linux-3.1.3/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.3/dri
13076 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
13077 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
13078 +4 4 4 4 4 4
13079 -diff -urNp linux-3.1.3/drivers/video/udlfb.c linux-3.1.3/drivers/video/udlfb.c
13080 ---- linux-3.1.3/drivers/video/udlfb.c 2011-11-11 15:19:27.000000000 -0500
13081 -+++ linux-3.1.3/drivers/video/udlfb.c 2011-11-16 18:39:08.000000000 -0500
13082 +diff -urNp linux-3.1.4/drivers/video/udlfb.c linux-3.1.4/drivers/video/udlfb.c
13083 +--- linux-3.1.4/drivers/video/udlfb.c 2011-11-11 15:19:27.000000000 -0500
13084 ++++ linux-3.1.4/drivers/video/udlfb.c 2011-11-16 18:39:08.000000000 -0500
13085 @@ -585,11 +585,11 @@ int dlfb_handle_damage(struct dlfb_data
13086 dlfb_urb_completion(urb);
13087
13088 @@ -39350,9 +40217,9 @@ diff -urNp linux-3.1.3/drivers/video/udlfb.c linux-3.1.3/drivers/video/udlfb.c
13089
13090 return count;
13091 }
13092 -diff -urNp linux-3.1.3/drivers/video/uvesafb.c linux-3.1.3/drivers/video/uvesafb.c
13093 ---- linux-3.1.3/drivers/video/uvesafb.c 2011-11-11 15:19:27.000000000 -0500
13094 -+++ linux-3.1.3/drivers/video/uvesafb.c 2011-11-16 18:39:08.000000000 -0500
13095 +diff -urNp linux-3.1.4/drivers/video/uvesafb.c linux-3.1.4/drivers/video/uvesafb.c
13096 +--- linux-3.1.4/drivers/video/uvesafb.c 2011-11-11 15:19:27.000000000 -0500
13097 ++++ linux-3.1.4/drivers/video/uvesafb.c 2011-11-16 18:39:08.000000000 -0500
13098 @@ -19,6 +19,7 @@
13099 #include <linux/io.h>
13100 #include <linux/mutex.h>
13101 @@ -39428,9 +40295,9 @@ diff -urNp linux-3.1.3/drivers/video/uvesafb.c linux-3.1.3/drivers/video/uvesafb
13102 }
13103
13104 framebuffer_release(info);
13105 -diff -urNp linux-3.1.3/drivers/video/vesafb.c linux-3.1.3/drivers/video/vesafb.c
13106 ---- linux-3.1.3/drivers/video/vesafb.c 2011-11-11 15:19:27.000000000 -0500
13107 -+++ linux-3.1.3/drivers/video/vesafb.c 2011-11-16 18:39:08.000000000 -0500
13108 +diff -urNp linux-3.1.4/drivers/video/vesafb.c linux-3.1.4/drivers/video/vesafb.c
13109 +--- linux-3.1.4/drivers/video/vesafb.c 2011-11-11 15:19:27.000000000 -0500
13110 ++++ linux-3.1.4/drivers/video/vesafb.c 2011-11-16 18:39:08.000000000 -0500
13111 @@ -9,6 +9,7 @@
13112 */
13113
13114 @@ -39533,9 +40400,9 @@ diff -urNp linux-3.1.3/drivers/video/vesafb.c linux-3.1.3/drivers/video/vesafb.c
13115 if (info->screen_base)
13116 iounmap(info->screen_base);
13117 framebuffer_release(info);
13118 -diff -urNp linux-3.1.3/drivers/video/via/via_clock.h linux-3.1.3/drivers/video/via/via_clock.h
13119 ---- linux-3.1.3/drivers/video/via/via_clock.h 2011-11-11 15:19:27.000000000 -0500
13120 -+++ linux-3.1.3/drivers/video/via/via_clock.h 2011-11-16 18:39:08.000000000 -0500
13121 +diff -urNp linux-3.1.4/drivers/video/via/via_clock.h linux-3.1.4/drivers/video/via/via_clock.h
13122 +--- linux-3.1.4/drivers/video/via/via_clock.h 2011-11-11 15:19:27.000000000 -0500
13123 ++++ linux-3.1.4/drivers/video/via/via_clock.h 2011-11-16 18:39:08.000000000 -0500
13124 @@ -56,7 +56,7 @@ struct via_clock {
13125
13126 void (*set_engine_pll_state)(u8 state);
13127 @@ -39545,9 +40412,9 @@ diff -urNp linux-3.1.3/drivers/video/via/via_clock.h linux-3.1.3/drivers/video/v
13128
13129
13130 static inline u32 get_pll_internal_frequency(u32 ref_freq,
13131 -diff -urNp linux-3.1.3/drivers/virtio/virtio_balloon.c linux-3.1.3/drivers/virtio/virtio_balloon.c
13132 ---- linux-3.1.3/drivers/virtio/virtio_balloon.c 2011-11-11 15:19:27.000000000 -0500
13133 -+++ linux-3.1.3/drivers/virtio/virtio_balloon.c 2011-11-16 18:40:29.000000000 -0500
13134 +diff -urNp linux-3.1.4/drivers/virtio/virtio_balloon.c linux-3.1.4/drivers/virtio/virtio_balloon.c
13135 +--- linux-3.1.4/drivers/virtio/virtio_balloon.c 2011-11-11 15:19:27.000000000 -0500
13136 ++++ linux-3.1.4/drivers/virtio/virtio_balloon.c 2011-11-16 18:40:29.000000000 -0500
13137 @@ -174,6 +174,8 @@ static void update_balloon_stats(struct
13138 struct sysinfo i;
13139 int idx = 0;
13140 @@ -39557,9 +40424,9 @@ diff -urNp linux-3.1.3/drivers/virtio/virtio_balloon.c linux-3.1.3/drivers/virti
13141 all_vm_events(events);
13142 si_meminfo(&i);
13143
13144 -diff -urNp linux-3.1.3/drivers/xen/xen-pciback/conf_space.h linux-3.1.3/drivers/xen/xen-pciback/conf_space.h
13145 ---- linux-3.1.3/drivers/xen/xen-pciback/conf_space.h 2011-11-11 15:19:27.000000000 -0500
13146 -+++ linux-3.1.3/drivers/xen/xen-pciback/conf_space.h 2011-11-16 18:39:08.000000000 -0500
13147 +diff -urNp linux-3.1.4/drivers/xen/xen-pciback/conf_space.h linux-3.1.4/drivers/xen/xen-pciback/conf_space.h
13148 +--- linux-3.1.4/drivers/xen/xen-pciback/conf_space.h 2011-11-11 15:19:27.000000000 -0500
13149 ++++ linux-3.1.4/drivers/xen/xen-pciback/conf_space.h 2011-11-16 18:39:08.000000000 -0500
13150 @@ -44,15 +44,15 @@ struct config_field {
13151 struct {
13152 conf_dword_write write;
13153 @@ -39579,9 +40446,9 @@ diff -urNp linux-3.1.3/drivers/xen/xen-pciback/conf_space.h linux-3.1.3/drivers/
13154 } u;
13155 struct list_head list;
13156 };
13157 -diff -urNp linux-3.1.3/fs/9p/vfs_inode.c linux-3.1.3/fs/9p/vfs_inode.c
13158 ---- linux-3.1.3/fs/9p/vfs_inode.c 2011-11-11 15:19:27.000000000 -0500
13159 -+++ linux-3.1.3/fs/9p/vfs_inode.c 2011-11-16 18:39:08.000000000 -0500
13160 +diff -urNp linux-3.1.4/fs/9p/vfs_inode.c linux-3.1.4/fs/9p/vfs_inode.c
13161 +--- linux-3.1.4/fs/9p/vfs_inode.c 2011-11-11 15:19:27.000000000 -0500
13162 ++++ linux-3.1.4/fs/9p/vfs_inode.c 2011-11-16 18:39:08.000000000 -0500
13163 @@ -1288,7 +1288,7 @@ static void *v9fs_vfs_follow_link(struct
13164 void
13165 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
13166 @@ -39591,9 +40458,9 @@ diff -urNp linux-3.1.3/fs/9p/vfs_inode.c linux-3.1.3/fs/9p/vfs_inode.c
13167
13168 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
13169 IS_ERR(s) ? "<error>" : s);
13170 -diff -urNp linux-3.1.3/fs/aio.c linux-3.1.3/fs/aio.c
13171 ---- linux-3.1.3/fs/aio.c 2011-11-11 15:19:27.000000000 -0500
13172 -+++ linux-3.1.3/fs/aio.c 2011-11-16 18:40:29.000000000 -0500
13173 +diff -urNp linux-3.1.4/fs/aio.c linux-3.1.4/fs/aio.c
13174 +--- linux-3.1.4/fs/aio.c 2011-11-11 15:19:27.000000000 -0500
13175 ++++ linux-3.1.4/fs/aio.c 2011-11-16 18:40:29.000000000 -0500
13176 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx
13177 size += sizeof(struct io_event) * nr_events;
13178 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
13179 @@ -39642,9 +40509,9 @@ diff -urNp linux-3.1.3/fs/aio.c linux-3.1.3/fs/aio.c
13180 kiocb->ki_nr_segs = kiocb->ki_nbytes;
13181 kiocb->ki_cur_seg = 0;
13182 /* ki_nbytes/left now reflect bytes instead of segs */
13183 -diff -urNp linux-3.1.3/fs/attr.c linux-3.1.3/fs/attr.c
13184 ---- linux-3.1.3/fs/attr.c 2011-11-11 15:19:27.000000000 -0500
13185 -+++ linux-3.1.3/fs/attr.c 2011-11-16 18:40:29.000000000 -0500
13186 +diff -urNp linux-3.1.4/fs/attr.c linux-3.1.4/fs/attr.c
13187 +--- linux-3.1.4/fs/attr.c 2011-11-11 15:19:27.000000000 -0500
13188 ++++ linux-3.1.4/fs/attr.c 2011-11-16 18:40:29.000000000 -0500
13189 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode
13190 unsigned long limit;
13191
13192 @@ -39653,9 +40520,9 @@ diff -urNp linux-3.1.3/fs/attr.c linux-3.1.3/fs/attr.c
13193 if (limit != RLIM_INFINITY && offset > limit)
13194 goto out_sig;
13195 if (offset > inode->i_sb->s_maxbytes)
13196 -diff -urNp linux-3.1.3/fs/autofs4/waitq.c linux-3.1.3/fs/autofs4/waitq.c
13197 ---- linux-3.1.3/fs/autofs4/waitq.c 2011-11-11 15:19:27.000000000 -0500
13198 -+++ linux-3.1.3/fs/autofs4/waitq.c 2011-11-16 18:39:08.000000000 -0500
13199 +diff -urNp linux-3.1.4/fs/autofs4/waitq.c linux-3.1.4/fs/autofs4/waitq.c
13200 +--- linux-3.1.4/fs/autofs4/waitq.c 2011-11-11 15:19:27.000000000 -0500
13201 ++++ linux-3.1.4/fs/autofs4/waitq.c 2011-11-16 18:39:08.000000000 -0500
13202 @@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
13203 {
13204 unsigned long sigpipe, flags;
13205 @@ -39665,9 +40532,9 @@ diff -urNp linux-3.1.3/fs/autofs4/waitq.c linux-3.1.3/fs/autofs4/waitq.c
13206 ssize_t wr = 0;
13207
13208 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
13209 -diff -urNp linux-3.1.3/fs/befs/linuxvfs.c linux-3.1.3/fs/befs/linuxvfs.c
13210 ---- linux-3.1.3/fs/befs/linuxvfs.c 2011-11-11 15:19:27.000000000 -0500
13211 -+++ linux-3.1.3/fs/befs/linuxvfs.c 2011-11-16 18:39:08.000000000 -0500
13212 +diff -urNp linux-3.1.4/fs/befs/linuxvfs.c linux-3.1.4/fs/befs/linuxvfs.c
13213 +--- linux-3.1.4/fs/befs/linuxvfs.c 2011-11-11 15:19:27.000000000 -0500
13214 ++++ linux-3.1.4/fs/befs/linuxvfs.c 2011-11-16 18:39:08.000000000 -0500
13215 @@ -503,7 +503,7 @@ static void befs_put_link(struct dentry
13216 {
13217 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
13218 @@ -39677,9 +40544,9 @@ diff -urNp linux-3.1.3/fs/befs/linuxvfs.c linux-3.1.3/fs/befs/linuxvfs.c
13219 if (!IS_ERR(link))
13220 kfree(link);
13221 }
13222 -diff -urNp linux-3.1.3/fs/binfmt_aout.c linux-3.1.3/fs/binfmt_aout.c
13223 ---- linux-3.1.3/fs/binfmt_aout.c 2011-11-11 15:19:27.000000000 -0500
13224 -+++ linux-3.1.3/fs/binfmt_aout.c 2011-11-16 18:40:29.000000000 -0500
13225 +diff -urNp linux-3.1.4/fs/binfmt_aout.c linux-3.1.4/fs/binfmt_aout.c
13226 +--- linux-3.1.4/fs/binfmt_aout.c 2011-11-11 15:19:27.000000000 -0500
13227 ++++ linux-3.1.4/fs/binfmt_aout.c 2011-11-16 18:40:29.000000000 -0500
13228 @@ -16,6 +16,7 @@
13229 #include <linux/string.h>
13230 #include <linux/fs.h>
13231 @@ -39756,9 +40623,9 @@ diff -urNp linux-3.1.3/fs/binfmt_aout.c linux-3.1.3/fs/binfmt_aout.c
13232 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
13233 fd_offset + ex.a_text);
13234 up_write(&current->mm->mmap_sem);
13235 -diff -urNp linux-3.1.3/fs/binfmt_elf.c linux-3.1.3/fs/binfmt_elf.c
13236 ---- linux-3.1.3/fs/binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
13237 -+++ linux-3.1.3/fs/binfmt_elf.c 2011-11-16 18:40:29.000000000 -0500
13238 +diff -urNp linux-3.1.4/fs/binfmt_elf.c linux-3.1.4/fs/binfmt_elf.c
13239 +--- linux-3.1.4/fs/binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
13240 ++++ linux-3.1.4/fs/binfmt_elf.c 2011-11-16 18:40:29.000000000 -0500
13241 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
13242 #define elf_core_dump NULL
13243 #endif
13244 @@ -40462,9 +41329,9 @@ diff -urNp linux-3.1.3/fs/binfmt_elf.c linux-3.1.3/fs/binfmt_elf.c
13245 static int __init init_elf_binfmt(void)
13246 {
13247 return register_binfmt(&elf_format);
13248 -diff -urNp linux-3.1.3/fs/binfmt_flat.c linux-3.1.3/fs/binfmt_flat.c
13249 ---- linux-3.1.3/fs/binfmt_flat.c 2011-11-11 15:19:27.000000000 -0500
13250 -+++ linux-3.1.3/fs/binfmt_flat.c 2011-11-16 18:39:08.000000000 -0500
13251 +diff -urNp linux-3.1.4/fs/binfmt_flat.c linux-3.1.4/fs/binfmt_flat.c
13252 +--- linux-3.1.4/fs/binfmt_flat.c 2011-11-11 15:19:27.000000000 -0500
13253 ++++ linux-3.1.4/fs/binfmt_flat.c 2011-11-16 18:39:08.000000000 -0500
13254 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
13255 realdatastart = (unsigned long) -ENOMEM;
13256 printk("Unable to allocate RAM for process data, errno %d\n",
13257 @@ -40497,9 +41364,9 @@ diff -urNp linux-3.1.3/fs/binfmt_flat.c linux-3.1.3/fs/binfmt_flat.c
13258 ret = result;
13259 goto err;
13260 }
13261 -diff -urNp linux-3.1.3/fs/bio.c linux-3.1.3/fs/bio.c
13262 ---- linux-3.1.3/fs/bio.c 2011-11-11 15:19:27.000000000 -0500
13263 -+++ linux-3.1.3/fs/bio.c 2011-11-16 18:39:08.000000000 -0500
13264 +diff -urNp linux-3.1.4/fs/bio.c linux-3.1.4/fs/bio.c
13265 +--- linux-3.1.4/fs/bio.c 2011-11-11 15:19:27.000000000 -0500
13266 ++++ linux-3.1.4/fs/bio.c 2011-11-16 18:39:08.000000000 -0500
13267 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
13268 const int read = bio_data_dir(bio) == READ;
13269 struct bio_map_data *bmd = bio->bi_private;
13270 @@ -40509,9 +41376,9 @@ diff -urNp linux-3.1.3/fs/bio.c linux-3.1.3/fs/bio.c
13271
13272 __bio_for_each_segment(bvec, bio, i, 0) {
13273 char *addr = page_address(bvec->bv_page);
13274 -diff -urNp linux-3.1.3/fs/block_dev.c linux-3.1.3/fs/block_dev.c
13275 ---- linux-3.1.3/fs/block_dev.c 2011-11-11 15:19:27.000000000 -0500
13276 -+++ linux-3.1.3/fs/block_dev.c 2011-11-16 18:39:08.000000000 -0500
13277 +diff -urNp linux-3.1.4/fs/block_dev.c linux-3.1.4/fs/block_dev.c
13278 +--- linux-3.1.4/fs/block_dev.c 2011-11-11 15:19:27.000000000 -0500
13279 ++++ linux-3.1.4/fs/block_dev.c 2011-11-16 18:39:08.000000000 -0500
13280 @@ -681,7 +681,7 @@ static bool bd_may_claim(struct block_de
13281 else if (bdev->bd_contains == bdev)
13282 return true; /* is a whole device which isn't held */
13283 @@ -40521,9 +41388,9 @@ diff -urNp linux-3.1.3/fs/block_dev.c linux-3.1.3/fs/block_dev.c
13284 return true; /* is a partition of a device that is being partitioned */
13285 else if (whole->bd_holder != NULL)
13286 return false; /* is a partition of a held device */
13287 -diff -urNp linux-3.1.3/fs/btrfs/ctree.c linux-3.1.3/fs/btrfs/ctree.c
13288 ---- linux-3.1.3/fs/btrfs/ctree.c 2011-11-11 15:19:27.000000000 -0500
13289 -+++ linux-3.1.3/fs/btrfs/ctree.c 2011-11-16 18:39:08.000000000 -0500
13290 +diff -urNp linux-3.1.4/fs/btrfs/ctree.c linux-3.1.4/fs/btrfs/ctree.c
13291 +--- linux-3.1.4/fs/btrfs/ctree.c 2011-11-11 15:19:27.000000000 -0500
13292 ++++ linux-3.1.4/fs/btrfs/ctree.c 2011-11-16 18:39:08.000000000 -0500
13293 @@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(st
13294 free_extent_buffer(buf);
13295 add_root_to_dirty_list(root);
13296 @@ -40540,9 +41407,9 @@ diff -urNp linux-3.1.3/fs/btrfs/ctree.c linux-3.1.3/fs/btrfs/ctree.c
13297 parent_start = 0;
13298
13299 WARN_ON(trans->transid != btrfs_header_generation(parent));
13300 -diff -urNp linux-3.1.3/fs/btrfs/inode.c linux-3.1.3/fs/btrfs/inode.c
13301 ---- linux-3.1.3/fs/btrfs/inode.c 2011-11-11 15:19:27.000000000 -0500
13302 -+++ linux-3.1.3/fs/btrfs/inode.c 2011-11-17 18:12:11.000000000 -0500
13303 +diff -urNp linux-3.1.4/fs/btrfs/inode.c linux-3.1.4/fs/btrfs/inode.c
13304 +--- linux-3.1.4/fs/btrfs/inode.c 2011-11-11 15:19:27.000000000 -0500
13305 ++++ linux-3.1.4/fs/btrfs/inode.c 2011-11-17 18:12:11.000000000 -0500
13306 @@ -6922,7 +6922,7 @@ fail:
13307 return -ENOMEM;
13308 }
13309 @@ -40567,9 +41434,9 @@ diff -urNp linux-3.1.3/fs/btrfs/inode.c linux-3.1.3/fs/btrfs/inode.c
13310 /*
13311 * If a file is moved, it will inherit the cow and compression flags of the new
13312 * directory.
13313 -diff -urNp linux-3.1.3/fs/btrfs/ioctl.c linux-3.1.3/fs/btrfs/ioctl.c
13314 ---- linux-3.1.3/fs/btrfs/ioctl.c 2011-11-11 15:19:27.000000000 -0500
13315 -+++ linux-3.1.3/fs/btrfs/ioctl.c 2011-11-16 18:40:29.000000000 -0500
13316 +diff -urNp linux-3.1.4/fs/btrfs/ioctl.c linux-3.1.4/fs/btrfs/ioctl.c
13317 +--- linux-3.1.4/fs/btrfs/ioctl.c 2011-11-11 15:19:27.000000000 -0500
13318 ++++ linux-3.1.4/fs/btrfs/ioctl.c 2011-11-16 18:40:29.000000000 -0500
13319 @@ -2704,9 +2704,12 @@ long btrfs_ioctl_space_info(struct btrfs
13320 for (i = 0; i < num_types; i++) {
13321 struct btrfs_space_info *tmp;
13322 @@ -40600,9 +41467,9 @@ diff -urNp linux-3.1.3/fs/btrfs/ioctl.c linux-3.1.3/fs/btrfs/ioctl.c
13323 (arg + sizeof(struct btrfs_ioctl_space_args));
13324
13325 if (copy_to_user(user_dest, dest_orig, alloc_size))
13326 -diff -urNp linux-3.1.3/fs/btrfs/relocation.c linux-3.1.3/fs/btrfs/relocation.c
13327 ---- linux-3.1.3/fs/btrfs/relocation.c 2011-11-11 15:19:27.000000000 -0500
13328 -+++ linux-3.1.3/fs/btrfs/relocation.c 2011-11-16 18:39:08.000000000 -0500
13329 +diff -urNp linux-3.1.4/fs/btrfs/relocation.c linux-3.1.4/fs/btrfs/relocation.c
13330 +--- linux-3.1.4/fs/btrfs/relocation.c 2011-11-11 15:19:27.000000000 -0500
13331 ++++ linux-3.1.4/fs/btrfs/relocation.c 2011-11-16 18:39:08.000000000 -0500
13332 @@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
13333 }
13334 spin_unlock(&rc->reloc_root_tree.lock);
13335 @@ -40612,9 +41479,9 @@ diff -urNp linux-3.1.3/fs/btrfs/relocation.c linux-3.1.3/fs/btrfs/relocation.c
13336
13337 if (!del) {
13338 spin_lock(&rc->reloc_root_tree.lock);
13339 -diff -urNp linux-3.1.3/fs/cachefiles/bind.c linux-3.1.3/fs/cachefiles/bind.c
13340 ---- linux-3.1.3/fs/cachefiles/bind.c 2011-11-11 15:19:27.000000000 -0500
13341 -+++ linux-3.1.3/fs/cachefiles/bind.c 2011-11-16 18:39:08.000000000 -0500
13342 +diff -urNp linux-3.1.4/fs/cachefiles/bind.c linux-3.1.4/fs/cachefiles/bind.c
13343 +--- linux-3.1.4/fs/cachefiles/bind.c 2011-11-11 15:19:27.000000000 -0500
13344 ++++ linux-3.1.4/fs/cachefiles/bind.c 2011-11-16 18:39:08.000000000 -0500
13345 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
13346 args);
13347
13348 @@ -40631,9 +41498,9 @@ diff -urNp linux-3.1.3/fs/cachefiles/bind.c linux-3.1.3/fs/cachefiles/bind.c
13349 cache->bcull_percent < cache->brun_percent &&
13350 cache->brun_percent < 100);
13351
13352 -diff -urNp linux-3.1.3/fs/cachefiles/daemon.c linux-3.1.3/fs/cachefiles/daemon.c
13353 ---- linux-3.1.3/fs/cachefiles/daemon.c 2011-11-11 15:19:27.000000000 -0500
13354 -+++ linux-3.1.3/fs/cachefiles/daemon.c 2011-11-16 18:39:08.000000000 -0500
13355 +diff -urNp linux-3.1.4/fs/cachefiles/daemon.c linux-3.1.4/fs/cachefiles/daemon.c
13356 +--- linux-3.1.4/fs/cachefiles/daemon.c 2011-11-11 15:19:27.000000000 -0500
13357 ++++ linux-3.1.4/fs/cachefiles/daemon.c 2011-11-16 18:39:08.000000000 -0500
13358 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
13359 if (n > buflen)
13360 return -EMSGSIZE;
13361 @@ -40670,9 +41537,9 @@ diff -urNp linux-3.1.3/fs/cachefiles/daemon.c linux-3.1.3/fs/cachefiles/daemon.c
13362 return cachefiles_daemon_range_error(cache, args);
13363
13364 cache->bstop_percent = bstop;
13365 -diff -urNp linux-3.1.3/fs/cachefiles/internal.h linux-3.1.3/fs/cachefiles/internal.h
13366 ---- linux-3.1.3/fs/cachefiles/internal.h 2011-11-11 15:19:27.000000000 -0500
13367 -+++ linux-3.1.3/fs/cachefiles/internal.h 2011-11-16 18:39:08.000000000 -0500
13368 +diff -urNp linux-3.1.4/fs/cachefiles/internal.h linux-3.1.4/fs/cachefiles/internal.h
13369 +--- linux-3.1.4/fs/cachefiles/internal.h 2011-11-11 15:19:27.000000000 -0500
13370 ++++ linux-3.1.4/fs/cachefiles/internal.h 2011-11-16 18:39:08.000000000 -0500
13371 @@ -57,7 +57,7 @@ struct cachefiles_cache {
13372 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
13373 struct rb_root active_nodes; /* active nodes (can't be culled) */
13374 @@ -40707,9 +41574,9 @@ diff -urNp linux-3.1.3/fs/cachefiles/internal.h linux-3.1.3/fs/cachefiles/intern
13375 }
13376
13377 #else
13378 -diff -urNp linux-3.1.3/fs/cachefiles/namei.c linux-3.1.3/fs/cachefiles/namei.c
13379 ---- linux-3.1.3/fs/cachefiles/namei.c 2011-11-11 15:19:27.000000000 -0500
13380 -+++ linux-3.1.3/fs/cachefiles/namei.c 2011-11-16 18:39:08.000000000 -0500
13381 +diff -urNp linux-3.1.4/fs/cachefiles/namei.c linux-3.1.4/fs/cachefiles/namei.c
13382 +--- linux-3.1.4/fs/cachefiles/namei.c 2011-11-11 15:19:27.000000000 -0500
13383 ++++ linux-3.1.4/fs/cachefiles/namei.c 2011-11-16 18:39:08.000000000 -0500
13384 @@ -318,7 +318,7 @@ try_again:
13385 /* first step is to make up a grave dentry in the graveyard */
13386 sprintf(nbuffer, "%08x%08x",
13387 @@ -40719,9 +41586,9 @@ diff -urNp linux-3.1.3/fs/cachefiles/namei.c linux-3.1.3/fs/cachefiles/namei.c
13388
13389 /* do the multiway lock magic */
13390 trap = lock_rename(cache->graveyard, dir);
13391 -diff -urNp linux-3.1.3/fs/cachefiles/proc.c linux-3.1.3/fs/cachefiles/proc.c
13392 ---- linux-3.1.3/fs/cachefiles/proc.c 2011-11-11 15:19:27.000000000 -0500
13393 -+++ linux-3.1.3/fs/cachefiles/proc.c 2011-11-16 18:39:08.000000000 -0500
13394 +diff -urNp linux-3.1.4/fs/cachefiles/proc.c linux-3.1.4/fs/cachefiles/proc.c
13395 +--- linux-3.1.4/fs/cachefiles/proc.c 2011-11-11 15:19:27.000000000 -0500
13396 ++++ linux-3.1.4/fs/cachefiles/proc.c 2011-11-16 18:39:08.000000000 -0500
13397 @@ -14,9 +14,9 @@
13398 #include <linux/seq_file.h>
13399 #include "internal.h"
13400 @@ -40748,9 +41615,9 @@ diff -urNp linux-3.1.3/fs/cachefiles/proc.c linux-3.1.3/fs/cachefiles/proc.c
13401 if (x == 0 && y == 0 && z == 0)
13402 return 0;
13403
13404 -diff -urNp linux-3.1.3/fs/cachefiles/rdwr.c linux-3.1.3/fs/cachefiles/rdwr.c
13405 ---- linux-3.1.3/fs/cachefiles/rdwr.c 2011-11-11 15:19:27.000000000 -0500
13406 -+++ linux-3.1.3/fs/cachefiles/rdwr.c 2011-11-16 18:39:08.000000000 -0500
13407 +diff -urNp linux-3.1.4/fs/cachefiles/rdwr.c linux-3.1.4/fs/cachefiles/rdwr.c
13408 +--- linux-3.1.4/fs/cachefiles/rdwr.c 2011-11-11 15:19:27.000000000 -0500
13409 ++++ linux-3.1.4/fs/cachefiles/rdwr.c 2011-11-16 18:39:08.000000000 -0500
13410 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
13411 old_fs = get_fs();
13412 set_fs(KERNEL_DS);
13413 @@ -40760,9 +41627,9 @@ diff -urNp linux-3.1.3/fs/cachefiles/rdwr.c linux-3.1.3/fs/cachefiles/rdwr.c
13414 set_fs(old_fs);
13415 kunmap(page);
13416 if (ret != len)
13417 -diff -urNp linux-3.1.3/fs/ceph/dir.c linux-3.1.3/fs/ceph/dir.c
13418 ---- linux-3.1.3/fs/ceph/dir.c 2011-11-11 15:19:27.000000000 -0500
13419 -+++ linux-3.1.3/fs/ceph/dir.c 2011-11-16 18:39:08.000000000 -0500
13420 +diff -urNp linux-3.1.4/fs/ceph/dir.c linux-3.1.4/fs/ceph/dir.c
13421 +--- linux-3.1.4/fs/ceph/dir.c 2011-11-11 15:19:27.000000000 -0500
13422 ++++ linux-3.1.4/fs/ceph/dir.c 2011-11-16 18:39:08.000000000 -0500
13423 @@ -244,7 +244,7 @@ static int ceph_readdir(struct file *fil
13424 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
13425 struct ceph_mds_client *mdsc = fsc->mdsc;
13426 @@ -40772,9 +41639,9 @@ diff -urNp linux-3.1.3/fs/ceph/dir.c linux-3.1.3/fs/ceph/dir.c
13427 int err;
13428 u32 ftype;
13429 struct ceph_mds_reply_info_parsed *rinfo;
13430 -diff -urNp linux-3.1.3/fs/cifs/cifs_debug.c linux-3.1.3/fs/cifs/cifs_debug.c
13431 ---- linux-3.1.3/fs/cifs/cifs_debug.c 2011-11-11 15:19:27.000000000 -0500
13432 -+++ linux-3.1.3/fs/cifs/cifs_debug.c 2011-11-16 18:39:08.000000000 -0500
13433 +diff -urNp linux-3.1.4/fs/cifs/cifs_debug.c linux-3.1.4/fs/cifs/cifs_debug.c
13434 +--- linux-3.1.4/fs/cifs/cifs_debug.c 2011-11-11 15:19:27.000000000 -0500
13435 ++++ linux-3.1.4/fs/cifs/cifs_debug.c 2011-11-16 18:39:08.000000000 -0500
13436 @@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
13437
13438 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
13439 @@ -40904,9 +41771,9 @@ diff -urNp linux-3.1.3/fs/cifs/cifs_debug.c linux-3.1.3/fs/cifs/cifs_debug.c
13440 }
13441 }
13442 }
13443 -diff -urNp linux-3.1.3/fs/cifs/cifsfs.c linux-3.1.3/fs/cifs/cifsfs.c
13444 ---- linux-3.1.3/fs/cifs/cifsfs.c 2011-11-11 15:19:27.000000000 -0500
13445 -+++ linux-3.1.3/fs/cifs/cifsfs.c 2011-11-16 18:39:08.000000000 -0500
13446 +diff -urNp linux-3.1.4/fs/cifs/cifsfs.c linux-3.1.4/fs/cifs/cifsfs.c
13447 +--- linux-3.1.4/fs/cifs/cifsfs.c 2011-11-11 15:19:27.000000000 -0500
13448 ++++ linux-3.1.4/fs/cifs/cifsfs.c 2011-11-16 18:39:08.000000000 -0500
13449 @@ -981,7 +981,7 @@ cifs_init_request_bufs(void)
13450 cifs_req_cachep = kmem_cache_create("cifs_request",
13451 CIFSMaxBufSize +
13452 @@ -40936,9 +41803,9 @@ diff -urNp linux-3.1.3/fs/cifs/cifsfs.c linux-3.1.3/fs/cifs/cifsfs.c
13453 #endif /* CONFIG_CIFS_STATS2 */
13454
13455 atomic_set(&midCount, 0);
13456 -diff -urNp linux-3.1.3/fs/cifs/cifsglob.h linux-3.1.3/fs/cifs/cifsglob.h
13457 ---- linux-3.1.3/fs/cifs/cifsglob.h 2011-11-11 15:19:27.000000000 -0500
13458 -+++ linux-3.1.3/fs/cifs/cifsglob.h 2011-11-16 18:39:08.000000000 -0500
13459 +diff -urNp linux-3.1.4/fs/cifs/cifsglob.h linux-3.1.4/fs/cifs/cifsglob.h
13460 +--- linux-3.1.4/fs/cifs/cifsglob.h 2011-11-11 15:19:27.000000000 -0500
13461 ++++ linux-3.1.4/fs/cifs/cifsglob.h 2011-11-16 18:39:08.000000000 -0500
13462 @@ -381,28 +381,28 @@ struct cifs_tcon {
13463 __u16 Flags; /* optional support bits */
13464 enum statusEnum tidStatus;
13465 @@ -41010,9 +41877,9 @@ diff -urNp linux-3.1.3/fs/cifs/cifsglob.h linux-3.1.3/fs/cifs/cifsglob.h
13466 #endif
13467 GLOBAL_EXTERN atomic_t smBufAllocCount;
13468 GLOBAL_EXTERN atomic_t midCount;
13469 -diff -urNp linux-3.1.3/fs/cifs/link.c linux-3.1.3/fs/cifs/link.c
13470 ---- linux-3.1.3/fs/cifs/link.c 2011-11-11 15:19:27.000000000 -0500
13471 -+++ linux-3.1.3/fs/cifs/link.c 2011-11-16 18:39:08.000000000 -0500
13472 +diff -urNp linux-3.1.4/fs/cifs/link.c linux-3.1.4/fs/cifs/link.c
13473 +--- linux-3.1.4/fs/cifs/link.c 2011-11-11 15:19:27.000000000 -0500
13474 ++++ linux-3.1.4/fs/cifs/link.c 2011-11-16 18:39:08.000000000 -0500
13475 @@ -593,7 +593,7 @@ symlink_exit:
13476
13477 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
13478 @@ -41022,9 +41889,9 @@ diff -urNp linux-3.1.3/fs/cifs/link.c linux-3.1.3/fs/cifs/link.c
13479 if (!IS_ERR(p))
13480 kfree(p);
13481 }
13482 -diff -urNp linux-3.1.3/fs/cifs/misc.c linux-3.1.3/fs/cifs/misc.c
13483 ---- linux-3.1.3/fs/cifs/misc.c 2011-11-11 15:19:27.000000000 -0500
13484 -+++ linux-3.1.3/fs/cifs/misc.c 2011-11-16 18:39:08.000000000 -0500
13485 +diff -urNp linux-3.1.4/fs/cifs/misc.c linux-3.1.4/fs/cifs/misc.c
13486 +--- linux-3.1.4/fs/cifs/misc.c 2011-11-11 15:19:27.000000000 -0500
13487 ++++ linux-3.1.4/fs/cifs/misc.c 2011-11-16 18:39:08.000000000 -0500
13488 @@ -156,7 +156,7 @@ cifs_buf_get(void)
13489 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
13490 atomic_inc(&bufAllocCount);
13491 @@ -41043,9 +41910,9 @@ diff -urNp linux-3.1.3/fs/cifs/misc.c linux-3.1.3/fs/cifs/misc.c
13492 #endif /* CONFIG_CIFS_STATS2 */
13493
13494 }
13495 -diff -urNp linux-3.1.3/fs/coda/cache.c linux-3.1.3/fs/coda/cache.c
13496 ---- linux-3.1.3/fs/coda/cache.c 2011-11-11 15:19:27.000000000 -0500
13497 -+++ linux-3.1.3/fs/coda/cache.c 2011-11-16 18:39:08.000000000 -0500
13498 +diff -urNp linux-3.1.4/fs/coda/cache.c linux-3.1.4/fs/coda/cache.c
13499 +--- linux-3.1.4/fs/coda/cache.c 2011-11-11 15:19:27.000000000 -0500
13500 ++++ linux-3.1.4/fs/coda/cache.c 2011-11-16 18:39:08.000000000 -0500
13501 @@ -24,7 +24,7 @@
13502 #include "coda_linux.h"
13503 #include "coda_cache.h"
13504 @@ -41090,9 +41957,9 @@ diff -urNp linux-3.1.3/fs/coda/cache.c linux-3.1.3/fs/coda/cache.c
13505 spin_unlock(&cii->c_lock);
13506
13507 return hit;
13508 -diff -urNp linux-3.1.3/fs/compat_binfmt_elf.c linux-3.1.3/fs/compat_binfmt_elf.c
13509 ---- linux-3.1.3/fs/compat_binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
13510 -+++ linux-3.1.3/fs/compat_binfmt_elf.c 2011-11-16 18:39:08.000000000 -0500
13511 +diff -urNp linux-3.1.4/fs/compat_binfmt_elf.c linux-3.1.4/fs/compat_binfmt_elf.c
13512 +--- linux-3.1.4/fs/compat_binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
13513 ++++ linux-3.1.4/fs/compat_binfmt_elf.c 2011-11-16 18:39:08.000000000 -0500
13514 @@ -30,11 +30,13 @@
13515 #undef elf_phdr
13516 #undef elf_shdr
13517 @@ -41107,9 +41974,9 @@ diff -urNp linux-3.1.3/fs/compat_binfmt_elf.c linux-3.1.3/fs/compat_binfmt_elf.c
13518 #define elf_addr_t Elf32_Addr
13519
13520 /*
13521 -diff -urNp linux-3.1.3/fs/compat.c linux-3.1.3/fs/compat.c
13522 ---- linux-3.1.3/fs/compat.c 2011-11-11 15:19:27.000000000 -0500
13523 -+++ linux-3.1.3/fs/compat.c 2011-11-16 18:40:29.000000000 -0500
13524 +diff -urNp linux-3.1.4/fs/compat.c linux-3.1.4/fs/compat.c
13525 +--- linux-3.1.4/fs/compat.c 2011-11-11 15:19:27.000000000 -0500
13526 ++++ linux-3.1.4/fs/compat.c 2011-11-16 18:40:29.000000000 -0500
13527 @@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const
13528 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
13529 {
13530 @@ -41237,9 +42104,9 @@ diff -urNp linux-3.1.3/fs/compat.c linux-3.1.3/fs/compat.c
13531 if (n < 0)
13532 goto out_nofds;
13533
13534 -diff -urNp linux-3.1.3/fs/compat_ioctl.c linux-3.1.3/fs/compat_ioctl.c
13535 ---- linux-3.1.3/fs/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
13536 -+++ linux-3.1.3/fs/compat_ioctl.c 2011-11-16 18:39:08.000000000 -0500
13537 +diff -urNp linux-3.1.4/fs/compat_ioctl.c linux-3.1.4/fs/compat_ioctl.c
13538 +--- linux-3.1.4/fs/compat_ioctl.c 2011-11-11 15:19:27.000000000 -0500
13539 ++++ linux-3.1.4/fs/compat_ioctl.c 2011-11-16 18:39:08.000000000 -0500
13540 @@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsi
13541
13542 err = get_user(palp, &up->palette);
13543 @@ -41278,9 +42145,9 @@ diff -urNp linux-3.1.3/fs/compat_ioctl.c linux-3.1.3/fs/compat_ioctl.c
13544 if (a > b)
13545 return 1;
13546 if (a < b)
13547 -diff -urNp linux-3.1.3/fs/configfs/dir.c linux-3.1.3/fs/configfs/dir.c
13548 ---- linux-3.1.3/fs/configfs/dir.c 2011-11-11 15:19:27.000000000 -0500
13549 -+++ linux-3.1.3/fs/configfs/dir.c 2011-11-16 18:39:08.000000000 -0500
13550 +diff -urNp linux-3.1.4/fs/configfs/dir.c linux-3.1.4/fs/configfs/dir.c
13551 +--- linux-3.1.4/fs/configfs/dir.c 2011-11-11 15:19:27.000000000 -0500
13552 ++++ linux-3.1.4/fs/configfs/dir.c 2011-11-16 18:39:08.000000000 -0500
13553 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file
13554 }
13555 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
13556 @@ -41305,9 +42172,9 @@ diff -urNp linux-3.1.3/fs/configfs/dir.c linux-3.1.3/fs/configfs/dir.c
13557
13558 /*
13559 * We'll have a dentry and an inode for
13560 -diff -urNp linux-3.1.3/fs/dcache.c linux-3.1.3/fs/dcache.c
13561 ---- linux-3.1.3/fs/dcache.c 2011-11-11 15:19:27.000000000 -0500
13562 -+++ linux-3.1.3/fs/dcache.c 2011-11-16 18:39:08.000000000 -0500
13563 +diff -urNp linux-3.1.4/fs/dcache.c linux-3.1.4/fs/dcache.c
13564 +--- linux-3.1.4/fs/dcache.c 2011-11-11 15:19:27.000000000 -0500
13565 ++++ linux-3.1.4/fs/dcache.c 2011-11-16 18:39:08.000000000 -0500
13566 @@ -2998,7 +2998,7 @@ void __init vfs_caches_init(unsigned lon
13567 mempages -= reserve;
13568
13569 @@ -41317,9 +42184,9 @@ diff -urNp linux-3.1.3/fs/dcache.c linux-3.1.3/fs/dcache.c
13570
13571 dcache_init();
13572 inode_init();
13573 -diff -urNp linux-3.1.3/fs/ecryptfs/inode.c linux-3.1.3/fs/ecryptfs/inode.c
13574 ---- linux-3.1.3/fs/ecryptfs/inode.c 2011-11-11 15:19:27.000000000 -0500
13575 -+++ linux-3.1.3/fs/ecryptfs/inode.c 2011-11-16 18:39:08.000000000 -0500
13576 +diff -urNp linux-3.1.4/fs/ecryptfs/inode.c linux-3.1.4/fs/ecryptfs/inode.c
13577 +--- linux-3.1.4/fs/ecryptfs/inode.c 2011-11-11 15:19:27.000000000 -0500
13578 ++++ linux-3.1.4/fs/ecryptfs/inode.c 2011-11-16 18:39:08.000000000 -0500
13579 @@ -681,7 +681,7 @@ static int ecryptfs_readlink_lower(struc
13580 old_fs = get_fs();
13581 set_fs(get_ds());
13582 @@ -41347,9 +42214,9 @@ diff -urNp linux-3.1.3/fs/ecryptfs/inode.c linux-3.1.3/fs/ecryptfs/inode.c
13583 if (!IS_ERR(buf)) {
13584 /* Free the char* */
13585 kfree(buf);
13586 -diff -urNp linux-3.1.3/fs/ecryptfs/miscdev.c linux-3.1.3/fs/ecryptfs/miscdev.c
13587 ---- linux-3.1.3/fs/ecryptfs/miscdev.c 2011-11-11 15:19:27.000000000 -0500
13588 -+++ linux-3.1.3/fs/ecryptfs/miscdev.c 2011-11-16 18:39:08.000000000 -0500
13589 +diff -urNp linux-3.1.4/fs/ecryptfs/miscdev.c linux-3.1.4/fs/ecryptfs/miscdev.c
13590 +--- linux-3.1.4/fs/ecryptfs/miscdev.c 2011-11-11 15:19:27.000000000 -0500
13591 ++++ linux-3.1.4/fs/ecryptfs/miscdev.c 2011-11-16 18:39:08.000000000 -0500
13592 @@ -328,7 +328,7 @@ check_list:
13593 goto out_unlock_msg_ctx;
13594 i = 5;
13595 @@ -41359,9 +42226,9 @@ diff -urNp linux-3.1.3/fs/ecryptfs/miscdev.c linux-3.1.3/fs/ecryptfs/miscdev.c
13596 goto out_unlock_msg_ctx;
13597 i += packet_length_size;
13598 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
13599 -diff -urNp linux-3.1.3/fs/ecryptfs/read_write.c linux-3.1.3/fs/ecryptfs/read_write.c
13600 ---- linux-3.1.3/fs/ecryptfs/read_write.c 2011-11-11 15:19:27.000000000 -0500
13601 -+++ linux-3.1.3/fs/ecryptfs/read_write.c 2011-11-16 18:39:08.000000000 -0500
13602 +diff -urNp linux-3.1.4/fs/ecryptfs/read_write.c linux-3.1.4/fs/ecryptfs/read_write.c
13603 +--- linux-3.1.4/fs/ecryptfs/read_write.c 2011-11-11 15:19:27.000000000 -0500
13604 ++++ linux-3.1.4/fs/ecryptfs/read_write.c 2011-11-16 18:39:08.000000000 -0500
13605 @@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e
13606 return -EIO;
13607 fs_save = get_fs();
13608 @@ -41380,9 +42247,9 @@ diff -urNp linux-3.1.3/fs/ecryptfs/read_write.c linux-3.1.3/fs/ecryptfs/read_wri
13609 set_fs(fs_save);
13610 return rc;
13611 }
13612 -diff -urNp linux-3.1.3/fs/exec.c linux-3.1.3/fs/exec.c
13613 ---- linux-3.1.3/fs/exec.c 2011-11-11 15:19:27.000000000 -0500
13614 -+++ linux-3.1.3/fs/exec.c 2011-11-17 18:40:47.000000000 -0500
13615 +diff -urNp linux-3.1.4/fs/exec.c linux-3.1.4/fs/exec.c
13616 +--- linux-3.1.4/fs/exec.c 2011-11-11 15:19:27.000000000 -0500
13617 ++++ linux-3.1.4/fs/exec.c 2011-11-17 18:40:47.000000000 -0500
13618 @@ -55,12 +55,24 @@
13619 #include <linux/pipe_fs_i.h>
13620 #include <linux/oom.h>
13621 @@ -42032,9 +42899,9 @@ diff -urNp linux-3.1.3/fs/exec.c linux-3.1.3/fs/exec.c
13622 }
13623 EXPORT_SYMBOL(dump_write);
13624
13625 -diff -urNp linux-3.1.3/fs/ext2/balloc.c linux-3.1.3/fs/ext2/balloc.c
13626 ---- linux-3.1.3/fs/ext2/balloc.c 2011-11-11 15:19:27.000000000 -0500
13627 -+++ linux-3.1.3/fs/ext2/balloc.c 2011-11-16 18:40:29.000000000 -0500
13628 +diff -urNp linux-3.1.4/fs/ext2/balloc.c linux-3.1.4/fs/ext2/balloc.c
13629 +--- linux-3.1.4/fs/ext2/balloc.c 2011-11-11 15:19:27.000000000 -0500
13630 ++++ linux-3.1.4/fs/ext2/balloc.c 2011-11-16 18:40:29.000000000 -0500
13631 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
13632
13633 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
13634 @@ -42044,9 +42911,9 @@ diff -urNp linux-3.1.3/fs/ext2/balloc.c linux-3.1.3/fs/ext2/balloc.c
13635 sbi->s_resuid != current_fsuid() &&
13636 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
13637 return 0;
13638 -diff -urNp linux-3.1.3/fs/ext3/balloc.c linux-3.1.3/fs/ext3/balloc.c
13639 ---- linux-3.1.3/fs/ext3/balloc.c 2011-11-11 15:19:27.000000000 -0500
13640 -+++ linux-3.1.3/fs/ext3/balloc.c 2011-11-16 18:40:29.000000000 -0500
13641 +diff -urNp linux-3.1.4/fs/ext3/balloc.c linux-3.1.4/fs/ext3/balloc.c
13642 +--- linux-3.1.4/fs/ext3/balloc.c 2011-11-11 15:19:27.000000000 -0500
13643 ++++ linux-3.1.4/fs/ext3/balloc.c 2011-11-16 18:40:29.000000000 -0500
13644 @@ -1446,7 +1446,7 @@ static int ext3_has_free_blocks(struct e
13645
13646 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
13647 @@ -42056,9 +42923,9 @@ diff -urNp linux-3.1.3/fs/ext3/balloc.c linux-3.1.3/fs/ext3/balloc.c
13648 sbi->s_resuid != current_fsuid() &&
13649 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
13650 return 0;
13651 -diff -urNp linux-3.1.3/fs/ext4/balloc.c linux-3.1.3/fs/ext4/balloc.c
13652 ---- linux-3.1.3/fs/ext4/balloc.c 2011-11-11 15:19:27.000000000 -0500
13653 -+++ linux-3.1.3/fs/ext4/balloc.c 2011-11-16 18:40:29.000000000 -0500
13654 +diff -urNp linux-3.1.4/fs/ext4/balloc.c linux-3.1.4/fs/ext4/balloc.c
13655 +--- linux-3.1.4/fs/ext4/balloc.c 2011-11-11 15:19:27.000000000 -0500
13656 ++++ linux-3.1.4/fs/ext4/balloc.c 2011-11-16 18:40:29.000000000 -0500
13657 @@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e
13658 /* Hm, nope. Are (enough) root reserved blocks available? */
13659 if (sbi->s_resuid == current_fsuid() ||
13660 @@ -42070,9 +42937,9 @@ diff -urNp linux-3.1.3/fs/ext4/balloc.c linux-3.1.3/fs/ext4/balloc.c
13661
13662 if (free_blocks >= (nblocks + dirty_blocks))
13663 return 1;
13664 -diff -urNp linux-3.1.3/fs/ext4/ext4.h linux-3.1.3/fs/ext4/ext4.h
13665 ---- linux-3.1.3/fs/ext4/ext4.h 2011-11-11 15:19:27.000000000 -0500
13666 -+++ linux-3.1.3/fs/ext4/ext4.h 2011-11-16 18:39:08.000000000 -0500
13667 +diff -urNp linux-3.1.4/fs/ext4/ext4.h linux-3.1.4/fs/ext4/ext4.h
13668 +--- linux-3.1.4/fs/ext4/ext4.h 2011-11-11 15:19:27.000000000 -0500
13669 ++++ linux-3.1.4/fs/ext4/ext4.h 2011-11-16 18:39:08.000000000 -0500
13670 @@ -1180,19 +1180,19 @@ struct ext4_sb_info {
13671 unsigned long s_mb_last_start;
13672
13673 @@ -42103,9 +42970,9 @@ diff -urNp linux-3.1.3/fs/ext4/ext4.h linux-3.1.3/fs/ext4/ext4.h
13674 atomic_t s_lock_busy;
13675
13676 /* locality groups */
13677 -diff -urNp linux-3.1.3/fs/ext4/file.c linux-3.1.3/fs/ext4/file.c
13678 ---- linux-3.1.3/fs/ext4/file.c 2011-11-11 15:19:27.000000000 -0500
13679 -+++ linux-3.1.3/fs/ext4/file.c 2011-11-16 18:40:29.000000000 -0500
13680 +diff -urNp linux-3.1.4/fs/ext4/file.c linux-3.1.4/fs/ext4/file.c
13681 +--- linux-3.1.4/fs/ext4/file.c 2011-11-11 15:19:27.000000000 -0500
13682 ++++ linux-3.1.4/fs/ext4/file.c 2011-11-16 18:40:29.000000000 -0500
13683 @@ -181,8 +181,8 @@ static int ext4_file_open(struct inode *
13684 path.dentry = mnt->mnt_root;
13685 cp = d_path(&path, buf, sizeof(buf));
13686 @@ -42117,9 +42984,9 @@ diff -urNp linux-3.1.3/fs/ext4/file.c linux-3.1.3/fs/ext4/file.c
13687 ext4_mark_super_dirty(sb);
13688 }
13689 }
13690 -diff -urNp linux-3.1.3/fs/ext4/ioctl.c linux-3.1.3/fs/ext4/ioctl.c
13691 ---- linux-3.1.3/fs/ext4/ioctl.c 2011-11-11 15:19:27.000000000 -0500
13692 -+++ linux-3.1.3/fs/ext4/ioctl.c 2011-11-16 18:39:08.000000000 -0500
13693 +diff -urNp linux-3.1.4/fs/ext4/ioctl.c linux-3.1.4/fs/ext4/ioctl.c
13694 +--- linux-3.1.4/fs/ext4/ioctl.c 2011-11-11 15:19:27.000000000 -0500
13695 ++++ linux-3.1.4/fs/ext4/ioctl.c 2011-11-16 18:39:08.000000000 -0500
13696 @@ -348,7 +348,7 @@ mext_out:
13697 if (!blk_queue_discard(q))
13698 return -EOPNOTSUPP;
13699 @@ -42138,9 +43005,9 @@ diff -urNp linux-3.1.3/fs/ext4/ioctl.c linux-3.1.3/fs/ext4/ioctl.c
13700 sizeof(range)))
13701 return -EFAULT;
13702
13703 -diff -urNp linux-3.1.3/fs/ext4/mballoc.c linux-3.1.3/fs/ext4/mballoc.c
13704 ---- linux-3.1.3/fs/ext4/mballoc.c 2011-11-11 15:19:27.000000000 -0500
13705 -+++ linux-3.1.3/fs/ext4/mballoc.c 2011-11-16 18:40:29.000000000 -0500
13706 +diff -urNp linux-3.1.4/fs/ext4/mballoc.c linux-3.1.4/fs/ext4/mballoc.c
13707 +--- linux-3.1.4/fs/ext4/mballoc.c 2011-11-11 15:19:27.000000000 -0500
13708 ++++ linux-3.1.4/fs/ext4/mballoc.c 2011-11-16 18:40:29.000000000 -0500
13709 @@ -1795,7 +1795,7 @@ void ext4_mb_simple_scan_group(struct ex
13710 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
13711
13712 @@ -42263,9 +43130,9 @@ diff -urNp linux-3.1.3/fs/ext4/mballoc.c linux-3.1.3/fs/ext4/mballoc.c
13713 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
13714
13715 return 0;
13716 -diff -urNp linux-3.1.3/fs/fcntl.c linux-3.1.3/fs/fcntl.c
13717 ---- linux-3.1.3/fs/fcntl.c 2011-11-11 15:19:27.000000000 -0500
13718 -+++ linux-3.1.3/fs/fcntl.c 2011-11-16 23:40:25.000000000 -0500
13719 +diff -urNp linux-3.1.4/fs/fcntl.c linux-3.1.4/fs/fcntl.c
13720 +--- linux-3.1.4/fs/fcntl.c 2011-11-11 15:19:27.000000000 -0500
13721 ++++ linux-3.1.4/fs/fcntl.c 2011-11-16 23:40:25.000000000 -0500
13722 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
13723 if (err)
13724 return err;
13725 @@ -42304,9 +43171,9 @@ diff -urNp linux-3.1.3/fs/fcntl.c linux-3.1.3/fs/fcntl.c
13726 if (arg >= rlimit(RLIMIT_NOFILE))
13727 break;
13728 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
13729 -diff -urNp linux-3.1.3/fs/fifo.c linux-3.1.3/fs/fifo.c
13730 ---- linux-3.1.3/fs/fifo.c 2011-11-11 15:19:27.000000000 -0500
13731 -+++ linux-3.1.3/fs/fifo.c 2011-11-16 18:39:08.000000000 -0500
13732 +diff -urNp linux-3.1.4/fs/fifo.c linux-3.1.4/fs/fifo.c
13733 +--- linux-3.1.4/fs/fifo.c 2011-11-11 15:19:27.000000000 -0500
13734 ++++ linux-3.1.4/fs/fifo.c 2011-11-16 18:39:08.000000000 -0500
13735 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
13736 */
13737 filp->f_op = &read_pipefifo_fops;
13738 @@ -42377,9 +43244,9 @@ diff -urNp linux-3.1.3/fs/fifo.c linux-3.1.3/fs/fifo.c
13739 free_pipe_info(inode);
13740
13741 err_nocleanup:
13742 -diff -urNp linux-3.1.3/fs/file.c linux-3.1.3/fs/file.c
13743 ---- linux-3.1.3/fs/file.c 2011-11-11 15:19:27.000000000 -0500
13744 -+++ linux-3.1.3/fs/file.c 2011-11-16 18:40:29.000000000 -0500
13745 +diff -urNp linux-3.1.4/fs/file.c linux-3.1.4/fs/file.c
13746 +--- linux-3.1.4/fs/file.c 2011-11-11 15:19:27.000000000 -0500
13747 ++++ linux-3.1.4/fs/file.c 2011-11-16 18:40:29.000000000 -0500
13748 @@ -15,6 +15,7 @@
13749 #include <linux/slab.h>
13750 #include <linux/vmalloc.h>
13751 @@ -42396,9 +43263,9 @@ diff -urNp linux-3.1.3/fs/file.c linux-3.1.3/fs/file.c
13752 if (nr >= rlimit(RLIMIT_NOFILE))
13753 return -EMFILE;
13754
13755 -diff -urNp linux-3.1.3/fs/filesystems.c linux-3.1.3/fs/filesystems.c
13756 ---- linux-3.1.3/fs/filesystems.c 2011-11-11 15:19:27.000000000 -0500
13757 -+++ linux-3.1.3/fs/filesystems.c 2011-11-16 18:40:29.000000000 -0500
13758 +diff -urNp linux-3.1.4/fs/filesystems.c linux-3.1.4/fs/filesystems.c
13759 +--- linux-3.1.4/fs/filesystems.c 2011-11-11 15:19:27.000000000 -0500
13760 ++++ linux-3.1.4/fs/filesystems.c 2011-11-16 18:40:29.000000000 -0500
13761 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
13762 int len = dot ? dot - name : strlen(name);
13763
13764 @@ -42412,9 +43279,9 @@ diff -urNp linux-3.1.3/fs/filesystems.c linux-3.1.3/fs/filesystems.c
13765 fs = __get_fs_type(name, len);
13766
13767 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
13768 -diff -urNp linux-3.1.3/fs/fscache/cookie.c linux-3.1.3/fs/fscache/cookie.c
13769 ---- linux-3.1.3/fs/fscache/cookie.c 2011-11-11 15:19:27.000000000 -0500
13770 -+++ linux-3.1.3/fs/fscache/cookie.c 2011-11-16 18:39:08.000000000 -0500
13771 +diff -urNp linux-3.1.4/fs/fscache/cookie.c linux-3.1.4/fs/fscache/cookie.c
13772 +--- linux-3.1.4/fs/fscache/cookie.c 2011-11-11 15:19:27.000000000 -0500
13773 ++++ linux-3.1.4/fs/fscache/cookie.c 2011-11-16 18:39:08.000000000 -0500
13774 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
13775 parent ? (char *) parent->def->name : "<no-parent>",
13776 def->name, netfs_data);
13777 @@ -42533,9 +43400,9 @@ diff -urNp linux-3.1.3/fs/fscache/cookie.c linux-3.1.3/fs/fscache/cookie.c
13778 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
13779 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
13780 }
13781 -diff -urNp linux-3.1.3/fs/fscache/internal.h linux-3.1.3/fs/fscache/internal.h
13782 ---- linux-3.1.3/fs/fscache/internal.h 2011-11-11 15:19:27.000000000 -0500
13783 -+++ linux-3.1.3/fs/fscache/internal.h 2011-11-16 18:39:08.000000000 -0500
13784 +diff -urNp linux-3.1.4/fs/fscache/internal.h linux-3.1.4/fs/fscache/internal.h
13785 +--- linux-3.1.4/fs/fscache/internal.h 2011-11-11 15:19:27.000000000 -0500
13786 ++++ linux-3.1.4/fs/fscache/internal.h 2011-11-16 18:39:08.000000000 -0500
13787 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
13788 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
13789 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
13790 @@ -42739,9 +43606,9 @@ diff -urNp linux-3.1.3/fs/fscache/internal.h linux-3.1.3/fs/fscache/internal.h
13791 #define fscache_stat_d(stat) do {} while (0)
13792 #endif
13793
13794 -diff -urNp linux-3.1.3/fs/fscache/object.c linux-3.1.3/fs/fscache/object.c
13795 ---- linux-3.1.3/fs/fscache/object.c 2011-11-11 15:19:27.000000000 -0500
13796 -+++ linux-3.1.3/fs/fscache/object.c 2011-11-16 18:39:08.000000000 -0500
13797 +diff -urNp linux-3.1.4/fs/fscache/object.c linux-3.1.4/fs/fscache/object.c
13798 +--- linux-3.1.4/fs/fscache/object.c 2011-11-11 15:19:27.000000000 -0500
13799 ++++ linux-3.1.4/fs/fscache/object.c 2011-11-16 18:39:08.000000000 -0500
13800 @@ -128,7 +128,7 @@ static void fscache_object_state_machine
13801 /* update the object metadata on disk */
13802 case FSCACHE_OBJECT_UPDATING:
13803 @@ -42853,9 +43720,9 @@ diff -urNp linux-3.1.3/fs/fscache/object.c linux-3.1.3/fs/fscache/object.c
13804 break;
13805
13806 default:
13807 -diff -urNp linux-3.1.3/fs/fscache/operation.c linux-3.1.3/fs/fscache/operation.c
13808 ---- linux-3.1.3/fs/fscache/operation.c 2011-11-11 15:19:27.000000000 -0500
13809 -+++ linux-3.1.3/fs/fscache/operation.c 2011-11-16 18:39:08.000000000 -0500
13810 +diff -urNp linux-3.1.4/fs/fscache/operation.c linux-3.1.4/fs/fscache/operation.c
13811 +--- linux-3.1.4/fs/fscache/operation.c 2011-11-11 15:19:27.000000000 -0500
13812 ++++ linux-3.1.4/fs/fscache/operation.c 2011-11-16 18:39:08.000000000 -0500
13813 @@ -17,7 +17,7 @@
13814 #include <linux/slab.h>
13815 #include "internal.h"
13816 @@ -42971,9 +43838,9 @@ diff -urNp linux-3.1.3/fs/fscache/operation.c linux-3.1.3/fs/fscache/operation.c
13817
13818 ASSERTCMP(atomic_read(&op->usage), ==, 0);
13819
13820 -diff -urNp linux-3.1.3/fs/fscache/page.c linux-3.1.3/fs/fscache/page.c
13821 ---- linux-3.1.3/fs/fscache/page.c 2011-11-11 15:19:27.000000000 -0500
13822 -+++ linux-3.1.3/fs/fscache/page.c 2011-11-16 18:39:08.000000000 -0500
13823 +diff -urNp linux-3.1.4/fs/fscache/page.c linux-3.1.4/fs/fscache/page.c
13824 +--- linux-3.1.4/fs/fscache/page.c 2011-11-11 15:19:27.000000000 -0500
13825 ++++ linux-3.1.4/fs/fscache/page.c 2011-11-16 18:39:08.000000000 -0500
13826 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
13827 val = radix_tree_lookup(&cookie->stores, page->index);
13828 if (!val) {
13829 @@ -43357,9 +44224,9 @@ diff -urNp linux-3.1.3/fs/fscache/page.c linux-3.1.3/fs/fscache/page.c
13830 #endif
13831
13832 for (loop = 0; loop < pagevec->nr; loop++) {
13833 -diff -urNp linux-3.1.3/fs/fscache/stats.c linux-3.1.3/fs/fscache/stats.c
13834 ---- linux-3.1.3/fs/fscache/stats.c 2011-11-11 15:19:27.000000000 -0500
13835 -+++ linux-3.1.3/fs/fscache/stats.c 2011-11-16 18:39:08.000000000 -0500
13836 +diff -urNp linux-3.1.4/fs/fscache/stats.c linux-3.1.4/fs/fscache/stats.c
13837 +--- linux-3.1.4/fs/fscache/stats.c 2011-11-11 15:19:27.000000000 -0500
13838 ++++ linux-3.1.4/fs/fscache/stats.c 2011-11-16 18:39:08.000000000 -0500
13839 @@ -18,95 +18,95 @@
13840 /*
13841 * operation counters
13842 @@ -43735,9 +44602,9 @@ diff -urNp linux-3.1.3/fs/fscache/stats.c linux-3.1.3/fs/fscache/stats.c
13843
13844 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
13845 atomic_read(&fscache_n_cop_alloc_object),
13846 -diff -urNp linux-3.1.3/fs/fs_struct.c linux-3.1.3/fs/fs_struct.c
13847 ---- linux-3.1.3/fs/fs_struct.c 2011-11-11 15:19:27.000000000 -0500
13848 -+++ linux-3.1.3/fs/fs_struct.c 2011-11-16 18:40:29.000000000 -0500
13849 +diff -urNp linux-3.1.4/fs/fs_struct.c linux-3.1.4/fs/fs_struct.c
13850 +--- linux-3.1.4/fs/fs_struct.c 2011-11-11 15:19:27.000000000 -0500
13851 ++++ linux-3.1.4/fs/fs_struct.c 2011-11-16 18:40:29.000000000 -0500
13852 @@ -4,6 +4,7 @@
13853 #include <linux/path.h>
13854 #include <linux/slab.h>
13855 @@ -43827,9 +44694,9 @@ diff -urNp linux-3.1.3/fs/fs_struct.c linux-3.1.3/fs/fs_struct.c
13856 spin_unlock(&fs->lock);
13857
13858 task_unlock(current);
13859 -diff -urNp linux-3.1.3/fs/fuse/cuse.c linux-3.1.3/fs/fuse/cuse.c
13860 ---- linux-3.1.3/fs/fuse/cuse.c 2011-11-11 15:19:27.000000000 -0500
13861 -+++ linux-3.1.3/fs/fuse/cuse.c 2011-11-16 18:39:08.000000000 -0500
13862 +diff -urNp linux-3.1.4/fs/fuse/cuse.c linux-3.1.4/fs/fuse/cuse.c
13863 +--- linux-3.1.4/fs/fuse/cuse.c 2011-11-11 15:19:27.000000000 -0500
13864 ++++ linux-3.1.4/fs/fuse/cuse.c 2011-11-16 18:39:08.000000000 -0500
13865 @@ -586,10 +586,12 @@ static int __init cuse_init(void)
13866 INIT_LIST_HEAD(&cuse_conntbl[i]);
13867
13868 @@ -43847,9 +44714,9 @@ diff -urNp linux-3.1.3/fs/fuse/cuse.c linux-3.1.3/fs/fuse/cuse.c
13869
13870 cuse_class = class_create(THIS_MODULE, "cuse");
13871 if (IS_ERR(cuse_class))
13872 -diff -urNp linux-3.1.3/fs/fuse/dev.c linux-3.1.3/fs/fuse/dev.c
13873 ---- linux-3.1.3/fs/fuse/dev.c 2011-11-11 15:19:27.000000000 -0500
13874 -+++ linux-3.1.3/fs/fuse/dev.c 2011-11-16 18:39:08.000000000 -0500
13875 +diff -urNp linux-3.1.4/fs/fuse/dev.c linux-3.1.4/fs/fuse/dev.c
13876 +--- linux-3.1.4/fs/fuse/dev.c 2011-11-11 15:19:27.000000000 -0500
13877 ++++ linux-3.1.4/fs/fuse/dev.c 2011-11-16 18:39:08.000000000 -0500
13878 @@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru
13879 ret = 0;
13880 pipe_lock(pipe);
13881 @@ -43859,9 +44726,9 @@ diff -urNp linux-3.1.3/fs/fuse/dev.c linux-3.1.3/fs/fuse/dev.c
13882 send_sig(SIGPIPE, current, 0);
13883 if (!ret)
13884 ret = -EPIPE;
13885 -diff -urNp linux-3.1.3/fs/fuse/dir.c linux-3.1.3/fs/fuse/dir.c
13886 ---- linux-3.1.3/fs/fuse/dir.c 2011-11-11 15:19:27.000000000 -0500
13887 -+++ linux-3.1.3/fs/fuse/dir.c 2011-11-16 18:39:08.000000000 -0500
13888 +diff -urNp linux-3.1.4/fs/fuse/dir.c linux-3.1.4/fs/fuse/dir.c
13889 +--- linux-3.1.4/fs/fuse/dir.c 2011-11-11 15:19:27.000000000 -0500
13890 ++++ linux-3.1.4/fs/fuse/dir.c 2011-11-16 18:39:08.000000000 -0500
13891 @@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *de
13892 return link;
13893 }
13894 @@ -43871,9 +44738,9 @@ diff -urNp linux-3.1.3/fs/fuse/dir.c linux-3.1.3/fs/fuse/dir.c
13895 {
13896 if (!IS_ERR(link))
13897 free_page((unsigned long) link);
13898 -diff -urNp linux-3.1.3/fs/gfs2/inode.c linux-3.1.3/fs/gfs2/inode.c
13899 ---- linux-3.1.3/fs/gfs2/inode.c 2011-11-11 15:19:27.000000000 -0500
13900 -+++ linux-3.1.3/fs/gfs2/inode.c 2011-11-16 18:39:08.000000000 -0500
13901 +diff -urNp linux-3.1.4/fs/gfs2/inode.c linux-3.1.4/fs/gfs2/inode.c
13902 +--- linux-3.1.4/fs/gfs2/inode.c 2011-11-11 15:19:27.000000000 -0500
13903 ++++ linux-3.1.4/fs/gfs2/inode.c 2011-11-16 18:39:08.000000000 -0500
13904 @@ -1517,7 +1517,7 @@ out:
13905
13906 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
13907 @@ -43883,9 +44750,9 @@ diff -urNp linux-3.1.3/fs/gfs2/inode.c linux-3.1.3/fs/gfs2/inode.c
13908 if (!IS_ERR(s))
13909 kfree(s);
13910 }
13911 -diff -urNp linux-3.1.3/fs/hfs/btree.c linux-3.1.3/fs/hfs/btree.c
13912 ---- linux-3.1.3/fs/hfs/btree.c 2011-11-11 15:19:27.000000000 -0500
13913 -+++ linux-3.1.3/fs/hfs/btree.c 2011-11-18 18:48:11.000000000 -0500
13914 +diff -urNp linux-3.1.4/fs/hfs/btree.c linux-3.1.4/fs/hfs/btree.c
13915 +--- linux-3.1.4/fs/hfs/btree.c 2011-11-11 15:19:27.000000000 -0500
13916 ++++ linux-3.1.4/fs/hfs/btree.c 2011-11-18 18:48:11.000000000 -0500
13917 @@ -46,11 +46,27 @@ struct hfs_btree *hfs_btree_open(struct
13918 case HFS_EXT_CNID:
13919 hfs_inode_read_fork(tree->inode, mdb->drXTExtRec, mdb->drXTFlSize,
13920 @@ -43926,9 +44793,9 @@ diff -urNp linux-3.1.3/fs/hfs/btree.c linux-3.1.3/fs/hfs/btree.c
13921 mapping = tree->inode->i_mapping;
13922 page = read_mapping_page(mapping, 0, NULL);
13923 if (IS_ERR(page))
13924 -diff -urNp linux-3.1.3/fs/hfsplus/catalog.c linux-3.1.3/fs/hfsplus/catalog.c
13925 ---- linux-3.1.3/fs/hfsplus/catalog.c 2011-11-11 15:19:27.000000000 -0500
13926 -+++ linux-3.1.3/fs/hfsplus/catalog.c 2011-11-16 19:23:09.000000000 -0500
13927 +diff -urNp linux-3.1.4/fs/hfsplus/catalog.c linux-3.1.4/fs/hfsplus/catalog.c
13928 +--- linux-3.1.4/fs/hfsplus/catalog.c 2011-11-11 15:19:27.000000000 -0500
13929 ++++ linux-3.1.4/fs/hfsplus/catalog.c 2011-11-16 19:23:09.000000000 -0500
13930 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block
13931 int err;
13932 u16 type;
13933 @@ -43956,9 +44823,9 @@ diff -urNp linux-3.1.3/fs/hfsplus/catalog.c linux-3.1.3/fs/hfsplus/catalog.c
13934 dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
13935 cnid, src_dir->i_ino, src_name->name,
13936 dst_dir->i_ino, dst_name->name);
13937 -diff -urNp linux-3.1.3/fs/hfsplus/dir.c linux-3.1.3/fs/hfsplus/dir.c
13938 ---- linux-3.1.3/fs/hfsplus/dir.c 2011-11-11 15:19:27.000000000 -0500
13939 -+++ linux-3.1.3/fs/hfsplus/dir.c 2011-11-16 18:40:29.000000000 -0500
13940 +diff -urNp linux-3.1.4/fs/hfsplus/dir.c linux-3.1.4/fs/hfsplus/dir.c
13941 +--- linux-3.1.4/fs/hfsplus/dir.c 2011-11-11 15:19:27.000000000 -0500
13942 ++++ linux-3.1.4/fs/hfsplus/dir.c 2011-11-16 18:40:29.000000000 -0500
13943 @@ -131,6 +131,8 @@ static int hfsplus_readdir(struct file *
13944 struct hfsplus_readdir_data *rd;
13945 u16 type;
13946 @@ -43968,9 +44835,9 @@ diff -urNp linux-3.1.3/fs/hfsplus/dir.c linux-3.1.3/fs/hfsplus/dir.c
13947 if (filp->f_pos >= inode->i_size)
13948 return 0;
13949
13950 -diff -urNp linux-3.1.3/fs/hfsplus/inode.c linux-3.1.3/fs/hfsplus/inode.c
13951 ---- linux-3.1.3/fs/hfsplus/inode.c 2011-11-11 15:19:27.000000000 -0500
13952 -+++ linux-3.1.3/fs/hfsplus/inode.c 2011-11-16 18:40:29.000000000 -0500
13953 +diff -urNp linux-3.1.4/fs/hfsplus/inode.c linux-3.1.4/fs/hfsplus/inode.c
13954 +--- linux-3.1.4/fs/hfsplus/inode.c 2011-11-11 15:19:27.000000000 -0500
13955 ++++ linux-3.1.4/fs/hfsplus/inode.c 2011-11-16 18:40:29.000000000 -0500
13956 @@ -501,6 +501,8 @@ int hfsplus_cat_read_inode(struct inode
13957 int res = 0;
13958 u16 type;
13959 @@ -43989,9 +44856,9 @@ diff -urNp linux-3.1.3/fs/hfsplus/inode.c linux-3.1.3/fs/hfsplus/inode.c
13960 if (HFSPLUS_IS_RSRC(inode))
13961 main_inode = HFSPLUS_I(inode)->rsrc_inode;
13962
13963 -diff -urNp linux-3.1.3/fs/hfsplus/ioctl.c linux-3.1.3/fs/hfsplus/ioctl.c
13964 ---- linux-3.1.3/fs/hfsplus/ioctl.c 2011-11-11 15:19:27.000000000 -0500
13965 -+++ linux-3.1.3/fs/hfsplus/ioctl.c 2011-11-16 18:40:29.000000000 -0500
13966 +diff -urNp linux-3.1.4/fs/hfsplus/ioctl.c linux-3.1.4/fs/hfsplus/ioctl.c
13967 +--- linux-3.1.4/fs/hfsplus/ioctl.c 2011-11-11 15:19:27.000000000 -0500
13968 ++++ linux-3.1.4/fs/hfsplus/ioctl.c 2011-11-16 18:40:29.000000000 -0500
13969 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
13970 struct hfsplus_cat_file *file;
13971 int res;
13972 @@ -44010,9 +44877,9 @@ diff -urNp linux-3.1.3/fs/hfsplus/ioctl.c linux-3.1.3/fs/hfsplus/ioctl.c
13973 if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
13974 return -EOPNOTSUPP;
13975
13976 -diff -urNp linux-3.1.3/fs/hfsplus/super.c linux-3.1.3/fs/hfsplus/super.c
13977 ---- linux-3.1.3/fs/hfsplus/super.c 2011-11-11 15:19:27.000000000 -0500
13978 -+++ linux-3.1.3/fs/hfsplus/super.c 2011-11-16 19:23:30.000000000 -0500
13979 +diff -urNp linux-3.1.4/fs/hfsplus/super.c linux-3.1.4/fs/hfsplus/super.c
13980 +--- linux-3.1.4/fs/hfsplus/super.c 2011-11-11 15:19:27.000000000 -0500
13981 ++++ linux-3.1.4/fs/hfsplus/super.c 2011-11-16 19:23:30.000000000 -0500
13982 @@ -347,6 +347,8 @@ static int hfsplus_fill_super(struct sup
13983 u64 last_fs_block, last_fs_page;
13984 int err;
13985 @@ -44022,9 +44889,9 @@ diff -urNp linux-3.1.3/fs/hfsplus/super.c linux-3.1.3/fs/hfsplus/super.c
13986 err = -EINVAL;
13987 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
13988 if (!sbi)
13989 -diff -urNp linux-3.1.3/fs/hugetlbfs/inode.c linux-3.1.3/fs/hugetlbfs/inode.c
13990 ---- linux-3.1.3/fs/hugetlbfs/inode.c 2011-11-11 15:19:27.000000000 -0500
13991 -+++ linux-3.1.3/fs/hugetlbfs/inode.c 2011-11-16 18:40:29.000000000 -0500
13992 +diff -urNp linux-3.1.4/fs/hugetlbfs/inode.c linux-3.1.4/fs/hugetlbfs/inode.c
13993 +--- linux-3.1.4/fs/hugetlbfs/inode.c 2011-11-11 15:19:27.000000000 -0500
13994 ++++ linux-3.1.4/fs/hugetlbfs/inode.c 2011-11-16 18:40:29.000000000 -0500
13995 @@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs
13996 .kill_sb = kill_litter_super,
13997 };
13998 @@ -44034,9 +44901,9 @@ diff -urNp linux-3.1.3/fs/hugetlbfs/inode.c linux-3.1.3/fs/hugetlbfs/inode.c
13999
14000 static int can_do_hugetlb_shm(void)
14001 {
14002 -diff -urNp linux-3.1.3/fs/inode.c linux-3.1.3/fs/inode.c
14003 ---- linux-3.1.3/fs/inode.c 2011-11-11 15:19:27.000000000 -0500
14004 -+++ linux-3.1.3/fs/inode.c 2011-11-16 18:39:08.000000000 -0500
14005 +diff -urNp linux-3.1.4/fs/inode.c linux-3.1.4/fs/inode.c
14006 +--- linux-3.1.4/fs/inode.c 2011-11-11 15:19:27.000000000 -0500
14007 ++++ linux-3.1.4/fs/inode.c 2011-11-16 18:39:08.000000000 -0500
14008 @@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
14009
14010 #ifdef CONFIG_SMP
14011 @@ -44048,9 +44915,9 @@ diff -urNp linux-3.1.3/fs/inode.c linux-3.1.3/fs/inode.c
14012
14013 res = next - LAST_INO_BATCH;
14014 }
14015 -diff -urNp linux-3.1.3/fs/jbd/checkpoint.c linux-3.1.3/fs/jbd/checkpoint.c
14016 ---- linux-3.1.3/fs/jbd/checkpoint.c 2011-11-11 15:19:27.000000000 -0500
14017 -+++ linux-3.1.3/fs/jbd/checkpoint.c 2011-11-16 18:40:29.000000000 -0500
14018 +diff -urNp linux-3.1.4/fs/jbd/checkpoint.c linux-3.1.4/fs/jbd/checkpoint.c
14019 +--- linux-3.1.4/fs/jbd/checkpoint.c 2011-11-11 15:19:27.000000000 -0500
14020 ++++ linux-3.1.4/fs/jbd/checkpoint.c 2011-11-16 18:40:29.000000000 -0500
14021 @@ -358,6 +358,8 @@ int log_do_checkpoint(journal_t *journal
14022 tid_t this_tid;
14023 int result;
14024 @@ -44060,9 +44927,9 @@ diff -urNp linux-3.1.3/fs/jbd/checkpoint.c linux-3.1.3/fs/jbd/checkpoint.c
14025 jbd_debug(1, "Start checkpoint\n");
14026
14027 /*
14028 -diff -urNp linux-3.1.3/fs/jffs2/compr_rtime.c linux-3.1.3/fs/jffs2/compr_rtime.c
14029 ---- linux-3.1.3/fs/jffs2/compr_rtime.c 2011-11-11 15:19:27.000000000 -0500
14030 -+++ linux-3.1.3/fs/jffs2/compr_rtime.c 2011-11-16 18:40:29.000000000 -0500
14031 +diff -urNp linux-3.1.4/fs/jffs2/compr_rtime.c linux-3.1.4/fs/jffs2/compr_rtime.c
14032 +--- linux-3.1.4/fs/jffs2/compr_rtime.c 2011-11-11 15:19:27.000000000 -0500
14033 ++++ linux-3.1.4/fs/jffs2/compr_rtime.c 2011-11-16 18:40:29.000000000 -0500
14034 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
14035 int outpos = 0;
14036 int pos=0;
14037 @@ -44081,9 +44948,9 @@ diff -urNp linux-3.1.3/fs/jffs2/compr_rtime.c linux-3.1.3/fs/jffs2/compr_rtime.c
14038 memset(positions,0,sizeof(positions));
14039
14040 while (outpos<destlen) {
14041 -diff -urNp linux-3.1.3/fs/jffs2/compr_rubin.c linux-3.1.3/fs/jffs2/compr_rubin.c
14042 ---- linux-3.1.3/fs/jffs2/compr_rubin.c 2011-11-11 15:19:27.000000000 -0500
14043 -+++ linux-3.1.3/fs/jffs2/compr_rubin.c 2011-11-16 18:40:29.000000000 -0500
14044 +diff -urNp linux-3.1.4/fs/jffs2/compr_rubin.c linux-3.1.4/fs/jffs2/compr_rubin.c
14045 +--- linux-3.1.4/fs/jffs2/compr_rubin.c 2011-11-11 15:19:27.000000000 -0500
14046 ++++ linux-3.1.4/fs/jffs2/compr_rubin.c 2011-11-16 18:40:29.000000000 -0500
14047 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
14048 int ret;
14049 uint32_t mysrclen, mydstlen;
14050 @@ -44093,9 +44960,9 @@ diff -urNp linux-3.1.3/fs/jffs2/compr_rubin.c linux-3.1.3/fs/jffs2/compr_rubin.c
14051 mysrclen = *sourcelen;
14052 mydstlen = *dstlen - 8;
14053
14054 -diff -urNp linux-3.1.3/fs/jffs2/erase.c linux-3.1.3/fs/jffs2/erase.c
14055 ---- linux-3.1.3/fs/jffs2/erase.c 2011-11-11 15:19:27.000000000 -0500
14056 -+++ linux-3.1.3/fs/jffs2/erase.c 2011-11-16 18:39:08.000000000 -0500
14057 +diff -urNp linux-3.1.4/fs/jffs2/erase.c linux-3.1.4/fs/jffs2/erase.c
14058 +--- linux-3.1.4/fs/jffs2/erase.c 2011-11-11 15:19:27.000000000 -0500
14059 ++++ linux-3.1.4/fs/jffs2/erase.c 2011-11-16 18:39:08.000000000 -0500
14060 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
14061 struct jffs2_unknown_node marker = {
14062 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
14063 @@ -44106,9 +44973,9 @@ diff -urNp linux-3.1.3/fs/jffs2/erase.c linux-3.1.3/fs/jffs2/erase.c
14064 };
14065
14066 jffs2_prealloc_raw_node_refs(c, jeb, 1);
14067 -diff -urNp linux-3.1.3/fs/jffs2/wbuf.c linux-3.1.3/fs/jffs2/wbuf.c
14068 ---- linux-3.1.3/fs/jffs2/wbuf.c 2011-11-11 15:19:27.000000000 -0500
14069 -+++ linux-3.1.3/fs/jffs2/wbuf.c 2011-11-16 18:39:08.000000000 -0500
14070 +diff -urNp linux-3.1.4/fs/jffs2/wbuf.c linux-3.1.4/fs/jffs2/wbuf.c
14071 +--- linux-3.1.4/fs/jffs2/wbuf.c 2011-11-11 15:19:27.000000000 -0500
14072 ++++ linux-3.1.4/fs/jffs2/wbuf.c 2011-11-16 18:39:08.000000000 -0500
14073 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
14074 {
14075 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
14076 @@ -44119,9 +44986,9 @@ diff -urNp linux-3.1.3/fs/jffs2/wbuf.c linux-3.1.3/fs/jffs2/wbuf.c
14077 };
14078
14079 /*
14080 -diff -urNp linux-3.1.3/fs/jffs2/xattr.c linux-3.1.3/fs/jffs2/xattr.c
14081 ---- linux-3.1.3/fs/jffs2/xattr.c 2011-11-11 15:19:27.000000000 -0500
14082 -+++ linux-3.1.3/fs/jffs2/xattr.c 2011-11-16 18:40:29.000000000 -0500
14083 +diff -urNp linux-3.1.4/fs/jffs2/xattr.c linux-3.1.4/fs/jffs2/xattr.c
14084 +--- linux-3.1.4/fs/jffs2/xattr.c 2011-11-11 15:19:27.000000000 -0500
14085 ++++ linux-3.1.4/fs/jffs2/xattr.c 2011-11-16 18:40:29.000000000 -0500
14086 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct
14087
14088 BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
14089 @@ -44131,9 +44998,9 @@ diff -urNp linux-3.1.3/fs/jffs2/xattr.c linux-3.1.3/fs/jffs2/xattr.c
14090 /* Phase.1 : Merge same xref */
14091 for (i=0; i < XREF_TMPHASH_SIZE; i++)
14092 xref_tmphash[i] = NULL;
14093 -diff -urNp linux-3.1.3/fs/jfs/super.c linux-3.1.3/fs/jfs/super.c
14094 ---- linux-3.1.3/fs/jfs/super.c 2011-11-11 15:19:27.000000000 -0500
14095 -+++ linux-3.1.3/fs/jfs/super.c 2011-11-16 18:39:08.000000000 -0500
14096 +diff -urNp linux-3.1.4/fs/jfs/super.c linux-3.1.4/fs/jfs/super.c
14097 +--- linux-3.1.4/fs/jfs/super.c 2011-11-11 15:19:27.000000000 -0500
14098 ++++ linux-3.1.4/fs/jfs/super.c 2011-11-16 18:39:08.000000000 -0500
14099 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
14100
14101 jfs_inode_cachep =
14102 @@ -44143,9 +45010,9 @@ diff -urNp linux-3.1.3/fs/jfs/super.c linux-3.1.3/fs/jfs/super.c
14103 init_once);
14104 if (jfs_inode_cachep == NULL)
14105 return -ENOMEM;
14106 -diff -urNp linux-3.1.3/fs/Kconfig.binfmt linux-3.1.3/fs/Kconfig.binfmt
14107 ---- linux-3.1.3/fs/Kconfig.binfmt 2011-11-11 15:19:27.000000000 -0500
14108 -+++ linux-3.1.3/fs/Kconfig.binfmt 2011-11-16 18:39:08.000000000 -0500
14109 +diff -urNp linux-3.1.4/fs/Kconfig.binfmt linux-3.1.4/fs/Kconfig.binfmt
14110 +--- linux-3.1.4/fs/Kconfig.binfmt 2011-11-11 15:19:27.000000000 -0500
14111 ++++ linux-3.1.4/fs/Kconfig.binfmt 2011-11-16 18:39:08.000000000 -0500
14112 @@ -86,7 +86,7 @@ config HAVE_AOUT
14113
14114 config BINFMT_AOUT
14115 @@ -44155,9 +45022,9 @@ diff -urNp linux-3.1.3/fs/Kconfig.binfmt linux-3.1.3/fs/Kconfig.binfmt
14116 ---help---
14117 A.out (Assembler.OUTput) is a set of formats for libraries and
14118 executables used in the earliest versions of UNIX. Linux used
14119 -diff -urNp linux-3.1.3/fs/libfs.c linux-3.1.3/fs/libfs.c
14120 ---- linux-3.1.3/fs/libfs.c 2011-11-11 15:19:27.000000000 -0500
14121 -+++ linux-3.1.3/fs/libfs.c 2011-11-16 18:39:08.000000000 -0500
14122 +diff -urNp linux-3.1.4/fs/libfs.c linux-3.1.4/fs/libfs.c
14123 +--- linux-3.1.4/fs/libfs.c 2011-11-11 15:19:27.000000000 -0500
14124 ++++ linux-3.1.4/fs/libfs.c 2011-11-16 18:39:08.000000000 -0500
14125 @@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, v
14126
14127 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
14128 @@ -44182,9 +45049,9 @@ diff -urNp linux-3.1.3/fs/libfs.c linux-3.1.3/fs/libfs.c
14129 next->d_name.len, filp->f_pos,
14130 next->d_inode->i_ino,
14131 dt_type(next->d_inode)) < 0)
14132 -diff -urNp linux-3.1.3/fs/lockd/clntproc.c linux-3.1.3/fs/lockd/clntproc.c
14133 ---- linux-3.1.3/fs/lockd/clntproc.c 2011-11-11 15:19:27.000000000 -0500
14134 -+++ linux-3.1.3/fs/lockd/clntproc.c 2011-11-16 18:40:29.000000000 -0500
14135 +diff -urNp linux-3.1.4/fs/lockd/clntproc.c linux-3.1.4/fs/lockd/clntproc.c
14136 +--- linux-3.1.4/fs/lockd/clntproc.c 2011-11-11 15:19:27.000000000 -0500
14137 ++++ linux-3.1.4/fs/lockd/clntproc.c 2011-11-16 18:40:29.000000000 -0500
14138 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
14139 /*
14140 * Cookie counter for NLM requests
14141 @@ -44208,9 +45075,9 @@ diff -urNp linux-3.1.3/fs/lockd/clntproc.c linux-3.1.3/fs/lockd/clntproc.c
14142 req = &reqst;
14143 memset(req, 0, sizeof(*req));
14144 locks_init_lock(&req->a_args.lock.fl);
14145 -diff -urNp linux-3.1.3/fs/locks.c linux-3.1.3/fs/locks.c
14146 ---- linux-3.1.3/fs/locks.c 2011-11-11 15:19:27.000000000 -0500
14147 -+++ linux-3.1.3/fs/locks.c 2011-11-16 18:39:08.000000000 -0500
14148 +diff -urNp linux-3.1.4/fs/locks.c linux-3.1.4/fs/locks.c
14149 +--- linux-3.1.4/fs/locks.c 2011-11-11 15:19:27.000000000 -0500
14150 ++++ linux-3.1.4/fs/locks.c 2011-11-16 18:39:08.000000000 -0500
14151 @@ -2022,16 +2022,16 @@ void locks_remove_flock(struct file *fil
14152 return;
14153
14154 @@ -44232,9 +45099,9 @@ diff -urNp linux-3.1.3/fs/locks.c linux-3.1.3/fs/locks.c
14155 }
14156
14157 lock_flocks();
14158 -diff -urNp linux-3.1.3/fs/logfs/super.c linux-3.1.3/fs/logfs/super.c
14159 ---- linux-3.1.3/fs/logfs/super.c 2011-11-11 15:19:27.000000000 -0500
14160 -+++ linux-3.1.3/fs/logfs/super.c 2011-11-16 18:40:29.000000000 -0500
14161 +diff -urNp linux-3.1.4/fs/logfs/super.c linux-3.1.4/fs/logfs/super.c
14162 +--- linux-3.1.4/fs/logfs/super.c 2011-11-11 15:19:27.000000000 -0500
14163 ++++ linux-3.1.4/fs/logfs/super.c 2011-11-16 18:40:29.000000000 -0500
14164 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
14165 struct logfs_disk_super _ds1, *ds1 = &_ds1;
14166 int err, valid0, valid1;
14167 @@ -44244,9 +45111,9 @@ diff -urNp linux-3.1.3/fs/logfs/super.c linux-3.1.3/fs/logfs/super.c
14168 /* read first superblock */
14169 err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
14170 if (err)
14171 -diff -urNp linux-3.1.3/fs/namei.c linux-3.1.3/fs/namei.c
14172 ---- linux-3.1.3/fs/namei.c 2011-11-11 15:19:27.000000000 -0500
14173 -+++ linux-3.1.3/fs/namei.c 2011-11-17 00:36:54.000000000 -0500
14174 +diff -urNp linux-3.1.4/fs/namei.c linux-3.1.4/fs/namei.c
14175 +--- linux-3.1.4/fs/namei.c 2011-11-11 15:19:27.000000000 -0500
14176 ++++ linux-3.1.4/fs/namei.c 2011-11-17 00:36:54.000000000 -0500
14177 @@ -283,14 +283,22 @@ int generic_permission(struct inode *ino
14178
14179 if (S_ISDIR(inode->i_mode)) {
14180 @@ -44712,9 +45579,9 @@ diff -urNp linux-3.1.3/fs/namei.c linux-3.1.3/fs/namei.c
14181 len = -EFAULT;
14182 out:
14183 return len;
14184 -diff -urNp linux-3.1.3/fs/namespace.c linux-3.1.3/fs/namespace.c
14185 ---- linux-3.1.3/fs/namespace.c 2011-11-11 15:19:27.000000000 -0500
14186 -+++ linux-3.1.3/fs/namespace.c 2011-11-16 18:40:29.000000000 -0500
14187 +diff -urNp linux-3.1.4/fs/namespace.c linux-3.1.4/fs/namespace.c
14188 +--- linux-3.1.4/fs/namespace.c 2011-11-11 15:19:27.000000000 -0500
14189 ++++ linux-3.1.4/fs/namespace.c 2011-11-16 18:40:29.000000000 -0500
14190 @@ -1329,6 +1329,9 @@ static int do_umount(struct vfsmount *mn
14191 if (!(sb->s_flags & MS_RDONLY))
14192 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
14193 @@ -44774,9 +45641,9 @@ diff -urNp linux-3.1.3/fs/namespace.c linux-3.1.3/fs/namespace.c
14194 get_fs_root(current->fs, &root);
14195 error = lock_mount(&old);
14196 if (error)
14197 -diff -urNp linux-3.1.3/fs/ncpfs/dir.c linux-3.1.3/fs/ncpfs/dir.c
14198 ---- linux-3.1.3/fs/ncpfs/dir.c 2011-11-11 15:19:27.000000000 -0500
14199 -+++ linux-3.1.3/fs/ncpfs/dir.c 2011-11-16 18:40:29.000000000 -0500
14200 +diff -urNp linux-3.1.4/fs/ncpfs/dir.c linux-3.1.4/fs/ncpfs/dir.c
14201 +--- linux-3.1.4/fs/ncpfs/dir.c 2011-11-11 15:19:27.000000000 -0500
14202 ++++ linux-3.1.4/fs/ncpfs/dir.c 2011-11-16 18:40:29.000000000 -0500
14203 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
14204 int res, val = 0, len;
14205 __u8 __name[NCP_MAXPATHLEN + 1];
14206 @@ -44822,9 +45689,9 @@ diff -urNp linux-3.1.3/fs/ncpfs/dir.c linux-3.1.3/fs/ncpfs/dir.c
14207 DPRINTK("ncp_rename: %s/%s to %s/%s\n",
14208 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
14209 new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
14210 -diff -urNp linux-3.1.3/fs/ncpfs/inode.c linux-3.1.3/fs/ncpfs/inode.c
14211 ---- linux-3.1.3/fs/ncpfs/inode.c 2011-11-11 15:19:27.000000000 -0500
14212 -+++ linux-3.1.3/fs/ncpfs/inode.c 2011-11-16 18:40:29.000000000 -0500
14213 +diff -urNp linux-3.1.4/fs/ncpfs/inode.c linux-3.1.4/fs/ncpfs/inode.c
14214 +--- linux-3.1.4/fs/ncpfs/inode.c 2011-11-11 15:19:27.000000000 -0500
14215 ++++ linux-3.1.4/fs/ncpfs/inode.c 2011-11-16 18:40:29.000000000 -0500
14216 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
14217 #endif
14218 struct ncp_entry_info finfo;
14219 @@ -44834,9 +45701,9 @@ diff -urNp linux-3.1.3/fs/ncpfs/inode.c linux-3.1.3/fs/ncpfs/inode.c
14220 memset(&data, 0, sizeof(data));
14221 server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
14222 if (!server)
14223 -diff -urNp linux-3.1.3/fs/nfs/blocklayout/blocklayout.c linux-3.1.3/fs/nfs/blocklayout/blocklayout.c
14224 ---- linux-3.1.3/fs/nfs/blocklayout/blocklayout.c 2011-11-11 15:19:27.000000000 -0500
14225 -+++ linux-3.1.3/fs/nfs/blocklayout/blocklayout.c 2011-11-16 18:39:08.000000000 -0500
14226 +diff -urNp linux-3.1.4/fs/nfs/blocklayout/blocklayout.c linux-3.1.4/fs/nfs/blocklayout/blocklayout.c
14227 +--- linux-3.1.4/fs/nfs/blocklayout/blocklayout.c 2011-11-11 15:19:27.000000000 -0500
14228 ++++ linux-3.1.4/fs/nfs/blocklayout/blocklayout.c 2011-11-16 18:39:08.000000000 -0500
14229 @@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block
14230 */
14231 struct parallel_io {
14232 @@ -44846,9 +45713,9 @@ diff -urNp linux-3.1.3/fs/nfs/blocklayout/blocklayout.c linux-3.1.3/fs/nfs/block
14233 void (*pnfs_callback) (void *data);
14234 void *data;
14235 };
14236 -diff -urNp linux-3.1.3/fs/nfs/inode.c linux-3.1.3/fs/nfs/inode.c
14237 ---- linux-3.1.3/fs/nfs/inode.c 2011-11-26 19:57:29.000000000 -0500
14238 -+++ linux-3.1.3/fs/nfs/inode.c 2011-11-26 20:00:43.000000000 -0500
14239 +diff -urNp linux-3.1.4/fs/nfs/inode.c linux-3.1.4/fs/nfs/inode.c
14240 +--- linux-3.1.4/fs/nfs/inode.c 2011-11-26 19:57:29.000000000 -0500
14241 ++++ linux-3.1.4/fs/nfs/inode.c 2011-11-26 20:00:43.000000000 -0500
14242 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
14243 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
14244 nfsi->attrtimeo_timestamp = jiffies;
14245 @@ -44878,9 +45745,9 @@ diff -urNp linux-3.1.3/fs/nfs/inode.c linux-3.1.3/fs/nfs/inode.c
14246 }
14247
14248 void nfs_fattr_init(struct nfs_fattr *fattr)
14249 -diff -urNp linux-3.1.3/fs/nfsd/nfs4state.c linux-3.1.3/fs/nfsd/nfs4state.c
14250 ---- linux-3.1.3/fs/nfsd/nfs4state.c 2011-11-11 15:19:27.000000000 -0500
14251 -+++ linux-3.1.3/fs/nfsd/nfs4state.c 2011-11-16 18:40:29.000000000 -0500
14252 +diff -urNp linux-3.1.4/fs/nfsd/nfs4state.c linux-3.1.4/fs/nfsd/nfs4state.c
14253 +--- linux-3.1.4/fs/nfsd/nfs4state.c 2011-11-11 15:19:27.000000000 -0500
14254 ++++ linux-3.1.4/fs/nfsd/nfs4state.c 2011-11-16 18:40:29.000000000 -0500
14255 @@ -3999,6 +3999,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
14256 unsigned int strhashval;
14257 int err;
14258 @@ -44890,9 +45757,9 @@ diff -urNp linux-3.1.3/fs/nfsd/nfs4state.c linux-3.1.3/fs/nfsd/nfs4state.c
14259 dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
14260 (long long) lock->lk_offset,
14261 (long long) lock->lk_length);
14262 -diff -urNp linux-3.1.3/fs/nfsd/nfs4xdr.c linux-3.1.3/fs/nfsd/nfs4xdr.c
14263 ---- linux-3.1.3/fs/nfsd/nfs4xdr.c 2011-11-11 15:19:27.000000000 -0500
14264 -+++ linux-3.1.3/fs/nfsd/nfs4xdr.c 2011-11-16 18:40:29.000000000 -0500
14265 +diff -urNp linux-3.1.4/fs/nfsd/nfs4xdr.c linux-3.1.4/fs/nfsd/nfs4xdr.c
14266 +--- linux-3.1.4/fs/nfsd/nfs4xdr.c 2011-11-11 15:19:27.000000000 -0500
14267 ++++ linux-3.1.4/fs/nfsd/nfs4xdr.c 2011-11-16 18:40:29.000000000 -0500
14268 @@ -1875,6 +1875,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
14269 .dentry = dentry,
14270 };
14271 @@ -44902,9 +45769,9 @@ diff -urNp linux-3.1.3/fs/nfsd/nfs4xdr.c linux-3.1.3/fs/nfsd/nfs4xdr.c
14272 BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
14273 BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
14274 BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
14275 -diff -urNp linux-3.1.3/fs/nfsd/vfs.c linux-3.1.3/fs/nfsd/vfs.c
14276 ---- linux-3.1.3/fs/nfsd/vfs.c 2011-11-11 15:19:27.000000000 -0500
14277 -+++ linux-3.1.3/fs/nfsd/vfs.c 2011-11-16 18:39:08.000000000 -0500
14278 +diff -urNp linux-3.1.4/fs/nfsd/vfs.c linux-3.1.4/fs/nfsd/vfs.c
14279 +--- linux-3.1.4/fs/nfsd/vfs.c 2011-11-11 15:19:27.000000000 -0500
14280 ++++ linux-3.1.4/fs/nfsd/vfs.c 2011-11-16 18:39:08.000000000 -0500
14281 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
14282 } else {
14283 oldfs = get_fs();
14284 @@ -44932,9 +45799,9 @@ diff -urNp linux-3.1.3/fs/nfsd/vfs.c linux-3.1.3/fs/nfsd/vfs.c
14285 set_fs(oldfs);
14286
14287 if (host_err < 0)
14288 -diff -urNp linux-3.1.3/fs/notify/fanotify/fanotify_user.c linux-3.1.3/fs/notify/fanotify/fanotify_user.c
14289 ---- linux-3.1.3/fs/notify/fanotify/fanotify_user.c 2011-11-11 15:19:27.000000000 -0500
14290 -+++ linux-3.1.3/fs/notify/fanotify/fanotify_user.c 2011-11-16 18:39:08.000000000 -0500
14291 +diff -urNp linux-3.1.4/fs/notify/fanotify/fanotify_user.c linux-3.1.4/fs/notify/fanotify/fanotify_user.c
14292 +--- linux-3.1.4/fs/notify/fanotify/fanotify_user.c 2011-11-11 15:19:27.000000000 -0500
14293 ++++ linux-3.1.4/fs/notify/fanotify/fanotify_user.c 2011-11-16 18:39:08.000000000 -0500
14294 @@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
14295 goto out_close_fd;
14296
14297 @@ -44945,9 +45812,9 @@ diff -urNp linux-3.1.3/fs/notify/fanotify/fanotify_user.c linux-3.1.3/fs/notify/
14298 fanotify_event_metadata.event_len))
14299 goto out_kill_access_response;
14300
14301 -diff -urNp linux-3.1.3/fs/notify/notification.c linux-3.1.3/fs/notify/notification.c
14302 ---- linux-3.1.3/fs/notify/notification.c 2011-11-11 15:19:27.000000000 -0500
14303 -+++ linux-3.1.3/fs/notify/notification.c 2011-11-16 18:39:08.000000000 -0500
14304 +diff -urNp linux-3.1.4/fs/notify/notification.c linux-3.1.4/fs/notify/notification.c
14305 +--- linux-3.1.4/fs/notify/notification.c 2011-11-11 15:19:27.000000000 -0500
14306 ++++ linux-3.1.4/fs/notify/notification.c 2011-11-16 18:39:08.000000000 -0500
14307 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
14308 * get set to 0 so it will never get 'freed'
14309 */
14310 @@ -44966,9 +45833,9 @@ diff -urNp linux-3.1.3/fs/notify/notification.c linux-3.1.3/fs/notify/notificati
14311 }
14312 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
14313
14314 -diff -urNp linux-3.1.3/fs/ntfs/dir.c linux-3.1.3/fs/ntfs/dir.c
14315 ---- linux-3.1.3/fs/ntfs/dir.c 2011-11-11 15:19:27.000000000 -0500
14316 -+++ linux-3.1.3/fs/ntfs/dir.c 2011-11-16 18:39:08.000000000 -0500
14317 +diff -urNp linux-3.1.4/fs/ntfs/dir.c linux-3.1.4/fs/ntfs/dir.c
14318 +--- linux-3.1.4/fs/ntfs/dir.c 2011-11-11 15:19:27.000000000 -0500
14319 ++++ linux-3.1.4/fs/ntfs/dir.c 2011-11-16 18:39:08.000000000 -0500
14320 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
14321 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
14322 ~(s64)(ndir->itype.index.block_size - 1)));
14323 @@ -44978,9 +45845,9 @@ diff -urNp linux-3.1.3/fs/ntfs/dir.c linux-3.1.3/fs/ntfs/dir.c
14324 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
14325 "inode 0x%lx or driver bug.", vdir->i_ino);
14326 goto err_out;
14327 -diff -urNp linux-3.1.3/fs/ntfs/file.c linux-3.1.3/fs/ntfs/file.c
14328 ---- linux-3.1.3/fs/ntfs/file.c 2011-11-11 15:19:27.000000000 -0500
14329 -+++ linux-3.1.3/fs/ntfs/file.c 2011-11-16 18:39:08.000000000 -0500
14330 +diff -urNp linux-3.1.4/fs/ntfs/file.c linux-3.1.4/fs/ntfs/file.c
14331 +--- linux-3.1.4/fs/ntfs/file.c 2011-11-11 15:19:27.000000000 -0500
14332 ++++ linux-3.1.4/fs/ntfs/file.c 2011-11-16 18:39:08.000000000 -0500
14333 @@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_
14334 #endif /* NTFS_RW */
14335 };
14336 @@ -44990,9 +45857,9 @@ diff -urNp linux-3.1.3/fs/ntfs/file.c linux-3.1.3/fs/ntfs/file.c
14337
14338 -const struct inode_operations ntfs_empty_inode_ops = {};
14339 +const struct inode_operations ntfs_empty_inode_ops __read_only;
14340 -diff -urNp linux-3.1.3/fs/ocfs2/localalloc.c linux-3.1.3/fs/ocfs2/localalloc.c
14341 ---- linux-3.1.3/fs/ocfs2/localalloc.c 2011-11-11 15:19:27.000000000 -0500
14342 -+++ linux-3.1.3/fs/ocfs2/localalloc.c 2011-11-16 18:39:08.000000000 -0500
14343 +diff -urNp linux-3.1.4/fs/ocfs2/localalloc.c linux-3.1.4/fs/ocfs2/localalloc.c
14344 +--- linux-3.1.4/fs/ocfs2/localalloc.c 2011-11-11 15:19:27.000000000 -0500
14345 ++++ linux-3.1.4/fs/ocfs2/localalloc.c 2011-11-16 18:39:08.000000000 -0500
14346 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
14347 goto bail;
14348 }
14349 @@ -45002,9 +45869,9 @@ diff -urNp linux-3.1.3/fs/ocfs2/localalloc.c linux-3.1.3/fs/ocfs2/localalloc.c
14350
14351 bail:
14352 if (handle)
14353 -diff -urNp linux-3.1.3/fs/ocfs2/namei.c linux-3.1.3/fs/ocfs2/namei.c
14354 ---- linux-3.1.3/fs/ocfs2/namei.c 2011-11-11 15:19:27.000000000 -0500
14355 -+++ linux-3.1.3/fs/ocfs2/namei.c 2011-11-16 18:40:29.000000000 -0500
14356 +diff -urNp linux-3.1.4/fs/ocfs2/namei.c linux-3.1.4/fs/ocfs2/namei.c
14357 +--- linux-3.1.4/fs/ocfs2/namei.c 2011-11-11 15:19:27.000000000 -0500
14358 ++++ linux-3.1.4/fs/ocfs2/namei.c 2011-11-16 18:40:29.000000000 -0500
14359 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
14360 struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
14361 struct ocfs2_dir_lookup_result target_insert = { NULL, };
14362 @@ -45014,9 +45881,9 @@ diff -urNp linux-3.1.3/fs/ocfs2/namei.c linux-3.1.3/fs/ocfs2/namei.c
14363 /* At some point it might be nice to break this function up a
14364 * bit. */
14365
14366 -diff -urNp linux-3.1.3/fs/ocfs2/ocfs2.h linux-3.1.3/fs/ocfs2/ocfs2.h
14367 ---- linux-3.1.3/fs/ocfs2/ocfs2.h 2011-11-11 15:19:27.000000000 -0500
14368 -+++ linux-3.1.3/fs/ocfs2/ocfs2.h 2011-11-16 18:39:08.000000000 -0500
14369 +diff -urNp linux-3.1.4/fs/ocfs2/ocfs2.h linux-3.1.4/fs/ocfs2/ocfs2.h
14370 +--- linux-3.1.4/fs/ocfs2/ocfs2.h 2011-11-11 15:19:27.000000000 -0500
14371 ++++ linux-3.1.4/fs/ocfs2/ocfs2.h 2011-11-16 18:39:08.000000000 -0500
14372 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
14373
14374 struct ocfs2_alloc_stats
14375 @@ -45034,9 +45901,9 @@ diff -urNp linux-3.1.3/fs/ocfs2/ocfs2.h linux-3.1.3/fs/ocfs2/ocfs2.h
14376 };
14377
14378 enum ocfs2_local_alloc_state
14379 -diff -urNp linux-3.1.3/fs/ocfs2/suballoc.c linux-3.1.3/fs/ocfs2/suballoc.c
14380 ---- linux-3.1.3/fs/ocfs2/suballoc.c 2011-11-11 15:19:27.000000000 -0500
14381 -+++ linux-3.1.3/fs/ocfs2/suballoc.c 2011-11-16 18:39:08.000000000 -0500
14382 +diff -urNp linux-3.1.4/fs/ocfs2/suballoc.c linux-3.1.4/fs/ocfs2/suballoc.c
14383 +--- linux-3.1.4/fs/ocfs2/suballoc.c 2011-11-11 15:19:27.000000000 -0500
14384 ++++ linux-3.1.4/fs/ocfs2/suballoc.c 2011-11-16 18:39:08.000000000 -0500
14385 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
14386 mlog_errno(status);
14387 goto bail;
14388 @@ -45091,9 +45958,9 @@ diff -urNp linux-3.1.3/fs/ocfs2/suballoc.c linux-3.1.3/fs/ocfs2/suballoc.c
14389 *num_clusters = res.sr_bits;
14390 }
14391 }
14392 -diff -urNp linux-3.1.3/fs/ocfs2/super.c linux-3.1.3/fs/ocfs2/super.c
14393 ---- linux-3.1.3/fs/ocfs2/super.c 2011-11-11 15:19:27.000000000 -0500
14394 -+++ linux-3.1.3/fs/ocfs2/super.c 2011-11-16 18:39:08.000000000 -0500
14395 +diff -urNp linux-3.1.4/fs/ocfs2/super.c linux-3.1.4/fs/ocfs2/super.c
14396 +--- linux-3.1.4/fs/ocfs2/super.c 2011-11-11 15:19:27.000000000 -0500
14397 ++++ linux-3.1.4/fs/ocfs2/super.c 2011-11-16 18:39:08.000000000 -0500
14398 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
14399 "%10s => GlobalAllocs: %d LocalAllocs: %d "
14400 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
14401 @@ -45128,9 +45995,9 @@ diff -urNp linux-3.1.3/fs/ocfs2/super.c linux-3.1.3/fs/ocfs2/super.c
14402
14403 /* Copy the blockcheck stats from the superblock probe */
14404 osb->osb_ecc_stats = *stats;
14405 -diff -urNp linux-3.1.3/fs/ocfs2/symlink.c linux-3.1.3/fs/ocfs2/symlink.c
14406 ---- linux-3.1.3/fs/ocfs2/symlink.c 2011-11-11 15:19:27.000000000 -0500
14407 -+++ linux-3.1.3/fs/ocfs2/symlink.c 2011-11-16 18:39:08.000000000 -0500
14408 +diff -urNp linux-3.1.4/fs/ocfs2/symlink.c linux-3.1.4/fs/ocfs2/symlink.c
14409 +--- linux-3.1.4/fs/ocfs2/symlink.c 2011-11-11 15:19:27.000000000 -0500
14410 ++++ linux-3.1.4/fs/ocfs2/symlink.c 2011-11-16 18:39:08.000000000 -0500
14411 @@ -142,7 +142,7 @@ bail:
14412
14413 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
14414 @@ -45140,9 +46007,9 @@ diff -urNp linux-3.1.3/fs/ocfs2/symlink.c linux-3.1.3/fs/ocfs2/symlink.c
14415 if (!IS_ERR(link))
14416 kfree(link);
14417 }
14418 -diff -urNp linux-3.1.3/fs/open.c linux-3.1.3/fs/open.c
14419 ---- linux-3.1.3/fs/open.c 2011-11-11 15:19:27.000000000 -0500
14420 -+++ linux-3.1.3/fs/open.c 2011-11-17 19:07:55.000000000 -0500
14421 +diff -urNp linux-3.1.4/fs/open.c linux-3.1.4/fs/open.c
14422 +--- linux-3.1.4/fs/open.c 2011-11-11 15:19:27.000000000 -0500
14423 ++++ linux-3.1.4/fs/open.c 2011-11-17 19:07:55.000000000 -0500
14424 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
14425 error = locks_verify_truncate(inode, NULL, length);
14426 if (!error)
14427 @@ -45228,9 +46095,9 @@ diff -urNp linux-3.1.3/fs/open.c linux-3.1.3/fs/open.c
14428 newattrs.ia_valid = ATTR_CTIME;
14429 if (user != (uid_t) -1) {
14430 newattrs.ia_valid |= ATTR_UID;
14431 -diff -urNp linux-3.1.3/fs/partitions/ldm.c linux-3.1.3/fs/partitions/ldm.c
14432 ---- linux-3.1.3/fs/partitions/ldm.c 2011-11-11 15:19:27.000000000 -0500
14433 -+++ linux-3.1.3/fs/partitions/ldm.c 2011-11-17 19:08:15.000000000 -0500
14434 +diff -urNp linux-3.1.4/fs/partitions/ldm.c linux-3.1.4/fs/partitions/ldm.c
14435 +--- linux-3.1.4/fs/partitions/ldm.c 2011-11-11 15:19:27.000000000 -0500
14436 ++++ linux-3.1.4/fs/partitions/ldm.c 2011-11-17 19:08:15.000000000 -0500
14437 @@ -1322,7 +1322,7 @@ static bool ldm_frag_add (const u8 *data
14438 goto found;
14439 }
14440 @@ -45240,9 +46107,9 @@ diff -urNp linux-3.1.3/fs/partitions/ldm.c linux-3.1.3/fs/partitions/ldm.c
14441 if (!f) {
14442 ldm_crit ("Out of memory.");
14443 return false;
14444 -diff -urNp linux-3.1.3/fs/pipe.c linux-3.1.3/fs/pipe.c
14445 ---- linux-3.1.3/fs/pipe.c 2011-11-11 15:19:27.000000000 -0500
14446 -+++ linux-3.1.3/fs/pipe.c 2011-11-16 18:40:29.000000000 -0500
14447 +diff -urNp linux-3.1.4/fs/pipe.c linux-3.1.4/fs/pipe.c
14448 +--- linux-3.1.4/fs/pipe.c 2011-11-11 15:19:27.000000000 -0500
14449 ++++ linux-3.1.4/fs/pipe.c 2011-11-16 18:40:29.000000000 -0500
14450 @@ -420,9 +420,9 @@ redo:
14451 }
14452 if (bufs) /* More to do? */
14453 @@ -45366,9 +46233,9 @@ diff -urNp linux-3.1.3/fs/pipe.c linux-3.1.3/fs/pipe.c
14454 inode->i_fop = &rdwr_pipefifo_fops;
14455
14456 /*
14457 -diff -urNp linux-3.1.3/fs/proc/array.c linux-3.1.3/fs/proc/array.c
14458 ---- linux-3.1.3/fs/proc/array.c 2011-11-11 15:19:27.000000000 -0500
14459 -+++ linux-3.1.3/fs/proc/array.c 2011-11-17 18:42:02.000000000 -0500
14460 +diff -urNp linux-3.1.4/fs/proc/array.c linux-3.1.4/fs/proc/array.c
14461 +--- linux-3.1.4/fs/proc/array.c 2011-11-11 15:19:27.000000000 -0500
14462 ++++ linux-3.1.4/fs/proc/array.c 2011-11-17 18:42:02.000000000 -0500
14463 @@ -60,6 +60,7 @@
14464 #include <linux/tty.h>
14465 #include <linux/string.h>
14466 @@ -45488,9 +46355,9 @@ diff -urNp linux-3.1.3/fs/proc/array.c linux-3.1.3/fs/proc/array.c
14467 + return sprintf(buffer, "%pI4\n", &curr_ip);
14468 +}
14469 +#endif
14470 -diff -urNp linux-3.1.3/fs/proc/base.c linux-3.1.3/fs/proc/base.c
14471 ---- linux-3.1.3/fs/proc/base.c 2011-11-11 15:19:27.000000000 -0500
14472 -+++ linux-3.1.3/fs/proc/base.c 2011-11-17 18:43:19.000000000 -0500
14473 +diff -urNp linux-3.1.4/fs/proc/base.c linux-3.1.4/fs/proc/base.c
14474 +--- linux-3.1.4/fs/proc/base.c 2011-11-11 15:19:27.000000000 -0500
14475 ++++ linux-3.1.4/fs/proc/base.c 2011-11-17 18:43:19.000000000 -0500
14476 @@ -107,6 +107,22 @@ struct pid_entry {
14477 union proc_op op;
14478 };
14479 @@ -45925,9 +46792,9 @@ diff -urNp linux-3.1.3/fs/proc/base.c linux-3.1.3/fs/proc/base.c
14480 ONE("stack", S_IRUGO, proc_pid_stack),
14481 #endif
14482 #ifdef CONFIG_SCHEDSTATS
14483 -diff -urNp linux-3.1.3/fs/proc/cmdline.c linux-3.1.3/fs/proc/cmdline.c
14484 ---- linux-3.1.3/fs/proc/cmdline.c 2011-11-11 15:19:27.000000000 -0500
14485 -+++ linux-3.1.3/fs/proc/cmdline.c 2011-11-16 18:40:29.000000000 -0500
14486 +diff -urNp linux-3.1.4/fs/proc/cmdline.c linux-3.1.4/fs/proc/cmdline.c
14487 +--- linux-3.1.4/fs/proc/cmdline.c 2011-11-11 15:19:27.000000000 -0500
14488 ++++ linux-3.1.4/fs/proc/cmdline.c 2011-11-16 18:40:29.000000000 -0500
14489 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
14490
14491 static int __init proc_cmdline_init(void)
14492 @@ -45940,9 +46807,9 @@ diff -urNp linux-3.1.3/fs/proc/cmdline.c linux-3.1.3/fs/proc/cmdline.c
14493 return 0;
14494 }
14495 module_init(proc_cmdline_init);
14496 -diff -urNp linux-3.1.3/fs/proc/devices.c linux-3.1.3/fs/proc/devices.c
14497 ---- linux-3.1.3/fs/proc/devices.c 2011-11-11 15:19:27.000000000 -0500
14498 -+++ linux-3.1.3/fs/proc/devices.c 2011-11-16 18:40:29.000000000 -0500
14499 +diff -urNp linux-3.1.4/fs/proc/devices.c linux-3.1.4/fs/proc/devices.c
14500 +--- linux-3.1.4/fs/proc/devices.c 2011-11-11 15:19:27.000000000 -0500
14501 ++++ linux-3.1.4/fs/proc/devices.c 2011-11-16 18:40:29.000000000 -0500
14502 @@ -64,7 +64,11 @@ static const struct file_operations proc
14503
14504 static int __init proc_devices_init(void)
14505 @@ -45955,9 +46822,9 @@ diff -urNp linux-3.1.3/fs/proc/devices.c linux-3.1.3/fs/proc/devices.c
14506 return 0;
14507 }
14508 module_init(proc_devices_init);
14509 -diff -urNp linux-3.1.3/fs/proc/inode.c linux-3.1.3/fs/proc/inode.c
14510 ---- linux-3.1.3/fs/proc/inode.c 2011-11-11 15:19:27.000000000 -0500
14511 -+++ linux-3.1.3/fs/proc/inode.c 2011-11-16 18:40:29.000000000 -0500
14512 +diff -urNp linux-3.1.4/fs/proc/inode.c linux-3.1.4/fs/proc/inode.c
14513 +--- linux-3.1.4/fs/proc/inode.c 2011-11-11 15:19:27.000000000 -0500
14514 ++++ linux-3.1.4/fs/proc/inode.c 2011-11-16 18:40:29.000000000 -0500
14515 @@ -18,12 +18,18 @@
14516 #include <linux/module.h>
14517 #include <linux/sysctl.h>
14518 @@ -46003,9 +46870,9 @@ diff -urNp linux-3.1.3/fs/proc/inode.c linux-3.1.3/fs/proc/inode.c
14519 }
14520 if (de->size)
14521 inode->i_size = de->size;
14522 -diff -urNp linux-3.1.3/fs/proc/internal.h linux-3.1.3/fs/proc/internal.h
14523 ---- linux-3.1.3/fs/proc/internal.h 2011-11-11 15:19:27.000000000 -0500
14524 -+++ linux-3.1.3/fs/proc/internal.h 2011-11-16 18:40:29.000000000 -0500
14525 +diff -urNp linux-3.1.4/fs/proc/internal.h linux-3.1.4/fs/proc/internal.h
14526 +--- linux-3.1.4/fs/proc/internal.h 2011-11-11 15:19:27.000000000 -0500
14527 ++++ linux-3.1.4/fs/proc/internal.h 2011-11-16 18:40:29.000000000 -0500
14528 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
14529 struct pid *pid, struct task_struct *task);
14530 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
14531 @@ -46016,9 +46883,9 @@ diff -urNp linux-3.1.3/fs/proc/internal.h linux-3.1.3/fs/proc/internal.h
14532 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
14533
14534 extern const struct file_operations proc_maps_operations;
14535 -diff -urNp linux-3.1.3/fs/proc/Kconfig linux-3.1.3/fs/proc/Kconfig
14536 ---- linux-3.1.3/fs/proc/Kconfig 2011-11-11 15:19:27.000000000 -0500
14537 -+++ linux-3.1.3/fs/proc/Kconfig 2011-11-16 18:40:29.000000000 -0500
14538 +diff -urNp linux-3.1.4/fs/proc/Kconfig linux-3.1.4/fs/proc/Kconfig
14539 +--- linux-3.1.4/fs/proc/Kconfig 2011-11-11 15:19:27.000000000 -0500
14540 ++++ linux-3.1.4/fs/proc/Kconfig 2011-11-16 18:40:29.000000000 -0500
14541 @@ -30,12 +30,12 @@ config PROC_FS
14542
14543 config PROC_KCORE
14544 @@ -46046,9 +46913,9 @@ diff -urNp linux-3.1.3/fs/proc/Kconfig linux-3.1.3/fs/proc/Kconfig
14545 bool "Enable /proc page monitoring" if EXPERT
14546 help
14547 Various /proc files exist to monitor process memory utilization:
14548 -diff -urNp linux-3.1.3/fs/proc/kcore.c linux-3.1.3/fs/proc/kcore.c
14549 ---- linux-3.1.3/fs/proc/kcore.c 2011-11-11 15:19:27.000000000 -0500
14550 -+++ linux-3.1.3/fs/proc/kcore.c 2011-11-16 18:40:29.000000000 -0500
14551 +diff -urNp linux-3.1.4/fs/proc/kcore.c linux-3.1.4/fs/proc/kcore.c
14552 +--- linux-3.1.4/fs/proc/kcore.c 2011-11-11 15:19:27.000000000 -0500
14553 ++++ linux-3.1.4/fs/proc/kcore.c 2011-11-16 18:40:29.000000000 -0500
14554 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
14555 off_t offset = 0;
14556 struct kcore_list *m;
14557 @@ -46116,9 +46983,9 @@ diff -urNp linux-3.1.3/fs/proc/kcore.c linux-3.1.3/fs/proc/kcore.c
14558 if (!capable(CAP_SYS_RAWIO))
14559 return -EPERM;
14560 if (kcore_need_update)
14561 -diff -urNp linux-3.1.3/fs/proc/meminfo.c linux-3.1.3/fs/proc/meminfo.c
14562 ---- linux-3.1.3/fs/proc/meminfo.c 2011-11-11 15:19:27.000000000 -0500
14563 -+++ linux-3.1.3/fs/proc/meminfo.c 2011-11-16 18:40:29.000000000 -0500
14564 +diff -urNp linux-3.1.4/fs/proc/meminfo.c linux-3.1.4/fs/proc/meminfo.c
14565 +--- linux-3.1.4/fs/proc/meminfo.c 2011-11-11 15:19:27.000000000 -0500
14566 ++++ linux-3.1.4/fs/proc/meminfo.c 2011-11-16 18:40:29.000000000 -0500
14567 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
14568 unsigned long pages[NR_LRU_LISTS];
14569 int lru;
14570 @@ -46137,9 +47004,9 @@ diff -urNp linux-3.1.3/fs/proc/meminfo.c linux-3.1.3/fs/proc/meminfo.c
14571 #endif
14572 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
14573 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
14574 -diff -urNp linux-3.1.3/fs/proc/nommu.c linux-3.1.3/fs/proc/nommu.c
14575 ---- linux-3.1.3/fs/proc/nommu.c 2011-11-11 15:19:27.000000000 -0500
14576 -+++ linux-3.1.3/fs/proc/nommu.c 2011-11-16 18:39:08.000000000 -0500
14577 +diff -urNp linux-3.1.4/fs/proc/nommu.c linux-3.1.4/fs/proc/nommu.c
14578 +--- linux-3.1.4/fs/proc/nommu.c 2011-11-11 15:19:27.000000000 -0500
14579 ++++ linux-3.1.4/fs/proc/nommu.c 2011-11-16 18:39:08.000000000 -0500
14580 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
14581 if (len < 1)
14582 len = 1;
14583 @@ -46149,9 +47016,9 @@ diff -urNp linux-3.1.3/fs/proc/nommu.c linux-3.1.3/fs/proc/nommu.c
14584 }
14585
14586 seq_putc(m, '\n');
14587 -diff -urNp linux-3.1.3/fs/proc/proc_net.c linux-3.1.3/fs/proc/proc_net.c
14588 ---- linux-3.1.3/fs/proc/proc_net.c 2011-11-11 15:19:27.000000000 -0500
14589 -+++ linux-3.1.3/fs/proc/proc_net.c 2011-11-16 18:40:29.000000000 -0500
14590 +diff -urNp linux-3.1.4/fs/proc/proc_net.c linux-3.1.4/fs/proc/proc_net.c
14591 +--- linux-3.1.4/fs/proc/proc_net.c 2011-11-11 15:19:27.000000000 -0500
14592 ++++ linux-3.1.4/fs/proc/proc_net.c 2011-11-16 18:40:29.000000000 -0500
14593 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
14594 struct task_struct *task;
14595 struct nsproxy *ns;
14596 @@ -46170,9 +47037,9 @@ diff -urNp linux-3.1.3/fs/proc/proc_net.c linux-3.1.3/fs/proc/proc_net.c
14597
14598 rcu_read_lock();
14599 task = pid_task(proc_pid(dir), PIDTYPE_PID);
14600 -diff -urNp linux-3.1.3/fs/proc/proc_sysctl.c linux-3.1.3/fs/proc/proc_sysctl.c
14601 ---- linux-3.1.3/fs/proc/proc_sysctl.c 2011-11-11 15:19:27.000000000 -0500
14602 -+++ linux-3.1.3/fs/proc/proc_sysctl.c 2011-11-18 18:45:33.000000000 -0500
14603 +diff -urNp linux-3.1.4/fs/proc/proc_sysctl.c linux-3.1.4/fs/proc/proc_sysctl.c
14604 +--- linux-3.1.4/fs/proc/proc_sysctl.c 2011-11-11 15:19:27.000000000 -0500
14605 ++++ linux-3.1.4/fs/proc/proc_sysctl.c 2011-11-18 18:45:33.000000000 -0500
14606 @@ -8,11 +8,13 @@
14607 #include <linux/namei.h>
14608 #include "internal.h"
14609 @@ -46255,9 +47122,9 @@ diff -urNp linux-3.1.3/fs/proc/proc_sysctl.c linux-3.1.3/fs/proc/proc_sysctl.c
14610 .lookup = proc_sys_lookup,
14611 .permission = proc_sys_permission,
14612 .setattr = proc_sys_setattr,
14613 -diff -urNp linux-3.1.3/fs/proc/root.c linux-3.1.3/fs/proc/root.c
14614 ---- linux-3.1.3/fs/proc/root.c 2011-11-11 15:19:27.000000000 -0500
14615 -+++ linux-3.1.3/fs/proc/root.c 2011-11-16 18:40:29.000000000 -0500
14616 +diff -urNp linux-3.1.4/fs/proc/root.c linux-3.1.4/fs/proc/root.c
14617 +--- linux-3.1.4/fs/proc/root.c 2011-11-11 15:19:27.000000000 -0500
14618 ++++ linux-3.1.4/fs/proc/root.c 2011-11-16 18:40:29.000000000 -0500
14619 @@ -123,7 +123,15 @@ void __init proc_root_init(void)
14620 #ifdef CONFIG_PROC_DEVICETREE
14621 proc_device_tree_init();
14622 @@ -46274,9 +47141,9 @@ diff -urNp linux-3.1.3/fs/proc/root.c linux-3.1.3/fs/proc/root.c
14623 proc_sys_init();
14624 }
14625
14626 -diff -urNp linux-3.1.3/fs/proc/task_mmu.c linux-3.1.3/fs/proc/task_mmu.c
14627 ---- linux-3.1.3/fs/proc/task_mmu.c 2011-11-11 15:19:27.000000000 -0500
14628 -+++ linux-3.1.3/fs/proc/task_mmu.c 2011-11-16 18:40:29.000000000 -0500
14629 +diff -urNp linux-3.1.4/fs/proc/task_mmu.c linux-3.1.4/fs/proc/task_mmu.c
14630 +--- linux-3.1.4/fs/proc/task_mmu.c 2011-11-11 15:19:27.000000000 -0500
14631 ++++ linux-3.1.4/fs/proc/task_mmu.c 2011-11-16 18:40:29.000000000 -0500
14632 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
14633 "VmExe:\t%8lu kB\n"
14634 "VmLib:\t%8lu kB\n"
14635 @@ -46416,9 +47283,9 @@ diff -urNp linux-3.1.3/fs/proc/task_mmu.c linux-3.1.3/fs/proc/task_mmu.c
14636 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
14637 seq_printf(m, " heap");
14638 } else if (vma->vm_start <= mm->start_stack &&
14639 -diff -urNp linux-3.1.3/fs/proc/task_nommu.c linux-3.1.3/fs/proc/task_nommu.c
14640 ---- linux-3.1.3/fs/proc/task_nommu.c 2011-11-11 15:19:27.000000000 -0500
14641 -+++ linux-3.1.3/fs/proc/task_nommu.c 2011-11-16 18:39:08.000000000 -0500
14642 +diff -urNp linux-3.1.4/fs/proc/task_nommu.c linux-3.1.4/fs/proc/task_nommu.c
14643 +--- linux-3.1.4/fs/proc/task_nommu.c 2011-11-11 15:19:27.000000000 -0500
14644 ++++ linux-3.1.4/fs/proc/task_nommu.c 2011-11-16 18:39:08.000000000 -0500
14645 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
14646 else
14647 bytes += kobjsize(mm);
14648 @@ -46437,9 +47304,9 @@ diff -urNp linux-3.1.3/fs/proc/task_nommu.c linux-3.1.3/fs/proc/task_nommu.c
14649 } else if (mm) {
14650 if (vma->vm_start <= mm->start_stack &&
14651 vma->vm_end >= mm->start_stack) {
14652 -diff -urNp linux-3.1.3/fs/quota/netlink.c linux-3.1.3/fs/quota/netlink.c
14653 ---- linux-3.1.3/fs/quota/netlink.c 2011-11-11 15:19:27.000000000 -0500
14654 -+++ linux-3.1.3/fs/quota/netlink.c 2011-11-16 18:39:08.000000000 -0500
14655 +diff -urNp linux-3.1.4/fs/quota/netlink.c linux-3.1.4/fs/quota/netlink.c
14656 +--- linux-3.1.4/fs/quota/netlink.c 2011-11-11 15:19:27.000000000 -0500
14657 ++++ linux-3.1.4/fs/quota/netlink.c 2011-11-16 18:39:08.000000000 -0500
14658 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
14659 void quota_send_warning(short type, unsigned int id, dev_t dev,
14660 const char warntype)
14661 @@ -46458,9 +47325,9 @@ diff -urNp linux-3.1.3/fs/quota/netlink.c linux-3.1.3/fs/quota/netlink.c
14662 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
14663 if (!msg_head) {
14664 printk(KERN_ERR
14665 -diff -urNp linux-3.1.3/fs/readdir.c linux-3.1.3/fs/readdir.c
14666 ---- linux-3.1.3/fs/readdir.c 2011-11-11 15:19:27.000000000 -0500
14667 -+++ linux-3.1.3/fs/readdir.c 2011-11-16 18:40:29.000000000 -0500
14668 +diff -urNp linux-3.1.4/fs/readdir.c linux-3.1.4/fs/readdir.c
14669 +--- linux-3.1.4/fs/readdir.c 2011-11-11 15:19:27.000000000 -0500
14670 ++++ linux-3.1.4/fs/readdir.c 2011-11-16 18:40:29.000000000 -0500
14671 @@ -17,6 +17,7 @@
14672 #include <linux/security.h>
14673 #include <linux/syscalls.h>
14674 @@ -46559,9 +47426,9 @@ diff -urNp linux-3.1.3/fs/readdir.c linux-3.1.3/fs/readdir.c
14675 if (__put_user(d_off, &lastdirent->d_off))
14676 error = -EFAULT;
14677 else
14678 -diff -urNp linux-3.1.3/fs/reiserfs/dir.c linux-3.1.3/fs/reiserfs/dir.c
14679 ---- linux-3.1.3/fs/reiserfs/dir.c 2011-11-11 15:19:27.000000000 -0500
14680 -+++ linux-3.1.3/fs/reiserfs/dir.c 2011-11-16 18:40:29.000000000 -0500
14681 +diff -urNp linux-3.1.4/fs/reiserfs/dir.c linux-3.1.4/fs/reiserfs/dir.c
14682 +--- linux-3.1.4/fs/reiserfs/dir.c 2011-11-11 15:19:27.000000000 -0500
14683 ++++ linux-3.1.4/fs/reiserfs/dir.c 2011-11-16 18:40:29.000000000 -0500
14684 @@ -75,6 +75,8 @@ int reiserfs_readdir_dentry(struct dentr
14685 struct reiserfs_dir_entry de;
14686 int ret = 0;
14687 @@ -46571,9 +47438,9 @@ diff -urNp linux-3.1.3/fs/reiserfs/dir.c linux-3.1.3/fs/reiserfs/dir.c
14688 reiserfs_write_lock(inode->i_sb);
14689
14690 reiserfs_check_lock_depth(inode->i_sb, "readdir");
14691 -diff -urNp linux-3.1.3/fs/reiserfs/do_balan.c linux-3.1.3/fs/reiserfs/do_balan.c
14692 ---- linux-3.1.3/fs/reiserfs/do_balan.c 2011-11-11 15:19:27.000000000 -0500
14693 -+++ linux-3.1.3/fs/reiserfs/do_balan.c 2011-11-16 18:39:08.000000000 -0500
14694 +diff -urNp linux-3.1.4/fs/reiserfs/do_balan.c linux-3.1.4/fs/reiserfs/do_balan.c
14695 +--- linux-3.1.4/fs/reiserfs/do_balan.c 2011-11-11 15:19:27.000000000 -0500
14696 ++++ linux-3.1.4/fs/reiserfs/do_balan.c 2011-11-16 18:39:08.000000000 -0500
14697 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
14698 return;
14699 }
14700 @@ -46583,9 +47450,9 @@ diff -urNp linux-3.1.3/fs/reiserfs/do_balan.c linux-3.1.3/fs/reiserfs/do_balan.c
14701 do_balance_starts(tb);
14702
14703 /* balance leaf returns 0 except if combining L R and S into
14704 -diff -urNp linux-3.1.3/fs/reiserfs/journal.c linux-3.1.3/fs/reiserfs/journal.c
14705 ---- linux-3.1.3/fs/reiserfs/journal.c 2011-11-11 15:19:27.000000000 -0500
14706 -+++ linux-3.1.3/fs/reiserfs/journal.c 2011-11-16 18:40:29.000000000 -0500
14707 +diff -urNp linux-3.1.4/fs/reiserfs/journal.c linux-3.1.4/fs/reiserfs/journal.c
14708 +--- linux-3.1.4/fs/reiserfs/journal.c 2011-11-11 15:19:27.000000000 -0500
14709 ++++ linux-3.1.4/fs/reiserfs/journal.c 2011-11-16 18:40:29.000000000 -0500
14710 @@ -2289,6 +2289,8 @@ static struct buffer_head *reiserfs_brea
14711 struct buffer_head *bh;
14712 int i, j;
14713 @@ -46595,9 +47462,9 @@ diff -urNp linux-3.1.3/fs/reiserfs/journal.c linux-3.1.3/fs/reiserfs/journal.c
14714 bh = __getblk(dev, block, bufsize);
14715 if (buffer_uptodate(bh))
14716 return (bh);
14717 -diff -urNp linux-3.1.3/fs/reiserfs/namei.c linux-3.1.3/fs/reiserfs/namei.c
14718 ---- linux-3.1.3/fs/reiserfs/namei.c 2011-11-11 15:19:27.000000000 -0500
14719 -+++ linux-3.1.3/fs/reiserfs/namei.c 2011-11-16 18:40:29.000000000 -0500
14720 +diff -urNp linux-3.1.4/fs/reiserfs/namei.c linux-3.1.4/fs/reiserfs/namei.c
14721 +--- linux-3.1.4/fs/reiserfs/namei.c 2011-11-11 15:19:27.000000000 -0500
14722 ++++ linux-3.1.4/fs/reiserfs/namei.c 2011-11-16 18:40:29.000000000 -0500
14723 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode
14724 unsigned long savelink = 1;
14725 struct timespec ctime;
14726 @@ -46607,9 +47474,9 @@ diff -urNp linux-3.1.3/fs/reiserfs/namei.c linux-3.1.3/fs/reiserfs/namei.c
14727 /* three balancings: (1) old name removal, (2) new name insertion
14728 and (3) maybe "save" link insertion
14729 stat data updates: (1) old directory,
14730 -diff -urNp linux-3.1.3/fs/reiserfs/procfs.c linux-3.1.3/fs/reiserfs/procfs.c
14731 ---- linux-3.1.3/fs/reiserfs/procfs.c 2011-11-11 15:19:27.000000000 -0500
14732 -+++ linux-3.1.3/fs/reiserfs/procfs.c 2011-11-16 18:40:29.000000000 -0500
14733 +diff -urNp linux-3.1.4/fs/reiserfs/procfs.c linux-3.1.4/fs/reiserfs/procfs.c
14734 +--- linux-3.1.4/fs/reiserfs/procfs.c 2011-11-11 15:19:27.000000000 -0500
14735 ++++ linux-3.1.4/fs/reiserfs/procfs.c 2011-11-16 18:40:29.000000000 -0500
14736 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
14737 "SMALL_TAILS " : "NO_TAILS ",
14738 replay_only(sb) ? "REPLAY_ONLY " : "",
14739 @@ -46628,9 +47495,9 @@ diff -urNp linux-3.1.3/fs/reiserfs/procfs.c linux-3.1.3/fs/reiserfs/procfs.c
14740 seq_printf(m, /* on-disk fields */
14741 "jp_journal_1st_block: \t%i\n"
14742 "jp_journal_dev: \t%s[%x]\n"
14743 -diff -urNp linux-3.1.3/fs/reiserfs/stree.c linux-3.1.3/fs/reiserfs/stree.c
14744 ---- linux-3.1.3/fs/reiserfs/stree.c 2011-11-11 15:19:27.000000000 -0500
14745 -+++ linux-3.1.3/fs/reiserfs/stree.c 2011-11-16 18:40:29.000000000 -0500
14746 +diff -urNp linux-3.1.4/fs/reiserfs/stree.c linux-3.1.4/fs/reiserfs/stree.c
14747 +--- linux-3.1.4/fs/reiserfs/stree.c 2011-11-11 15:19:27.000000000 -0500
14748 ++++ linux-3.1.4/fs/reiserfs/stree.c 2011-11-16 18:40:29.000000000 -0500
14749 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
14750 int iter = 0;
14751 #endif
14752 @@ -46676,9 +47543,9 @@ diff -urNp linux-3.1.3/fs/reiserfs/stree.c linux-3.1.3/fs/reiserfs/stree.c
14753 BUG_ON(!th->t_trans_id);
14754
14755 if (inode) { /* Do we count quotas for item? */
14756 -diff -urNp linux-3.1.3/fs/reiserfs/super.c linux-3.1.3/fs/reiserfs/super.c
14757 ---- linux-3.1.3/fs/reiserfs/super.c 2011-11-11 15:19:27.000000000 -0500
14758 -+++ linux-3.1.3/fs/reiserfs/super.c 2011-11-16 18:40:29.000000000 -0500
14759 +diff -urNp linux-3.1.4/fs/reiserfs/super.c linux-3.1.4/fs/reiserfs/super.c
14760 +--- linux-3.1.4/fs/reiserfs/super.c 2011-11-11 15:19:27.000000000 -0500
14761 ++++ linux-3.1.4/fs/reiserfs/super.c 2011-11-16 18:40:29.000000000 -0500
14762 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
14763 {.option_name = NULL}
14764 };
14765 @@ -46688,9 +47555,9 @@ diff -urNp linux-3.1.3/fs/reiserfs/super.c linux-3.1.3/fs/reiserfs/super.c
14766 *blocks = 0;
14767 if (!options || !*options)
14768 /* use default configuration: create tails, journaling on, no
14769 -diff -urNp linux-3.1.3/fs/select.c linux-3.1.3/fs/select.c
14770 ---- linux-3.1.3/fs/select.c 2011-11-11 15:19:27.000000000 -0500
14771 -+++ linux-3.1.3/fs/select.c 2011-11-16 18:40:29.000000000 -0500
14772 +diff -urNp linux-3.1.4/fs/select.c linux-3.1.4/fs/select.c
14773 +--- linux-3.1.4/fs/select.c 2011-11-11 15:19:27.000000000 -0500
14774 ++++ linux-3.1.4/fs/select.c 2011-11-16 18:40:29.000000000 -0500
14775 @@ -20,6 +20,7 @@
14776 #include <linux/module.h>
14777 #include <linux/slab.h>
14778 @@ -46727,9 +47594,9 @@ diff -urNp linux-3.1.3/fs/select.c linux-3.1.3/fs/select.c
14779 if (nfds > rlimit(RLIMIT_NOFILE))
14780 return -EINVAL;
14781
14782 -diff -urNp linux-3.1.3/fs/seq_file.c linux-3.1.3/fs/seq_file.c
14783 ---- linux-3.1.3/fs/seq_file.c 2011-11-11 15:19:27.000000000 -0500
14784 -+++ linux-3.1.3/fs/seq_file.c 2011-11-16 18:39:08.000000000 -0500
14785 +diff -urNp linux-3.1.4/fs/seq_file.c linux-3.1.4/fs/seq_file.c
14786 +--- linux-3.1.4/fs/seq_file.c 2011-11-11 15:19:27.000000000 -0500
14787 ++++ linux-3.1.4/fs/seq_file.c 2011-11-16 18:39:08.000000000 -0500
14788 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
14789 return 0;
14790 }
14791 @@ -46779,9 +47646,9 @@ diff -urNp linux-3.1.3/fs/seq_file.c linux-3.1.3/fs/seq_file.c
14792 int res = -ENOMEM;
14793
14794 if (op) {
14795 -diff -urNp linux-3.1.3/fs/splice.c linux-3.1.3/fs/splice.c
14796 ---- linux-3.1.3/fs/splice.c 2011-11-11 15:19:27.000000000 -0500
14797 -+++ linux-3.1.3/fs/splice.c 2011-11-16 18:40:29.000000000 -0500
14798 +diff -urNp linux-3.1.4/fs/splice.c linux-3.1.4/fs/splice.c
14799 +--- linux-3.1.4/fs/splice.c 2011-11-11 15:19:27.000000000 -0500
14800 ++++ linux-3.1.4/fs/splice.c 2011-11-16 18:40:29.000000000 -0500
14801 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
14802 pipe_lock(pipe);
14803
14804 @@ -46947,9 +47814,9 @@ diff -urNp linux-3.1.3/fs/splice.c linux-3.1.3/fs/splice.c
14805 ret = -EAGAIN;
14806
14807 pipe_unlock(ipipe);
14808 -diff -urNp linux-3.1.3/fs/sysfs/file.c linux-3.1.3/fs/sysfs/file.c
14809 ---- linux-3.1.3/fs/sysfs/file.c 2011-11-11 15:19:27.000000000 -0500
14810 -+++ linux-3.1.3/fs/sysfs/file.c 2011-11-16 18:39:08.000000000 -0500
14811 +diff -urNp linux-3.1.4/fs/sysfs/file.c linux-3.1.4/fs/sysfs/file.c
14812 +--- linux-3.1.4/fs/sysfs/file.c 2011-11-11 15:19:27.000000000 -0500
14813 ++++ linux-3.1.4/fs/sysfs/file.c 2011-11-16 18:39:08.000000000 -0500
14814 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
14815
14816 struct sysfs_open_dirent {
14817 @@ -46995,9 +47862,9 @@ diff -urNp linux-3.1.3/fs/sysfs/file.c linux-3.1.3/fs/sysfs/file.c
14818 wake_up_interruptible(&od->poll);
14819 }
14820
14821 -diff -urNp linux-3.1.3/fs/sysfs/mount.c linux-3.1.3/fs/sysfs/mount.c
14822 ---- linux-3.1.3/fs/sysfs/mount.c 2011-11-11 15:19:27.000000000 -0500
14823 -+++ linux-3.1.3/fs/sysfs/mount.c 2011-11-16 18:40:29.000000000 -0500
14824 +diff -urNp linux-3.1.4/fs/sysfs/mount.c linux-3.1.4/fs/sysfs/mount.c
14825 +--- linux-3.1.4/fs/sysfs/mount.c 2011-11-11 15:19:27.000000000 -0500
14826 ++++ linux-3.1.4/fs/sysfs/mount.c 2011-11-16 18:40:29.000000000 -0500
14827 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
14828 .s_name = "",
14829 .s_count = ATOMIC_INIT(1),
14830 @@ -47010,9 +47877,9 @@ diff -urNp linux-3.1.3/fs/sysfs/mount.c linux-3.1.3/fs/sysfs/mount.c
14831 .s_ino = 1,
14832 };
14833
14834 -diff -urNp linux-3.1.3/fs/sysfs/symlink.c linux-3.1.3/fs/sysfs/symlink.c
14835 ---- linux-3.1.3/fs/sysfs/symlink.c 2011-11-11 15:19:27.000000000 -0500
14836 -+++ linux-3.1.3/fs/sysfs/symlink.c 2011-11-16 18:39:08.000000000 -0500
14837 +diff -urNp linux-3.1.4/fs/sysfs/symlink.c linux-3.1.4/fs/sysfs/symlink.c
14838 +--- linux-3.1.4/fs/sysfs/symlink.c 2011-11-11 15:19:27.000000000 -0500
14839 ++++ linux-3.1.4/fs/sysfs/symlink.c 2011-11-16 18:39:08.000000000 -0500
14840 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
14841
14842 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
14843 @@ -47022,9 +47889,9 @@ diff -urNp linux-3.1.3/fs/sysfs/symlink.c linux-3.1.3/fs/sysfs/symlink.c
14844 if (!IS_ERR(page))
14845 free_page((unsigned long)page);
14846 }
14847 -diff -urNp linux-3.1.3/fs/udf/inode.c linux-3.1.3/fs/udf/inode.c
14848 ---- linux-3.1.3/fs/udf/inode.c 2011-11-11 15:19:27.000000000 -0500
14849 -+++ linux-3.1.3/fs/udf/inode.c 2011-11-16 18:40:29.000000000 -0500
14850 +diff -urNp linux-3.1.4/fs/udf/inode.c linux-3.1.4/fs/udf/inode.c
14851 +--- linux-3.1.4/fs/udf/inode.c 2011-11-11 15:19:27.000000000 -0500
14852 ++++ linux-3.1.4/fs/udf/inode.c 2011-11-16 18:40:29.000000000 -0500
14853 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
14854 int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
14855 int lastblock = 0;
14856 @@ -47034,9 +47901,9 @@ diff -urNp linux-3.1.3/fs/udf/inode.c linux-3.1.3/fs/udf/inode.c
14857 prev_epos.offset = udf_file_entry_alloc_offset(inode);
14858 prev_epos.block = iinfo->i_location;
14859 prev_epos.bh = NULL;
14860 -diff -urNp linux-3.1.3/fs/udf/misc.c linux-3.1.3/fs/udf/misc.c
14861 ---- linux-3.1.3/fs/udf/misc.c 2011-11-11 15:19:27.000000000 -0500
14862 -+++ linux-3.1.3/fs/udf/misc.c 2011-11-16 18:39:08.000000000 -0500
14863 +diff -urNp linux-3.1.4/fs/udf/misc.c linux-3.1.4/fs/udf/misc.c
14864 +--- linux-3.1.4/fs/udf/misc.c 2011-11-11 15:19:27.000000000 -0500
14865 ++++ linux-3.1.4/fs/udf/misc.c 2011-11-16 18:39:08.000000000 -0500
14866 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
14867
14868 u8 udf_tag_checksum(const struct tag *t)
14869 @@ -47046,9 +47913,9 @@ diff -urNp linux-3.1.3/fs/udf/misc.c linux-3.1.3/fs/udf/misc.c
14870 u8 checksum = 0;
14871 int i;
14872 for (i = 0; i < sizeof(struct tag); ++i)
14873 -diff -urNp linux-3.1.3/fs/utimes.c linux-3.1.3/fs/utimes.c
14874 ---- linux-3.1.3/fs/utimes.c 2011-11-11 15:19:27.000000000 -0500
14875 -+++ linux-3.1.3/fs/utimes.c 2011-11-16 18:40:29.000000000 -0500
14876 +diff -urNp linux-3.1.4/fs/utimes.c linux-3.1.4/fs/utimes.c
14877 +--- linux-3.1.4/fs/utimes.c 2011-11-11 15:19:27.000000000 -0500
14878 ++++ linux-3.1.4/fs/utimes.c 2011-11-16 18:40:29.000000000 -0500
14879 @@ -1,6 +1,7 @@
14880 #include <linux/compiler.h>
14881 #include <linux/file.h>
14882 @@ -47070,9 +47937,9 @@ diff -urNp linux-3.1.3/fs/utimes.c linux-3.1.3/fs/utimes.c
14883 mutex_lock(&inode->i_mutex);
14884 error = notify_change(path->dentry, &newattrs);
14885 mutex_unlock(&inode->i_mutex);
14886 -diff -urNp linux-3.1.3/fs/xattr_acl.c linux-3.1.3/fs/xattr_acl.c
14887 ---- linux-3.1.3/fs/xattr_acl.c 2011-11-11 15:19:27.000000000 -0500
14888 -+++ linux-3.1.3/fs/xattr_acl.c 2011-11-16 18:39:08.000000000 -0500
14889 +diff -urNp linux-3.1.4/fs/xattr_acl.c linux-3.1.4/fs/xattr_acl.c
14890 +--- linux-3.1.4/fs/xattr_acl.c 2011-11-11 15:19:27.000000000 -0500
14891 ++++ linux-3.1.4/fs/xattr_acl.c 2011-11-16 18:39:08.000000000 -0500
14892 @@ -17,8 +17,8 @@
14893 struct posix_acl *
14894 posix_acl_from_xattr(const void *value, size_t size)
14895 @@ -47084,9 +47951,9 @@ diff -urNp linux-3.1.3/fs/xattr_acl.c linux-3.1.3/fs/xattr_acl.c
14896 int count;
14897 struct posix_acl *acl;
14898 struct posix_acl_entry *acl_e;
14899 -diff -urNp linux-3.1.3/fs/xattr.c linux-3.1.3/fs/xattr.c
14900 ---- linux-3.1.3/fs/xattr.c 2011-11-11 15:19:27.000000000 -0500
14901 -+++ linux-3.1.3/fs/xattr.c 2011-11-16 18:40:29.000000000 -0500
14902 +diff -urNp linux-3.1.4/fs/xattr.c linux-3.1.4/fs/xattr.c
14903 +--- linux-3.1.4/fs/xattr.c 2011-11-11 15:19:27.000000000 -0500
14904 ++++ linux-3.1.4/fs/xattr.c 2011-11-16 18:40:29.000000000 -0500
14905 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
14906 * Extended attribute SET operations
14907 */
14908 @@ -47149,9 +48016,9 @@ diff -urNp linux-3.1.3/fs/xattr.c linux-3.1.3/fs/xattr.c
14909 mnt_drop_write(f->f_path.mnt);
14910 }
14911 fput(f);
14912 -diff -urNp linux-3.1.3/fs/xfs/xfs_bmap.c linux-3.1.3/fs/xfs/xfs_bmap.c
14913 ---- linux-3.1.3/fs/xfs/xfs_bmap.c 2011-11-11 15:19:27.000000000 -0500
14914 -+++ linux-3.1.3/fs/xfs/xfs_bmap.c 2011-11-16 18:39:08.000000000 -0500
14915 +diff -urNp linux-3.1.4/fs/xfs/xfs_bmap.c linux-3.1.4/fs/xfs/xfs_bmap.c
14916 +--- linux-3.1.4/fs/xfs/xfs_bmap.c 2011-11-11 15:19:27.000000000 -0500
14917 ++++ linux-3.1.4/fs/xfs/xfs_bmap.c 2011-11-16 18:39:08.000000000 -0500
14918 @@ -250,7 +250,7 @@ xfs_bmap_validate_ret(
14919 int nmap,
14920 int ret_nmap);
14921 @@ -47161,9 +48028,9 @@ diff -urNp linux-3.1.3/fs/xfs/xfs_bmap.c linux-3.1.3/fs/xfs/xfs_bmap.c
14922 #endif /* DEBUG */
14923
14924 STATIC int
14925 -diff -urNp linux-3.1.3/fs/xfs/xfs_dir2_sf.c linux-3.1.3/fs/xfs/xfs_dir2_sf.c
14926 ---- linux-3.1.3/fs/xfs/xfs_dir2_sf.c 2011-11-11 15:19:27.000000000 -0500
14927 -+++ linux-3.1.3/fs/xfs/xfs_dir2_sf.c 2011-11-16 18:39:08.000000000 -0500
14928 +diff -urNp linux-3.1.4/fs/xfs/xfs_dir2_sf.c linux-3.1.4/fs/xfs/xfs_dir2_sf.c
14929 +--- linux-3.1.4/fs/xfs/xfs_dir2_sf.c 2011-11-11 15:19:27.000000000 -0500
14930 ++++ linux-3.1.4/fs/xfs/xfs_dir2_sf.c 2011-11-16 18:39:08.000000000 -0500
14931 @@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
14932 }
14933
14934 @@ -47181,9 +48048,9 @@ diff -urNp linux-3.1.3/fs/xfs/xfs_dir2_sf.c linux-3.1.3/fs/xfs/xfs_dir2_sf.c
14935 off & 0x7fffffff, ino, DT_UNKNOWN)) {
14936 *offset = off & 0x7fffffff;
14937 return 0;
14938 -diff -urNp linux-3.1.3/fs/xfs/xfs_ioctl.c linux-3.1.3/fs/xfs/xfs_ioctl.c
14939 ---- linux-3.1.3/fs/xfs/xfs_ioctl.c 2011-11-11 15:19:27.000000000 -0500
14940 -+++ linux-3.1.3/fs/xfs/xfs_ioctl.c 2011-11-16 18:39:08.000000000 -0500
14941 +diff -urNp linux-3.1.4/fs/xfs/xfs_ioctl.c linux-3.1.4/fs/xfs/xfs_ioctl.c
14942 +--- linux-3.1.4/fs/xfs/xfs_ioctl.c 2011-11-11 15:19:27.000000000 -0500
14943 ++++ linux-3.1.4/fs/xfs/xfs_ioctl.c 2011-11-16 18:39:08.000000000 -0500
14944 @@ -128,7 +128,7 @@ xfs_find_handle(
14945 }
14946
14947 @@ -47193,9 +48060,9 @@ diff -urNp linux-3.1.3/fs/xfs/xfs_ioctl.c linux-3.1.3/fs/xfs/xfs_ioctl.c
14948 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
14949 goto out_put;
14950
14951 -diff -urNp linux-3.1.3/fs/xfs/xfs_iops.c linux-3.1.3/fs/xfs/xfs_iops.c
14952 ---- linux-3.1.3/fs/xfs/xfs_iops.c 2011-11-11 15:19:27.000000000 -0500
14953 -+++ linux-3.1.3/fs/xfs/xfs_iops.c 2011-11-16 18:39:08.000000000 -0500
14954 +diff -urNp linux-3.1.4/fs/xfs/xfs_iops.c linux-3.1.4/fs/xfs/xfs_iops.c
14955 +--- linux-3.1.4/fs/xfs/xfs_iops.c 2011-11-11 15:19:27.000000000 -0500
14956 ++++ linux-3.1.4/fs/xfs/xfs_iops.c 2011-11-16 18:39:08.000000000 -0500
14957 @@ -446,7 +446,7 @@ xfs_vn_put_link(
14958 struct nameidata *nd,
14959 void *p)
14960 @@ -47205,9 +48072,9 @@ diff -urNp linux-3.1.3/fs/xfs/xfs_iops.c linux-3.1.3/fs/xfs/xfs_iops.c
14961
14962 if (!IS_ERR(s))
14963 kfree(s);
14964 -diff -urNp linux-3.1.3/fs/xfs/xfs_vnodeops.c linux-3.1.3/fs/xfs/xfs_vnodeops.c
14965 ---- linux-3.1.3/fs/xfs/xfs_vnodeops.c 2011-11-11 15:19:27.000000000 -0500
14966 -+++ linux-3.1.3/fs/xfs/xfs_vnodeops.c 2011-11-18 18:54:56.000000000 -0500
14967 +diff -urNp linux-3.1.4/fs/xfs/xfs_vnodeops.c linux-3.1.4/fs/xfs/xfs_vnodeops.c
14968 +--- linux-3.1.4/fs/xfs/xfs_vnodeops.c 2011-11-11 15:19:27.000000000 -0500
14969 ++++ linux-3.1.4/fs/xfs/xfs_vnodeops.c 2011-11-18 18:54:56.000000000 -0500
14970 @@ -123,13 +123,17 @@ xfs_readlink(
14971
14972 xfs_ilock(ip, XFS_ILOCK_SHARED);
14973 @@ -47229,9 +48096,9 @@ diff -urNp linux-3.1.3/fs/xfs/xfs_vnodeops.c linux-3.1.3/fs/xfs/xfs_vnodeops.c
14974 if (ip->i_df.if_flags & XFS_IFINLINE) {
14975 memcpy(link, ip->i_df.if_u1.if_data, pathlen);
14976 link[pathlen] = '\0';
14977 -diff -urNp linux-3.1.3/grsecurity/gracl_alloc.c linux-3.1.3/grsecurity/gracl_alloc.c
14978 ---- linux-3.1.3/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
14979 -+++ linux-3.1.3/grsecurity/gracl_alloc.c 2011-11-16 18:40:31.000000000 -0500
14980 +diff -urNp linux-3.1.4/grsecurity/gracl_alloc.c linux-3.1.4/grsecurity/gracl_alloc.c
14981 +--- linux-3.1.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
14982 ++++ linux-3.1.4/grsecurity/gracl_alloc.c 2011-11-16 18:40:31.000000000 -0500
14983 @@ -0,0 +1,105 @@
14984 +#include <linux/kernel.h>
14985 +#include <linux/mm.h>
14986 @@ -47338,9 +48205,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_alloc.c linux-3.1.3/grsecurity/gracl_all
14987 + else
14988 + return 1;
14989 +}
14990 -diff -urNp linux-3.1.3/grsecurity/gracl.c linux-3.1.3/grsecurity/gracl.c
14991 ---- linux-3.1.3/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
14992 -+++ linux-3.1.3/grsecurity/gracl.c 2011-11-16 19:31:00.000000000 -0500
14993 +diff -urNp linux-3.1.4/grsecurity/gracl.c linux-3.1.4/grsecurity/gracl.c
14994 +--- linux-3.1.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
14995 ++++ linux-3.1.4/grsecurity/gracl.c 2011-11-16 19:31:00.000000000 -0500
14996 @@ -0,0 +1,4156 @@
14997 +#include <linux/kernel.h>
14998 +#include <linux/module.h>
14999 @@ -51498,9 +52365,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl.c linux-3.1.3/grsecurity/gracl.c
15000 +EXPORT_SYMBOL(gr_check_group_change);
15001 +#endif
15002 +
15003 -diff -urNp linux-3.1.3/grsecurity/gracl_cap.c linux-3.1.3/grsecurity/gracl_cap.c
15004 ---- linux-3.1.3/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
15005 -+++ linux-3.1.3/grsecurity/gracl_cap.c 2011-11-16 18:40:31.000000000 -0500
15006 +diff -urNp linux-3.1.4/grsecurity/gracl_cap.c linux-3.1.4/grsecurity/gracl_cap.c
15007 +--- linux-3.1.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
15008 ++++ linux-3.1.4/grsecurity/gracl_cap.c 2011-11-16 18:40:31.000000000 -0500
15009 @@ -0,0 +1,101 @@
15010 +#include <linux/kernel.h>
15011 +#include <linux/module.h>
15012 @@ -51603,9 +52470,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_cap.c linux-3.1.3/grsecurity/gracl_cap.c
15013 + return 0;
15014 +}
15015 +
15016 -diff -urNp linux-3.1.3/grsecurity/gracl_fs.c linux-3.1.3/grsecurity/gracl_fs.c
15017 ---- linux-3.1.3/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
15018 -+++ linux-3.1.3/grsecurity/gracl_fs.c 2011-11-17 00:25:32.000000000 -0500
15019 +diff -urNp linux-3.1.4/grsecurity/gracl_fs.c linux-3.1.4/grsecurity/gracl_fs.c
15020 +--- linux-3.1.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
15021 ++++ linux-3.1.4/grsecurity/gracl_fs.c 2011-11-17 00:25:32.000000000 -0500
15022 @@ -0,0 +1,433 @@
15023 +#include <linux/kernel.h>
15024 +#include <linux/sched.h>
15025 @@ -52040,9 +52907,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_fs.c linux-3.1.3/grsecurity/gracl_fs.c
15026 +
15027 + return 0;
15028 +}
15029 -diff -urNp linux-3.1.3/grsecurity/gracl_ip.c linux-3.1.3/grsecurity/gracl_ip.c
15030 ---- linux-3.1.3/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
15031 -+++ linux-3.1.3/grsecurity/gracl_ip.c 2011-11-16 18:40:31.000000000 -0500
15032 +diff -urNp linux-3.1.4/grsecurity/gracl_ip.c linux-3.1.4/grsecurity/gracl_ip.c
15033 +--- linux-3.1.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
15034 ++++ linux-3.1.4/grsecurity/gracl_ip.c 2011-11-16 18:40:31.000000000 -0500
15035 @@ -0,0 +1,381 @@
15036 +#include <linux/kernel.h>
15037 +#include <asm/uaccess.h>
15038 @@ -52425,9 +53292,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_ip.c linux-3.1.3/grsecurity/gracl_ip.c
15039 +
15040 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
15041 +}
15042 -diff -urNp linux-3.1.3/grsecurity/gracl_learn.c linux-3.1.3/grsecurity/gracl_learn.c
15043 ---- linux-3.1.3/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
15044 -+++ linux-3.1.3/grsecurity/gracl_learn.c 2011-11-16 18:40:31.000000000 -0500
15045 +diff -urNp linux-3.1.4/grsecurity/gracl_learn.c linux-3.1.4/grsecurity/gracl_learn.c
15046 +--- linux-3.1.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
15047 ++++ linux-3.1.4/grsecurity/gracl_learn.c 2011-11-16 18:40:31.000000000 -0500
15048 @@ -0,0 +1,207 @@
15049 +#include <linux/kernel.h>
15050 +#include <linux/mm.h>
15051 @@ -52636,9 +53503,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_learn.c linux-3.1.3/grsecurity/gracl_lea
15052 + .release = close_learn,
15053 + .poll = poll_learn,
15054 +};
15055 -diff -urNp linux-3.1.3/grsecurity/gracl_res.c linux-3.1.3/grsecurity/gracl_res.c
15056 ---- linux-3.1.3/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
15057 -+++ linux-3.1.3/grsecurity/gracl_res.c 2011-11-16 18:40:31.000000000 -0500
15058 +diff -urNp linux-3.1.4/grsecurity/gracl_res.c linux-3.1.4/grsecurity/gracl_res.c
15059 +--- linux-3.1.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
15060 ++++ linux-3.1.4/grsecurity/gracl_res.c 2011-11-16 18:40:31.000000000 -0500
15061 @@ -0,0 +1,68 @@
15062 +#include <linux/kernel.h>
15063 +#include <linux/sched.h>
15064 @@ -52708,9 +53575,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_res.c linux-3.1.3/grsecurity/gracl_res.c
15065 + rcu_read_unlock();
15066 + return;
15067 +}
15068 -diff -urNp linux-3.1.3/grsecurity/gracl_segv.c linux-3.1.3/grsecurity/gracl_segv.c
15069 ---- linux-3.1.3/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
15070 -+++ linux-3.1.3/grsecurity/gracl_segv.c 2011-11-16 18:40:31.000000000 -0500
15071 +diff -urNp linux-3.1.4/grsecurity/gracl_segv.c linux-3.1.4/grsecurity/gracl_segv.c
15072 +--- linux-3.1.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
15073 ++++ linux-3.1.4/grsecurity/gracl_segv.c 2011-11-16 18:40:31.000000000 -0500
15074 @@ -0,0 +1,299 @@
15075 +#include <linux/kernel.h>
15076 +#include <linux/mm.h>
15077 @@ -53011,9 +53878,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_segv.c linux-3.1.3/grsecurity/gracl_segv
15078 +
15079 + return;
15080 +}
15081 -diff -urNp linux-3.1.3/grsecurity/gracl_shm.c linux-3.1.3/grsecurity/gracl_shm.c
15082 ---- linux-3.1.3/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
15083 -+++ linux-3.1.3/grsecurity/gracl_shm.c 2011-11-16 18:40:31.000000000 -0500
15084 +diff -urNp linux-3.1.4/grsecurity/gracl_shm.c linux-3.1.4/grsecurity/gracl_shm.c
15085 +--- linux-3.1.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
15086 ++++ linux-3.1.4/grsecurity/gracl_shm.c 2011-11-16 18:40:31.000000000 -0500
15087 @@ -0,0 +1,40 @@
15088 +#include <linux/kernel.h>
15089 +#include <linux/mm.h>
15090 @@ -53055,9 +53922,9 @@ diff -urNp linux-3.1.3/grsecurity/gracl_shm.c linux-3.1.3/grsecurity/gracl_shm.c
15091 +
15092 + return 1;
15093 +}
15094 -diff -urNp linux-3.1.3/grsecurity/grsec_chdir.c linux-3.1.3/grsecurity/grsec_chdir.c
15095 ---- linux-3.1.3/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
15096 -+++ linux-3.1.3/grsecurity/grsec_chdir.c 2011-11-16 18:40:31.000000000 -0500
15097 +diff -urNp linux-3.1.4/grsecurity/grsec_chdir.c linux-3.1.4/grsecurity/grsec_chdir.c
15098 +--- linux-3.1.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
15099 ++++ linux-3.1.4/grsecurity/grsec_chdir.c 2011-11-16 18:40:31.000000000 -0500
15100 @@ -0,0 +1,19 @@
15101 +#include <linux/kernel.h>
15102 +#include <linux/sched.h>
15103 @@ -53078,9 +53945,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_chdir.c linux-3.1.3/grsecurity/grsec_chd
15104 +#endif
15105 + return;
15106 +}
15107 -diff -urNp linux-3.1.3/grsecurity/grsec_chroot.c linux-3.1.3/grsecurity/grsec_chroot.c
15108 ---- linux-3.1.3/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
15109 -+++ linux-3.1.3/grsecurity/grsec_chroot.c 2011-11-16 18:40:31.000000000 -0500
15110 +diff -urNp linux-3.1.4/grsecurity/grsec_chroot.c linux-3.1.4/grsecurity/grsec_chroot.c
15111 +--- linux-3.1.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
15112 ++++ linux-3.1.4/grsecurity/grsec_chroot.c 2011-11-16 18:40:31.000000000 -0500
15113 @@ -0,0 +1,351 @@
15114 +#include <linux/kernel.h>
15115 +#include <linux/module.h>
15116 @@ -53433,9 +54300,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_chroot.c linux-3.1.3/grsecurity/grsec_ch
15117 +#endif
15118 + return 0;
15119 +}
15120 -diff -urNp linux-3.1.3/grsecurity/grsec_disabled.c linux-3.1.3/grsecurity/grsec_disabled.c
15121 ---- linux-3.1.3/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
15122 -+++ linux-3.1.3/grsecurity/grsec_disabled.c 2011-11-17 00:16:25.000000000 -0500
15123 +diff -urNp linux-3.1.4/grsecurity/grsec_disabled.c linux-3.1.4/grsecurity/grsec_disabled.c
15124 +--- linux-3.1.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
15125 ++++ linux-3.1.4/grsecurity/grsec_disabled.c 2011-11-17 00:16:25.000000000 -0500
15126 @@ -0,0 +1,439 @@
15127 +#include <linux/kernel.h>
15128 +#include <linux/module.h>
15129 @@ -53876,9 +54743,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_disabled.c linux-3.1.3/grsecurity/grsec_
15130 +EXPORT_SYMBOL(gr_check_user_change);
15131 +EXPORT_SYMBOL(gr_check_group_change);
15132 +#endif
15133 -diff -urNp linux-3.1.3/grsecurity/grsec_exec.c linux-3.1.3/grsecurity/grsec_exec.c
15134 ---- linux-3.1.3/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
15135 -+++ linux-3.1.3/grsecurity/grsec_exec.c 2011-11-16 18:40:31.000000000 -0500
15136 +diff -urNp linux-3.1.4/grsecurity/grsec_exec.c linux-3.1.4/grsecurity/grsec_exec.c
15137 +--- linux-3.1.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
15138 ++++ linux-3.1.4/grsecurity/grsec_exec.c 2011-11-16 18:40:31.000000000 -0500
15139 @@ -0,0 +1,146 @@
15140 +#include <linux/kernel.h>
15141 +#include <linux/sched.h>
15142 @@ -54026,9 +54893,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_exec.c linux-3.1.3/grsecurity/grsec_exec
15143 +
15144 +EXPORT_SYMBOL(gr_is_capable);
15145 +EXPORT_SYMBOL(gr_is_capable_nolog);
15146 -diff -urNp linux-3.1.3/grsecurity/grsec_fifo.c linux-3.1.3/grsecurity/grsec_fifo.c
15147 ---- linux-3.1.3/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
15148 -+++ linux-3.1.3/grsecurity/grsec_fifo.c 2011-11-16 18:40:31.000000000 -0500
15149 +diff -urNp linux-3.1.4/grsecurity/grsec_fifo.c linux-3.1.4/grsecurity/grsec_fifo.c
15150 +--- linux-3.1.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
15151 ++++ linux-3.1.4/grsecurity/grsec_fifo.c 2011-11-16 18:40:31.000000000 -0500
15152 @@ -0,0 +1,24 @@
15153 +#include <linux/kernel.h>
15154 +#include <linux/sched.h>
15155 @@ -54054,9 +54921,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_fifo.c linux-3.1.3/grsecurity/grsec_fifo
15156 +#endif
15157 + return 0;
15158 +}
15159 -diff -urNp linux-3.1.3/grsecurity/grsec_fork.c linux-3.1.3/grsecurity/grsec_fork.c
15160 ---- linux-3.1.3/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
15161 -+++ linux-3.1.3/grsecurity/grsec_fork.c 2011-11-16 18:40:31.000000000 -0500
15162 +diff -urNp linux-3.1.4/grsecurity/grsec_fork.c linux-3.1.4/grsecurity/grsec_fork.c
15163 +--- linux-3.1.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
15164 ++++ linux-3.1.4/grsecurity/grsec_fork.c 2011-11-16 18:40:31.000000000 -0500
15165 @@ -0,0 +1,23 @@
15166 +#include <linux/kernel.h>
15167 +#include <linux/sched.h>
15168 @@ -54081,9 +54948,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_fork.c linux-3.1.3/grsecurity/grsec_fork
15169 +#endif
15170 + return;
15171 +}
15172 -diff -urNp linux-3.1.3/grsecurity/grsec_init.c linux-3.1.3/grsecurity/grsec_init.c
15173 ---- linux-3.1.3/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
15174 -+++ linux-3.1.3/grsecurity/grsec_init.c 2011-11-16 18:40:31.000000000 -0500
15175 +diff -urNp linux-3.1.4/grsecurity/grsec_init.c linux-3.1.4/grsecurity/grsec_init.c
15176 +--- linux-3.1.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
15177 ++++ linux-3.1.4/grsecurity/grsec_init.c 2011-11-16 18:40:31.000000000 -0500
15178 @@ -0,0 +1,269 @@
15179 +#include <linux/kernel.h>
15180 +#include <linux/sched.h>
15181 @@ -54354,9 +55221,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_init.c linux-3.1.3/grsecurity/grsec_init
15182 +
15183 + return;
15184 +}
15185 -diff -urNp linux-3.1.3/grsecurity/grsec_link.c linux-3.1.3/grsecurity/grsec_link.c
15186 ---- linux-3.1.3/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
15187 -+++ linux-3.1.3/grsecurity/grsec_link.c 2011-11-16 18:40:31.000000000 -0500
15188 +diff -urNp linux-3.1.4/grsecurity/grsec_link.c linux-3.1.4/grsecurity/grsec_link.c
15189 +--- linux-3.1.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
15190 ++++ linux-3.1.4/grsecurity/grsec_link.c 2011-11-16 18:40:31.000000000 -0500
15191 @@ -0,0 +1,43 @@
15192 +#include <linux/kernel.h>
15193 +#include <linux/sched.h>
15194 @@ -54401,9 +55268,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_link.c linux-3.1.3/grsecurity/grsec_link
15195 +#endif
15196 + return 0;
15197 +}
15198 -diff -urNp linux-3.1.3/grsecurity/grsec_log.c linux-3.1.3/grsecurity/grsec_log.c
15199 ---- linux-3.1.3/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
15200 -+++ linux-3.1.3/grsecurity/grsec_log.c 2011-11-16 18:40:31.000000000 -0500
15201 +diff -urNp linux-3.1.4/grsecurity/grsec_log.c linux-3.1.4/grsecurity/grsec_log.c
15202 +--- linux-3.1.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
15203 ++++ linux-3.1.4/grsecurity/grsec_log.c 2011-11-16 18:40:31.000000000 -0500
15204 @@ -0,0 +1,322 @@
15205 +#include <linux/kernel.h>
15206 +#include <linux/sched.h>
15207 @@ -54727,9 +55594,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_log.c linux-3.1.3/grsecurity/grsec_log.c
15208 + gr_log_end(audit, 1);
15209 + END_LOCKS(audit);
15210 +}
15211 -diff -urNp linux-3.1.3/grsecurity/grsec_mem.c linux-3.1.3/grsecurity/grsec_mem.c
15212 ---- linux-3.1.3/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
15213 -+++ linux-3.1.3/grsecurity/grsec_mem.c 2011-11-16 18:40:31.000000000 -0500
15214 +diff -urNp linux-3.1.4/grsecurity/grsec_mem.c linux-3.1.4/grsecurity/grsec_mem.c
15215 +--- linux-3.1.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
15216 ++++ linux-3.1.4/grsecurity/grsec_mem.c 2011-11-16 18:40:31.000000000 -0500
15217 @@ -0,0 +1,33 @@
15218 +#include <linux/kernel.h>
15219 +#include <linux/sched.h>
15220 @@ -54764,9 +55631,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_mem.c linux-3.1.3/grsecurity/grsec_mem.c
15221 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
15222 + return;
15223 +}
15224 -diff -urNp linux-3.1.3/grsecurity/grsec_mount.c linux-3.1.3/grsecurity/grsec_mount.c
15225 ---- linux-3.1.3/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
15226 -+++ linux-3.1.3/grsecurity/grsec_mount.c 2011-11-16 18:40:31.000000000 -0500
15227 +diff -urNp linux-3.1.4/grsecurity/grsec_mount.c linux-3.1.4/grsecurity/grsec_mount.c
15228 +--- linux-3.1.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
15229 ++++ linux-3.1.4/grsecurity/grsec_mount.c 2011-11-16 18:40:31.000000000 -0500
15230 @@ -0,0 +1,62 @@
15231 +#include <linux/kernel.h>
15232 +#include <linux/sched.h>
15233 @@ -54830,9 +55697,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_mount.c linux-3.1.3/grsecurity/grsec_mou
15234 +#endif
15235 + return 0;
15236 +}
15237 -diff -urNp linux-3.1.3/grsecurity/grsec_pax.c linux-3.1.3/grsecurity/grsec_pax.c
15238 ---- linux-3.1.3/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
15239 -+++ linux-3.1.3/grsecurity/grsec_pax.c 2011-11-16 18:40:31.000000000 -0500
15240 +diff -urNp linux-3.1.4/grsecurity/grsec_pax.c linux-3.1.4/grsecurity/grsec_pax.c
15241 +--- linux-3.1.4/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
15242 ++++ linux-3.1.4/grsecurity/grsec_pax.c 2011-11-16 18:40:31.000000000 -0500
15243 @@ -0,0 +1,36 @@
15244 +#include <linux/kernel.h>
15245 +#include <linux/sched.h>
15246 @@ -54870,9 +55737,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_pax.c linux-3.1.3/grsecurity/grsec_pax.c
15247 +#endif
15248 + return;
15249 +}
15250 -diff -urNp linux-3.1.3/grsecurity/grsec_ptrace.c linux-3.1.3/grsecurity/grsec_ptrace.c
15251 ---- linux-3.1.3/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
15252 -+++ linux-3.1.3/grsecurity/grsec_ptrace.c 2011-11-16 18:40:31.000000000 -0500
15253 +diff -urNp linux-3.1.4/grsecurity/grsec_ptrace.c linux-3.1.4/grsecurity/grsec_ptrace.c
15254 +--- linux-3.1.4/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
15255 ++++ linux-3.1.4/grsecurity/grsec_ptrace.c 2011-11-16 18:40:31.000000000 -0500
15256 @@ -0,0 +1,14 @@
15257 +#include <linux/kernel.h>
15258 +#include <linux/sched.h>
15259 @@ -54888,9 +55755,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_ptrace.c linux-3.1.3/grsecurity/grsec_pt
15260 +#endif
15261 + return;
15262 +}
15263 -diff -urNp linux-3.1.3/grsecurity/grsec_sig.c linux-3.1.3/grsecurity/grsec_sig.c
15264 ---- linux-3.1.3/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
15265 -+++ linux-3.1.3/grsecurity/grsec_sig.c 2011-11-16 18:40:31.000000000 -0500
15266 +diff -urNp linux-3.1.4/grsecurity/grsec_sig.c linux-3.1.4/grsecurity/grsec_sig.c
15267 +--- linux-3.1.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
15268 ++++ linux-3.1.4/grsecurity/grsec_sig.c 2011-11-16 18:40:31.000000000 -0500
15269 @@ -0,0 +1,206 @@
15270 +#include <linux/kernel.h>
15271 +#include <linux/sched.h>
15272 @@ -55098,9 +55965,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_sig.c linux-3.1.3/grsecurity/grsec_sig.c
15273 +#endif
15274 + return 0;
15275 +}
15276 -diff -urNp linux-3.1.3/grsecurity/grsec_sock.c linux-3.1.3/grsecurity/grsec_sock.c
15277 ---- linux-3.1.3/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
15278 -+++ linux-3.1.3/grsecurity/grsec_sock.c 2011-11-16 18:40:31.000000000 -0500
15279 +diff -urNp linux-3.1.4/grsecurity/grsec_sock.c linux-3.1.4/grsecurity/grsec_sock.c
15280 +--- linux-3.1.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
15281 ++++ linux-3.1.4/grsecurity/grsec_sock.c 2011-11-16 18:40:31.000000000 -0500
15282 @@ -0,0 +1,244 @@
15283 +#include <linux/kernel.h>
15284 +#include <linux/module.h>
15285 @@ -55346,9 +56213,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_sock.c linux-3.1.3/grsecurity/grsec_sock
15286 +#endif
15287 + return 0;
15288 +}
15289 -diff -urNp linux-3.1.3/grsecurity/grsec_sysctl.c linux-3.1.3/grsecurity/grsec_sysctl.c
15290 ---- linux-3.1.3/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
15291 -+++ linux-3.1.3/grsecurity/grsec_sysctl.c 2011-11-16 18:40:31.000000000 -0500
15292 +diff -urNp linux-3.1.4/grsecurity/grsec_sysctl.c linux-3.1.4/grsecurity/grsec_sysctl.c
15293 +--- linux-3.1.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
15294 ++++ linux-3.1.4/grsecurity/grsec_sysctl.c 2011-11-16 18:40:31.000000000 -0500
15295 @@ -0,0 +1,433 @@
15296 +#include <linux/kernel.h>
15297 +#include <linux/sched.h>
15298 @@ -55783,9 +56650,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_sysctl.c linux-3.1.3/grsecurity/grsec_sy
15299 + { }
15300 +};
15301 +#endif
15302 -diff -urNp linux-3.1.3/grsecurity/grsec_time.c linux-3.1.3/grsecurity/grsec_time.c
15303 ---- linux-3.1.3/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
15304 -+++ linux-3.1.3/grsecurity/grsec_time.c 2011-11-16 18:40:31.000000000 -0500
15305 +diff -urNp linux-3.1.4/grsecurity/grsec_time.c linux-3.1.4/grsecurity/grsec_time.c
15306 +--- linux-3.1.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
15307 ++++ linux-3.1.4/grsecurity/grsec_time.c 2011-11-16 18:40:31.000000000 -0500
15308 @@ -0,0 +1,16 @@
15309 +#include <linux/kernel.h>
15310 +#include <linux/sched.h>
15311 @@ -55803,9 +56670,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_time.c linux-3.1.3/grsecurity/grsec_time
15312 +}
15313 +
15314 +EXPORT_SYMBOL(gr_log_timechange);
15315 -diff -urNp linux-3.1.3/grsecurity/grsec_tpe.c linux-3.1.3/grsecurity/grsec_tpe.c
15316 ---- linux-3.1.3/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
15317 -+++ linux-3.1.3/grsecurity/grsec_tpe.c 2011-11-16 18:40:31.000000000 -0500
15318 +diff -urNp linux-3.1.4/grsecurity/grsec_tpe.c linux-3.1.4/grsecurity/grsec_tpe.c
15319 +--- linux-3.1.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
15320 ++++ linux-3.1.4/grsecurity/grsec_tpe.c 2011-11-16 18:40:31.000000000 -0500
15321 @@ -0,0 +1,39 @@
15322 +#include <linux/kernel.h>
15323 +#include <linux/sched.h>
15324 @@ -55846,9 +56713,9 @@ diff -urNp linux-3.1.3/grsecurity/grsec_tpe.c linux-3.1.3/grsecurity/grsec_tpe.c
15325 +#endif
15326 + return 1;
15327 +}
15328 -diff -urNp linux-3.1.3/grsecurity/grsum.c linux-3.1.3/grsecurity/grsum.c
15329 ---- linux-3.1.3/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
15330 -+++ linux-3.1.3/grsecurity/grsum.c 2011-11-16 18:40:31.000000000 -0500
15331 +diff -urNp linux-3.1.4/grsecurity/grsum.c linux-3.1.4/grsecurity/grsum.c
15332 +--- linux-3.1.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
15333 ++++ linux-3.1.4/grsecurity/grsum.c 2011-11-16 18:40:31.000000000 -0500
15334 @@ -0,0 +1,61 @@
15335 +#include <linux/err.h>
15336 +#include <linux/kernel.h>
15337 @@ -55911,9 +56778,9 @@ diff -urNp linux-3.1.3/grsecurity/grsum.c linux-3.1.3/grsecurity/grsum.c
15338 +
15339 + return retval;
15340 +}
15341 -diff -urNp linux-3.1.3/grsecurity/Kconfig linux-3.1.3/grsecurity/Kconfig
15342 ---- linux-3.1.3/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
15343 -+++ linux-3.1.3/grsecurity/Kconfig 2011-11-16 18:40:31.000000000 -0500
15344 +diff -urNp linux-3.1.4/grsecurity/Kconfig linux-3.1.4/grsecurity/Kconfig
15345 +--- linux-3.1.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
15346 ++++ linux-3.1.4/grsecurity/Kconfig 2011-11-16 18:40:31.000000000 -0500
15347 @@ -0,0 +1,1037 @@
15348 +#
15349 +# grecurity configuration
15350 @@ -56952,9 +57819,9 @@ diff -urNp linux-3.1.3/grsecurity/Kconfig linux-3.1.3/grsecurity/Kconfig
15351 +endmenu
15352 +
15353 +endmenu
15354 -diff -urNp linux-3.1.3/grsecurity/Makefile linux-3.1.3/grsecurity/Makefile
15355 ---- linux-3.1.3/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
15356 -+++ linux-3.1.3/grsecurity/Makefile 2011-11-16 18:40:31.000000000 -0500
15357 +diff -urNp linux-3.1.4/grsecurity/Makefile linux-3.1.4/grsecurity/Makefile
15358 +--- linux-3.1.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
15359 ++++ linux-3.1.4/grsecurity/Makefile 2011-11-16 18:40:31.000000000 -0500
15360 @@ -0,0 +1,36 @@
15361 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
15362 +# during 2001-2009 it has been completely redesigned by Brad Spengler
15363 @@ -56992,9 +57859,9 @@ diff -urNp linux-3.1.3/grsecurity/Makefile linux-3.1.3/grsecurity/Makefile
15364 + @-chmod -f 700 .
15365 + @echo ' grsec: protected kernel image paths'
15366 +endif
15367 -diff -urNp linux-3.1.3/include/acpi/acpi_bus.h linux-3.1.3/include/acpi/acpi_bus.h
15368 ---- linux-3.1.3/include/acpi/acpi_bus.h 2011-11-11 15:19:27.000000000 -0500
15369 -+++ linux-3.1.3/include/acpi/acpi_bus.h 2011-11-16 18:39:08.000000000 -0500
15370 +diff -urNp linux-3.1.4/include/acpi/acpi_bus.h linux-3.1.4/include/acpi/acpi_bus.h
15371 +--- linux-3.1.4/include/acpi/acpi_bus.h 2011-11-11 15:19:27.000000000 -0500
15372 ++++ linux-3.1.4/include/acpi/acpi_bus.h 2011-11-16 18:39:08.000000000 -0500
15373 @@ -107,7 +107,7 @@ struct acpi_device_ops {
15374 acpi_op_bind bind;
15375 acpi_op_unbind unbind;
15376 @@ -57004,9 +57871,9 @@ diff -urNp linux-3.1.3/include/acpi/acpi_bus.h linux-3.1.3/include/acpi/acpi_bus
15377
15378 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
15379
15380 -diff -urNp linux-3.1.3/include/asm-generic/atomic-long.h linux-3.1.3/include/asm-generic/atomic-long.h
15381 ---- linux-3.1.3/include/asm-generic/atomic-long.h 2011-11-11 15:19:27.000000000 -0500
15382 -+++ linux-3.1.3/include/asm-generic/atomic-long.h 2011-11-16 18:39:08.000000000 -0500
15383 +diff -urNp linux-3.1.4/include/asm-generic/atomic-long.h linux-3.1.4/include/asm-generic/atomic-long.h
15384 +--- linux-3.1.4/include/asm-generic/atomic-long.h 2011-11-11 15:19:27.000000000 -0500
15385 ++++ linux-3.1.4/include/asm-generic/atomic-long.h 2011-11-16 18:39:08.000000000 -0500
15386 @@ -22,6 +22,12 @@
15387
15388 typedef atomic64_t atomic_long_t;
15389 @@ -57307,9 +58174,9 @@ diff -urNp linux-3.1.3/include/asm-generic/atomic-long.h linux-3.1.3/include/asm
15390 +#endif
15391 +
15392 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
15393 -diff -urNp linux-3.1.3/include/asm-generic/cache.h linux-3.1.3/include/asm-generic/cache.h
15394 ---- linux-3.1.3/include/asm-generic/cache.h 2011-11-11 15:19:27.000000000 -0500
15395 -+++ linux-3.1.3/include/asm-generic/cache.h 2011-11-16 18:39:08.000000000 -0500
15396 +diff -urNp linux-3.1.4/include/asm-generic/cache.h linux-3.1.4/include/asm-generic/cache.h
15397 +--- linux-3.1.4/include/asm-generic/cache.h 2011-11-11 15:19:27.000000000 -0500
15398 ++++ linux-3.1.4/include/asm-generic/cache.h 2011-11-16 18:39:08.000000000 -0500
15399 @@ -6,7 +6,7 @@
15400 * cache lines need to provide their own cache.h.
15401 */
15402 @@ -57320,9 +58187,9 @@ diff -urNp linux-3.1.3/include/asm-generic/cache.h linux-3.1.3/include/asm-gener
15403 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
15404
15405 #endif /* __ASM_GENERIC_CACHE_H */
15406 -diff -urNp linux-3.1.3/include/asm-generic/int-l64.h linux-3.1.3/include/asm-generic/int-l64.h
15407 ---- linux-3.1.3/include/asm-generic/int-l64.h 2011-11-11 15:19:27.000000000 -0500
15408 -+++ linux-3.1.3/include/asm-generic/int-l64.h 2011-11-16 18:39:08.000000000 -0500
15409 +diff -urNp linux-3.1.4/include/asm-generic/int-l64.h linux-3.1.4/include/asm-generic/int-l64.h
15410 +--- linux-3.1.4/include/asm-generic/int-l64.h 2011-11-11 15:19:27.000000000 -0500
15411 ++++ linux-3.1.4/include/asm-generic/int-l64.h 2011-11-16 18:39:08.000000000 -0500
15412 @@ -46,6 +46,8 @@ typedef unsigned int u32;
15413 typedef signed long s64;
15414 typedef unsigned long u64;
15415 @@ -57332,9 +58199,9 @@ diff -urNp linux-3.1.3/include/asm-generic/int-l64.h linux-3.1.3/include/asm-gen
15416 #define S8_C(x) x
15417 #define U8_C(x) x ## U
15418 #define S16_C(x) x
15419 -diff -urNp linux-3.1.3/include/asm-generic/int-ll64.h linux-3.1.3/include/asm-generic/int-ll64.h
15420 ---- linux-3.1.3/include/asm-generic/int-ll64.h 2011-11-11 15:19:27.000000000 -0500
15421 -+++ linux-3.1.3/include/asm-generic/int-ll64.h 2011-11-16 18:39:08.000000000 -0500
15422 +diff -urNp linux-3.1.4/include/asm-generic/int-ll64.h linux-3.1.4/include/asm-generic/int-ll64.h
15423 +--- linux-3.1.4/include/asm-generic/int-ll64.h 2011-11-11 15:19:27.000000000 -0500
15424 ++++ linux-3.1.4/include/asm-generic/int-ll64.h 2011-11-16 18:39:08.000000000 -0500
15425 @@ -51,6 +51,8 @@ typedef unsigned int u32;
15426 typedef signed long long s64;
15427 typedef unsigned long long u64;
15428 @@ -57344,9 +58211,9 @@ diff -urNp linux-3.1.3/include/asm-generic/int-ll64.h linux-3.1.3/include/asm-ge
15429 #define S8_C(x) x
15430 #define U8_C(x) x ## U
15431 #define S16_C(x) x
15432 -diff -urNp linux-3.1.3/include/asm-generic/kmap_types.h linux-3.1.3/include/asm-generic/kmap_types.h
15433 ---- linux-3.1.3/include/asm-generic/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
15434 -+++ linux-3.1.3/include/asm-generic/kmap_types.h 2011-11-16 18:39:08.000000000 -0500
15435 +diff -urNp linux-3.1.4/include/asm-generic/kmap_types.h linux-3.1.4/include/asm-generic/kmap_types.h
15436 +--- linux-3.1.4/include/asm-generic/kmap_types.h 2011-11-11 15:19:27.000000000 -0500
15437 ++++ linux-3.1.4/include/asm-generic/kmap_types.h 2011-11-16 18:39:08.000000000 -0500
15438 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
15439 KMAP_D(17) KM_NMI,
15440 KMAP_D(18) KM_NMI_PTE,
15441 @@ -57360,9 +58227,9 @@ diff -urNp linux-3.1.3/include/asm-generic/kmap_types.h linux-3.1.3/include/asm-
15442 };
15443
15444 #undef KMAP_D
15445 -diff -urNp linux-3.1.3/include/asm-generic/pgtable.h linux-3.1.3/include/asm-generic/pgtable.h
15446 ---- linux-3.1.3/include/asm-generic/pgtable.h 2011-11-11 15:19:27.000000000 -0500
15447 -+++ linux-3.1.3/include/asm-generic/pgtable.h 2011-11-16 18:39:08.000000000 -0500
15448 +diff -urNp linux-3.1.4/include/asm-generic/pgtable.h linux-3.1.4/include/asm-generic/pgtable.h
15449 +--- linux-3.1.4/include/asm-generic/pgtable.h 2011-11-11 15:19:27.000000000 -0500
15450 ++++ linux-3.1.4/include/asm-generic/pgtable.h 2011-11-16 18:39:08.000000000 -0500
15451 @@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
15452 #endif /* __HAVE_ARCH_PMD_WRITE */
15453 #endif
15454 @@ -57378,9 +58245,9 @@ diff -urNp linux-3.1.3/include/asm-generic/pgtable.h linux-3.1.3/include/asm-gen
15455 #endif /* !__ASSEMBLY__ */
15456
15457 #endif /* _ASM_GENERIC_PGTABLE_H */
15458 -diff -urNp linux-3.1.3/include/asm-generic/pgtable-nopmd.h linux-3.1.3/include/asm-generic/pgtable-nopmd.h
15459 ---- linux-3.1.3/include/asm-generic/pgtable-nopmd.h 2011-11-11 15:19:27.000000000 -0500
15460 -+++ linux-3.1.3/include/asm-generic/pgtable-nopmd.h 2011-11-16 18:39:08.000000000 -0500
15461 +diff -urNp linux-3.1.4/include/asm-generic/pgtable-nopmd.h linux-3.1.4/include/asm-generic/pgtable-nopmd.h
15462 +--- linux-3.1.4/include/asm-generic/pgtable-nopmd.h 2011-11-11 15:19:27.000000000 -0500
15463 ++++ linux-3.1.4/include/asm-generic/pgtable-nopmd.h 2011-11-16 18:39:08.000000000 -0500
15464 @@ -1,14 +1,19 @@
15465 #ifndef _PGTABLE_NOPMD_H
15466 #define _PGTABLE_NOPMD_H
15467 @@ -57417,9 +58284,9 @@ diff -urNp linux-3.1.3/include/asm-generic/pgtable-nopmd.h linux-3.1.3/include/a
15468 /*
15469 * The "pud_xxx()" functions here are trivial for a folded two-level
15470 * setup: the pmd is never bad, and a pmd always exists (as it's folded
15471 -diff -urNp linux-3.1.3/include/asm-generic/pgtable-nopud.h linux-3.1.3/include/asm-generic/pgtable-nopud.h
15472 ---- linux-3.1.3/include/asm-generic/pgtable-nopud.h 2011-11-11 15:19:27.000000000 -0500
15473 -+++ linux-3.1.3/include/asm-generic/pgtable-nopud.h 2011-11-16 18:39:08.000000000 -0500
15474 +diff -urNp linux-3.1.4/include/asm-generic/pgtable-nopud.h linux-3.1.4/include/asm-generic/pgtable-nopud.h
15475 +--- linux-3.1.4/include/asm-generic/pgtable-nopud.h 2011-11-11 15:19:27.000000000 -0500
15476 ++++ linux-3.1.4/include/asm-generic/pgtable-nopud.h 2011-11-16 18:39:08.000000000 -0500
15477 @@ -1,10 +1,15 @@
15478 #ifndef _PGTABLE_NOPUD_H
15479 #define _PGTABLE_NOPUD_H
15480 @@ -57450,9 +58317,9 @@ diff -urNp linux-3.1.3/include/asm-generic/pgtable-nopud.h linux-3.1.3/include/a
15481 /*
15482 * The "pgd_xxx()" functions here are trivial for a folded two-level
15483 * setup: the pud is never bad, and a pud always exists (as it's folded
15484 -diff -urNp linux-3.1.3/include/asm-generic/vmlinux.lds.h linux-3.1.3/include/asm-generic/vmlinux.lds.h
15485 ---- linux-3.1.3/include/asm-generic/vmlinux.lds.h 2011-11-11 15:19:27.000000000 -0500
15486 -+++ linux-3.1.3/include/asm-generic/vmlinux.lds.h 2011-11-16 18:39:08.000000000 -0500
15487 +diff -urNp linux-3.1.4/include/asm-generic/vmlinux.lds.h linux-3.1.4/include/asm-generic/vmlinux.lds.h
15488 +--- linux-3.1.4/include/asm-generic/vmlinux.lds.h 2011-11-11 15:19:27.000000000 -0500
15489 ++++ linux-3.1.4/include/asm-generic/vmlinux.lds.h 2011-11-16 18:39:08.000000000 -0500
15490 @@ -217,6 +217,7 @@
15491 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
15492 VMLINUX_SYMBOL(__start_rodata) = .; \
15493 @@ -57484,9 +58351,9 @@ diff -urNp linux-3.1.3/include/asm-generic/vmlinux.lds.h linux-3.1.3/include/asm
15494
15495 /**
15496 * PERCPU_SECTION - define output section for percpu area, simple version
15497 -diff -urNp linux-3.1.3/include/drm/drm_crtc_helper.h linux-3.1.3/include/drm/drm_crtc_helper.h
15498 ---- linux-3.1.3/include/drm/drm_crtc_helper.h 2011-11-11 15:19:27.000000000 -0500
15499 -+++ linux-3.1.3/include/drm/drm_crtc_helper.h 2011-11-16 18:39:08.000000000 -0500
15500 +diff -urNp linux-3.1.4/include/drm/drm_crtc_helper.h linux-3.1.4/include/drm/drm_crtc_helper.h
15501 +--- linux-3.1.4/include/drm/drm_crtc_helper.h 2011-11-11 15:19:27.000000000 -0500
15502 ++++ linux-3.1.4/include/drm/drm_crtc_helper.h 2011-11-16 18:39:08.000000000 -0500
15503 @@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
15504
15505 /* disable crtc when not in use - more explicit than dpms off */
15506 @@ -57505,9 +58372,9 @@ diff -urNp linux-3.1.3/include/drm/drm_crtc_helper.h linux-3.1.3/include/drm/drm
15507
15508 struct drm_connector_helper_funcs {
15509 int (*get_modes)(struct drm_connector *connector);
15510 -diff -urNp linux-3.1.3/include/drm/drmP.h linux-3.1.3/include/drm/drmP.h
15511 ---- linux-3.1.3/include/drm/drmP.h 2011-11-11 15:19:27.000000000 -0500
15512 -+++ linux-3.1.3/include/drm/drmP.h 2011-11-16 18:39:08.000000000 -0500
15513 +diff -urNp linux-3.1.4/include/drm/drmP.h linux-3.1.4/include/drm/drmP.h
15514 +--- linux-3.1.4/include/drm/drmP.h 2011-11-11 15:19:27.000000000 -0500
15515 ++++ linux-3.1.4/include/drm/drmP.h 2011-11-16 18:39:08.000000000 -0500
15516 @@ -73,6 +73,7 @@
15517 #include <linux/workqueue.h>
15518 #include <linux/poll.h>
15519 @@ -57534,9 +58401,9 @@ diff -urNp linux-3.1.3/include/drm/drmP.h linux-3.1.3/include/drm/drmP.h
15520 /*@} */
15521
15522 struct list_head filelist;
15523 -diff -urNp linux-3.1.3/include/drm/ttm/ttm_memory.h linux-3.1.3/include/drm/ttm/ttm_memory.h
15524 ---- linux-3.1.3/include/drm/ttm/ttm_memory.h 2011-11-11 15:19:27.000000000 -0500
15525 -+++ linux-3.1.3/include/drm/ttm/ttm_memory.h 2011-11-16 18:39:08.000000000 -0500
15526 +diff -urNp linux-3.1.4/include/drm/ttm/ttm_memory.h linux-3.1.4/include/drm/ttm/ttm_memory.h
15527 +--- linux-3.1.4/include/drm/ttm/ttm_memory.h 2011-11-11 15:19:27.000000000 -0500
15528 ++++ linux-3.1.4/include/drm/ttm/ttm_memory.h 2011-11-16 18:39:08.000000000 -0500
15529 @@ -47,7 +47,7 @@
15530
15531 struct ttm_mem_shrink {
15532 @@ -57546,9 +58413,9 @@ diff -urNp linux-3.1.3/include/drm/ttm/ttm_memory.h linux-3.1.3/include/drm/ttm/
15533
15534 /**
15535 * struct ttm_mem_global - Global memory accounting structure.
15536 -diff -urNp linux-3.1.3/include/linux/a.out.h linux-3.1.3/include/linux/a.out.h
15537 ---- linux-3.1.3/include/linux/a.out.h 2011-11-11 15:19:27.000000000 -0500
15538 -+++ linux-3.1.3/include/linux/a.out.h 2011-11-16 18:39:08.000000000 -0500
15539 +diff -urNp linux-3.1.4/include/linux/a.out.h linux-3.1.4/include/linux/a.out.h
15540 +--- linux-3.1.4/include/linux/a.out.h 2011-11-11 15:19:27.000000000 -0500
15541 ++++ linux-3.1.4/include/linux/a.out.h 2011-11-16 18:39:08.000000000 -0500
15542 @@ -39,6 +39,14 @@ enum machine_type {
15543 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
15544 };
15545 @@ -57564,9 +58431,9 @@ diff -urNp linux-3.1.3/include/linux/a.out.h linux-3.1.3/include/linux/a.out.h
15546 #if !defined (N_MAGIC)
15547 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
15548 #endif
15549 -diff -urNp linux-3.1.3/include/linux/atmdev.h linux-3.1.3/include/linux/atmdev.h
15550 ---- linux-3.1.3/include/linux/atmdev.h 2011-11-11 15:19:27.000000000 -0500
15551 -+++ linux-3.1.3/include/linux/atmdev.h 2011-11-16 18:39:08.000000000 -0500
15552 +diff -urNp linux-3.1.4/include/linux/atmdev.h linux-3.1.4/include/linux/atmdev.h
15553 +--- linux-3.1.4/include/linux/atmdev.h 2011-11-11 15:19:27.000000000 -0500
15554 ++++ linux-3.1.4/include/linux/atmdev.h 2011-11-16 18:39:08.000000000 -0500
15555 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
15556 #endif
15557
15558 @@ -57576,9 +58443,9 @@ diff -urNp linux-3.1.3/include/linux/atmdev.h linux-3.1.3/include/linux/atmdev.h
15559 __AAL_STAT_ITEMS
15560 #undef __HANDLE_ITEM
15561 };
15562 -diff -urNp linux-3.1.3/include/linux/binfmts.h linux-3.1.3/include/linux/binfmts.h
15563 ---- linux-3.1.3/include/linux/binfmts.h 2011-11-11 15:19:27.000000000 -0500
15564 -+++ linux-3.1.3/include/linux/binfmts.h 2011-11-16 18:39:08.000000000 -0500
15565 +diff -urNp linux-3.1.4/include/linux/binfmts.h linux-3.1.4/include/linux/binfmts.h
15566 +--- linux-3.1.4/include/linux/binfmts.h 2011-11-11 15:19:27.000000000 -0500
15567 ++++ linux-3.1.4/include/linux/binfmts.h 2011-11-16 18:39:08.000000000 -0500
15568 @@ -88,6 +88,7 @@ struct linux_binfmt {
15569 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
15570 int (*load_shlib)(struct file *);
15571 @@ -57587,9 +58454,9 @@ diff -urNp linux-3.1.3/include/linux/binfmts.h linux-3.1.3/include/linux/binfmts
15572 unsigned long min_coredump; /* minimal dump size */
15573 };
15574
15575 -diff -urNp linux-3.1.3/include/linux/blkdev.h linux-3.1.3/include/linux/blkdev.h
15576 ---- linux-3.1.3/include/linux/blkdev.h 2011-11-11 15:19:27.000000000 -0500
15577 -+++ linux-3.1.3/include/linux/blkdev.h 2011-11-16 18:39:08.000000000 -0500
15578 +diff -urNp linux-3.1.4/include/linux/blkdev.h linux-3.1.4/include/linux/blkdev.h
15579 +--- linux-3.1.4/include/linux/blkdev.h 2011-11-11 15:19:27.000000000 -0500
15580 ++++ linux-3.1.4/include/linux/blkdev.h 2011-11-16 18:39:08.000000000 -0500
15581 @@ -1321,7 +1321,7 @@ struct block_device_operations {
15582 /* this callback is with swap_lock and sometimes page table lock held */
15583 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
15584 @@ -57599,9 +58466,9 @@ diff -urNp linux-3.1.3/include/linux/blkdev.h linux-3.1.3/include/linux/blkdev.h
15585
15586 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
15587 unsigned long);
15588 -diff -urNp linux-3.1.3/include/linux/blktrace_api.h linux-3.1.3/include/linux/blktrace_api.h
15589 ---- linux-3.1.3/include/linux/blktrace_api.h 2011-11-11 15:19:27.000000000 -0500
15590 -+++ linux-3.1.3/include/linux/blktrace_api.h 2011-11-16 18:39:08.000000000 -0500
15591 +diff -urNp linux-3.1.4/include/linux/blktrace_api.h linux-3.1.4/include/linux/blktrace_api.h
15592 +--- linux-3.1.4/include/linux/blktrace_api.h 2011-11-11 15:19:27.000000000 -0500
15593 ++++ linux-3.1.4/include/linux/blktrace_api.h 2011-11-16 18:39:08.000000000 -0500
15594 @@ -162,7 +162,7 @@ struct blk_trace {
15595 struct dentry *dir;
15596 struct dentry *dropped_file;
15597 @@ -57611,9 +58478,9 @@ diff -urNp linux-3.1.3/include/linux/blktrace_api.h linux-3.1.3/include/linux/bl
15598 };
15599
15600 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
15601 -diff -urNp linux-3.1.3/include/linux/byteorder/little_endian.h linux-3.1.3/include/linux/byteorder/little_endian.h
15602 ---- linux-3.1.3/include/linux/byteorder/little_endian.h 2011-11-11 15:19:27.000000000 -0500
15603 -+++ linux-3.1.3/include/linux/byteorder/little_endian.h 2011-11-16 18:39:08.000000000 -0500
15604 +diff -urNp linux-3.1.4/include/linux/byteorder/little_endian.h linux-3.1.4/include/linux/byteorder/little_endian.h
15605 +--- linux-3.1.4/include/linux/byteorder/little_endian.h 2011-11-11 15:19:27.000000000 -0500
15606 ++++ linux-3.1.4/include/linux/byteorder/little_endian.h 2011-11-16 18:39:08.000000000 -0500
15607 @@ -42,51 +42,51 @@
15608
15609 static inline __le64 __cpu_to_le64p(const __u64 *p)
15610 @@ -57678,9 +58545,9 @@ diff -urNp linux-3.1.3/include/linux/byteorder/little_endian.h linux-3.1.3/inclu
15611 }
15612 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
15613 #define __le64_to_cpus(x) do { (void)(x); } while (0)
15614 -diff -urNp linux-3.1.3/include/linux/cache.h linux-3.1.3/include/linux/cache.h
15615 ---- linux-3.1.3/include/linux/cache.h 2011-11-11 15:19:27.000000000 -0500
15616 -+++ linux-3.1.3/include/linux/cache.h 2011-11-16 18:39:08.000000000 -0500
15617 +diff -urNp linux-3.1.4/include/linux/cache.h linux-3.1.4/include/linux/cache.h
15618 +--- linux-3.1.4/include/linux/cache.h 2011-11-11 15:19:27.000000000 -0500
15619 ++++ linux-3.1.4/include/linux/cache.h 2011-11-16 18:39:08.000000000 -0500
15620 @@ -16,6 +16,10 @@
15621 #define __read_mostly
15622 #endif
15623 @@ -57692,9 +58559,9 @@ diff -urNp linux-3.1.3/include/linux/cache.h linux-3.1.3/include/linux/cache.h
15624 #ifndef ____cacheline_aligned
15625 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
15626 #endif
15627 -diff -urNp linux-3.1.3/include/linux/capability.h linux-3.1.3/include/linux/capability.h
15628 ---- linux-3.1.3/include/linux/capability.h 2011-11-11 15:19:27.000000000 -0500
15629 -+++ linux-3.1.3/include/linux/capability.h 2011-11-16 18:40:31.000000000 -0500
15630 +diff -urNp linux-3.1.4/include/linux/capability.h linux-3.1.4/include/linux/capability.h
15631 +--- linux-3.1.4/include/linux/capability.h 2011-11-11 15:19:27.000000000 -0500
15632 ++++ linux-3.1.4/include/linux/capability.h 2011-11-16 18:40:31.000000000 -0500
15633 @@ -547,6 +547,9 @@ extern bool capable(int cap);
15634 extern bool ns_capable(struct user_namespace *ns, int cap);
15635 extern bool task_ns_capable(struct task_struct *t, int cap);
15636 @@ -57705,9 +58572,9 @@ diff -urNp linux-3.1.3/include/linux/capability.h linux-3.1.3/include/linux/capa
15637
15638 /* audit system wants to get cap info from files as well */
15639 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
15640 -diff -urNp linux-3.1.3/include/linux/cleancache.h linux-3.1.3/include/linux/cleancache.h
15641 ---- linux-3.1.3/include/linux/cleancache.h 2011-11-11 15:19:27.000000000 -0500
15642 -+++ linux-3.1.3/include/linux/cleancache.h 2011-11-16 18:39:08.000000000 -0500
15643 +diff -urNp linux-3.1.4/include/linux/cleancache.h linux-3.1.4/include/linux/cleancache.h
15644 +--- linux-3.1.4/include/linux/cleancache.h 2011-11-11 15:19:27.000000000 -0500
15645 ++++ linux-3.1.4/include/linux/cleancache.h 2011-11-16 18:39:08.000000000 -0500
15646 @@ -31,7 +31,7 @@ struct cleancache_ops {
15647 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
15648 void (*flush_inode)(int, struct cleancache_filekey);
15649 @@ -57717,9 +58584,9 @@ diff -urNp linux-3.1.3/include/linux/cleancache.h linux-3.1.3/include/linux/clea
15650
15651 extern struct cleancache_ops
15652 cleancache_register_ops(struct cleancache_ops *ops);
15653 -diff -urNp linux-3.1.3/include/linux/compiler-gcc4.h linux-3.1.3/include/linux/compiler-gcc4.h
15654 ---- linux-3.1.3/include/linux/compiler-gcc4.h 2011-11-11 15:19:27.000000000 -0500
15655 -+++ linux-3.1.3/include/linux/compiler-gcc4.h 2011-11-16 18:39:08.000000000 -0500
15656 +diff -urNp linux-3.1.4/include/linux/compiler-gcc4.h linux-3.1.4/include/linux/compiler-gcc4.h
15657 +--- linux-3.1.4/include/linux/compiler-gcc4.h 2011-11-11 15:19:27.000000000 -0500
15658 ++++ linux-3.1.4/include/linux/compiler-gcc4.h 2011-11-16 18:39:08.000000000 -0500
15659 @@ -31,6 +31,12 @@
15660
15661
15662 @@ -57745,9 +58612,9 @@ diff -urNp linux-3.1.3/include/linux/compiler-gcc4.h linux-3.1.3/include/linux/c
15663 #endif
15664
15665 #if __GNUC_MINOR__ > 0
15666 -diff -urNp linux-3.1.3/include/linux/compiler.h linux-3.1.3/include/linux/compiler.h
15667 ---- linux-3.1.3/include/linux/compiler.h 2011-11-11 15:19:27.000000000 -0500
15668 -+++ linux-3.1.3/include/linux/compiler.h 2011-11-16 18:39:08.000000000 -0500
15669 +diff -urNp linux-3.1.4/include/linux/compiler.h linux-3.1.4/include/linux/compiler.h
15670 +--- linux-3.1.4/include/linux/compiler.h 2011-11-11 15:19:27.000000000 -0500
15671 ++++ linux-3.1.4/include/linux/compiler.h 2011-11-16 18:39:08.000000000 -0500
15672 @@ -5,31 +5,62 @@
15673
15674 #ifdef __CHECKER__
15675 @@ -57868,9 +58735,9 @@ diff -urNp linux-3.1.3/include/linux/compiler.h linux-3.1.3/include/linux/compil
15676 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
15677
15678 #endif /* __LINUX_COMPILER_H */
15679 -diff -urNp linux-3.1.3/include/linux/cpuset.h linux-3.1.3/include/linux/cpuset.h
15680 ---- linux-3.1.3/include/linux/cpuset.h 2011-11-11 15:19:27.000000000 -0500
15681 -+++ linux-3.1.3/include/linux/cpuset.h 2011-11-16 18:39:08.000000000 -0500
15682 +diff -urNp linux-3.1.4/include/linux/cpuset.h linux-3.1.4/include/linux/cpuset.h
15683 +--- linux-3.1.4/include/linux/cpuset.h 2011-11-11 15:19:27.000000000 -0500
15684 ++++ linux-3.1.4/include/linux/cpuset.h 2011-11-16 18:39:08.000000000 -0500
15685 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
15686 * nodemask.
15687 */
15688 @@ -57880,9 +58747,9 @@ diff -urNp linux-3.1.3/include/linux/cpuset.h linux-3.1.3/include/linux/cpuset.h
15689 }
15690
15691 static inline void set_mems_allowed(nodemask_t nodemask)
15692 -diff -urNp linux-3.1.3/include/linux/crypto.h linux-3.1.3/include/linux/crypto.h
15693 ---- linux-3.1.3/include/linux/crypto.h 2011-11-11 15:19:27.000000000 -0500
15694 -+++ linux-3.1.3/include/linux/crypto.h 2011-11-16 18:39:08.000000000 -0500
15695 +diff -urNp linux-3.1.4/include/linux/crypto.h linux-3.1.4/include/linux/crypto.h
15696 +--- linux-3.1.4/include/linux/crypto.h 2011-11-11 15:19:27.000000000 -0500
15697 ++++ linux-3.1.4/include/linux/crypto.h 2011-11-16 18:39:08.000000000 -0500
15698 @@ -361,7 +361,7 @@ struct cipher_tfm {
15699 const u8 *key, unsigned int keylen);
15700 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
15701 @@ -57908,9 +58775,9 @@ diff -urNp linux-3.1.3/include/linux/crypto.h linux-3.1.3/include/linux/crypto.h
15702
15703 #define crt_ablkcipher crt_u.ablkcipher
15704 #define crt_aead crt_u.aead
15705 -diff -urNp linux-3.1.3/include/linux/decompress/mm.h linux-3.1.3/include/linux/decompress/mm.h
15706 ---- linux-3.1.3/include/linux/decompress/mm.h 2011-11-11 15:19:27.000000000 -0500
15707 -+++ linux-3.1.3/include/linux/decompress/mm.h 2011-11-16 18:39:08.000000000 -0500
15708 +diff -urNp linux-3.1.4/include/linux/decompress/mm.h linux-3.1.4/include/linux/decompress/mm.h
15709 +--- linux-3.1.4/include/linux/decompress/mm.h 2011-11-11 15:19:27.000000000 -0500
15710 ++++ linux-3.1.4/include/linux/decompress/mm.h 2011-11-16 18:39:08.000000000 -0500
15711 @@ -77,7 +77,7 @@ static void free(void *where)
15712 * warnings when not needed (indeed large_malloc / large_free are not
15713 * needed by inflate */
15714 @@ -57920,9 +58787,9 @@ diff -urNp linux-3.1.3/include/linux/decompress/mm.h linux-3.1.3/include/linux/d
15715 #define free(a) kfree(a)
15716
15717 #define large_malloc(a) vmalloc(a)
15718 -diff -urNp linux-3.1.3/include/linux/dma-mapping.h linux-3.1.3/include/linux/dma-mapping.h
15719 ---- linux-3.1.3/include/linux/dma-mapping.h 2011-11-11 15:19:27.000000000 -0500
15720 -+++ linux-3.1.3/include/linux/dma-mapping.h 2011-11-16 18:39:08.000000000 -0500
15721 +diff -urNp linux-3.1.4/include/linux/dma-mapping.h linux-3.1.4/include/linux/dma-mapping.h
15722 +--- linux-3.1.4/include/linux/dma-mapping.h 2011-11-11 15:19:27.000000000 -0500
15723 ++++ linux-3.1.4/include/linux/dma-mapping.h 2011-11-16 18:39:08.000000000 -0500
15724 @@ -42,7 +42,7 @@ struct dma_map_ops {
15725 int (*dma_supported)(struct device *dev, u64 mask);
15726 int (*set_dma_mask)(struct device *dev, u64 mask);
15727 @@ -57932,9 +58799,9 @@ diff -urNp linux-3.1.3/include/linux/dma-mapping.h linux-3.1.3/include/linux/dma
15728
15729 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
15730
15731 -diff -urNp linux-3.1.3/include/linux/efi.h linux-3.1.3/include/linux/efi.h
15732 ---- linux-3.1.3/include/linux/efi.h 2011-11-11 15:19:27.000000000 -0500
15733 -+++ linux-3.1.3/include/linux/efi.h 2011-11-16 18:39:08.000000000 -0500
15734 +diff -urNp linux-3.1.4/include/linux/efi.h linux-3.1.4/include/linux/efi.h
15735 +--- linux-3.1.4/include/linux/efi.h 2011-11-11 15:19:27.000000000 -0500
15736 ++++ linux-3.1.4/include/linux/efi.h 2011-11-16 18:39:08.000000000 -0500
15737 @@ -446,7 +446,7 @@ struct efivar_operations {
15738 efi_get_variable_t *get_variable;
15739 efi_get_next_variable_t *get_next_variable;
15740 @@ -57944,9 +58811,9 @@ diff -urNp linux-3.1.3/include/linux/efi.h linux-3.1.3/include/linux/efi.h
15741
15742 struct efivars {
15743 /*
15744 -diff -urNp linux-3.1.3/include/linux/elf.h linux-3.1.3/include/linux/elf.h
15745 ---- linux-3.1.3/include/linux/elf.h 2011-11-11 15:19:27.000000000 -0500
15746 -+++ linux-3.1.3/include/linux/elf.h 2011-11-16 18:39:08.000000000 -0500
15747 +diff -urNp linux-3.1.4/include/linux/elf.h linux-3.1.4/include/linux/elf.h
15748 +--- linux-3.1.4/include/linux/elf.h 2011-11-11 15:19:27.000000000 -0500
15749 ++++ linux-3.1.4/include/linux/elf.h 2011-11-16 18:39:08.000000000 -0500
15750 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
15751 #define PT_GNU_EH_FRAME 0x6474e550
15752
15753 @@ -58019,9 +58886,9 @@ diff -urNp linux-3.1.3/include/linux/elf.h linux-3.1.3/include/linux/elf.h
15754
15755 #endif
15756
15757 -diff -urNp linux-3.1.3/include/linux/filter.h linux-3.1.3/include/linux/filter.h
15758 ---- linux-3.1.3/include/linux/filter.h 2011-11-11 15:19:27.000000000 -0500
15759 -+++ linux-3.1.3/include/linux/filter.h 2011-11-20 19:21:53.000000000 -0500
15760 +diff -urNp linux-3.1.4/include/linux/filter.h linux-3.1.4/include/linux/filter.h
15761 +--- linux-3.1.4/include/linux/filter.h 2011-11-11 15:19:27.000000000 -0500
15762 ++++ linux-3.1.4/include/linux/filter.h 2011-11-20 19:21:53.000000000 -0500
15763 @@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_A
15764
15765 struct sk_buff;
15766 @@ -58040,9 +58907,9 @@ diff -urNp linux-3.1.3/include/linux/filter.h linux-3.1.3/include/linux/filter.h
15767 struct rcu_head rcu;
15768 struct sock_filter insns[0];
15769 };
15770 -diff -urNp linux-3.1.3/include/linux/firewire.h linux-3.1.3/include/linux/firewire.h
15771 ---- linux-3.1.3/include/linux/firewire.h 2011-11-11 15:19:27.000000000 -0500
15772 -+++ linux-3.1.3/include/linux/firewire.h 2011-11-16 18:39:08.000000000 -0500
15773 +diff -urNp linux-3.1.4/include/linux/firewire.h linux-3.1.4/include/linux/firewire.h
15774 +--- linux-3.1.4/include/linux/firewire.h 2011-11-11 15:19:27.000000000 -0500
15775 ++++ linux-3.1.4/include/linux/firewire.h 2011-11-16 18:39:08.000000000 -0500
15776 @@ -428,7 +428,7 @@ struct fw_iso_context {
15777 union {
15778 fw_iso_callback_t sc;
15779 @@ -58052,9 +58919,9 @@ diff -urNp linux-3.1.3/include/linux/firewire.h linux-3.1.3/include/linux/firewi
15780 void *callback_data;
15781 };
15782
15783 -diff -urNp linux-3.1.3/include/linux/fscache-cache.h linux-3.1.3/include/linux/fscache-cache.h
15784 ---- linux-3.1.3/include/linux/fscache-cache.h 2011-11-11 15:19:27.000000000 -0500
15785 -+++ linux-3.1.3/include/linux/fscache-cache.h 2011-11-16 18:39:08.000000000 -0500
15786 +diff -urNp linux-3.1.4/include/linux/fscache-cache.h linux-3.1.4/include/linux/fscache-cache.h
15787 +--- linux-3.1.4/include/linux/fscache-cache.h 2011-11-11 15:19:27.000000000 -0500
15788 ++++ linux-3.1.4/include/linux/fscache-cache.h 2011-11-16 18:39:08.000000000 -0500
15789 @@ -102,7 +102,7 @@ struct fscache_operation {
15790 fscache_operation_release_t release;
15791 };
15792 @@ -58073,9 +58940,9 @@ diff -urNp linux-3.1.3/include/linux/fscache-cache.h linux-3.1.3/include/linux/f
15793 op->processor = processor;
15794 op->release = release;
15795 INIT_LIST_HEAD(&op->pend_link);
15796 -diff -urNp linux-3.1.3/include/linux/fs.h linux-3.1.3/include/linux/fs.h
15797 ---- linux-3.1.3/include/linux/fs.h 2011-11-11 15:19:27.000000000 -0500
15798 -+++ linux-3.1.3/include/linux/fs.h 2011-11-16 23:39:39.000000000 -0500
15799 +diff -urNp linux-3.1.4/include/linux/fs.h linux-3.1.4/include/linux/fs.h
15800 +--- linux-3.1.4/include/linux/fs.h 2011-11-11 15:19:27.000000000 -0500
15801 ++++ linux-3.1.4/include/linux/fs.h 2011-11-16 23:39:39.000000000 -0500
15802 @@ -1588,7 +1588,8 @@ struct file_operations {
15803 int (*setlease)(struct file *, long, struct file_lock **);
15804 long (*fallocate)(struct file *file, int mode, loff_t offset,
15805 @@ -58086,9 +58953,9 @@ diff -urNp linux-3.1.3/include/linux/fs.h linux-3.1.3/include/linux/fs.h
15806
15807 struct inode_operations {
15808 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
15809 -diff -urNp linux-3.1.3/include/linux/fsnotify.h linux-3.1.3/include/linux/fsnotify.h
15810 ---- linux-3.1.3/include/linux/fsnotify.h 2011-11-11 15:19:27.000000000 -0500
15811 -+++ linux-3.1.3/include/linux/fsnotify.h 2011-11-16 18:39:08.000000000 -0500
15812 +diff -urNp linux-3.1.4/include/linux/fsnotify.h linux-3.1.4/include/linux/fsnotify.h
15813 +--- linux-3.1.4/include/linux/fsnotify.h 2011-11-11 15:19:27.000000000 -0500
15814 ++++ linux-3.1.4/include/linux/fsnotify.h 2011-11-16 18:39:08.000000000 -0500
15815 @@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
15816 */
15817 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
15818 @@ -58098,9 +58965,9 @@ diff -urNp linux-3.1.3/include/linux/fsnotify.h linux-3.1.3/include/linux/fsnoti
15819 }
15820
15821 /*
15822 -diff -urNp linux-3.1.3/include/linux/fs_struct.h linux-3.1.3/include/linux/fs_struct.h
15823 ---- linux-3.1.3/include/linux/fs_struct.h 2011-11-11 15:19:27.000000000 -0500
15824 -+++ linux-3.1.3/include/linux/fs_struct.h 2011-11-16 18:39:08.000000000 -0500
15825 +diff -urNp linux-3.1.4/include/linux/fs_struct.h linux-3.1.4/include/linux/fs_struct.h
15826 +--- linux-3.1.4/include/linux/fs_struct.h 2011-11-11 15:19:27.000000000 -0500
15827 ++++ linux-3.1.4/include/linux/fs_struct.h 2011-11-16 18:39:08.000000000 -0500
15828 @@ -6,7 +6,7 @@
15829 #include <linux/seqlock.h>
15830
15831 @@ -58110,9 +58977,9 @@ diff -urNp linux-3.1.3/include/linux/fs_struct.h linux-3.1.3/include/linux/fs_st
15832 spinlock_t lock;
15833 seqcount_t seq;
15834 int umask;
15835 -diff -urNp linux-3.1.3/include/linux/ftrace_event.h linux-3.1.3/include/linux/ftrace_event.h
15836 ---- linux-3.1.3/include/linux/ftrace_event.h 2011-11-11 15:19:27.000000000 -0500
15837 -+++ linux-3.1.3/include/linux/ftrace_event.h 2011-11-16 18:39:08.000000000 -0500
15838 +diff -urNp linux-3.1.4/include/linux/ftrace_event.h linux-3.1.4/include/linux/ftrace_event.h
15839 +--- linux-3.1.4/include/linux/ftrace_event.h 2011-11-11 15:19:27.000000000 -0500
15840 ++++ linux-3.1.4/include/linux/ftrace_event.h 2011-11-16 18:39:08.000000000 -0500
15841 @@ -97,7 +97,7 @@ struct trace_event_functions {
15842 trace_print_func raw;
15843 trace_print_func hex;
15844 @@ -58131,9 +58998,9 @@ diff -urNp linux-3.1.3/include/linux/ftrace_event.h linux-3.1.3/include/linux/ft
15845
15846 int trace_set_clr_event(const char *system, const char *event, int set);
15847
15848 -diff -urNp linux-3.1.3/include/linux/genhd.h linux-3.1.3/include/linux/genhd.h
15849 ---- linux-3.1.3/include/linux/genhd.h 2011-11-11 15:19:27.000000000 -0500
15850 -+++ linux-3.1.3/include/linux/genhd.h 2011-11-16 18:39:08.000000000 -0500
15851 +diff -urNp linux-3.1.4/include/linux/genhd.h linux-3.1.4/include/linux/genhd.h
15852 +--- linux-3.1.4/include/linux/genhd.h 2011-11-11 15:19:27.000000000 -0500
15853 ++++ linux-3.1.4/include/linux/genhd.h 2011-11-16 18:39:08.000000000 -0500
15854 @@ -184,7 +184,7 @@ struct gendisk {
15855 struct kobject *slave_dir;
15856
15857 @@ -58143,9 +59010,9 @@ diff -urNp linux-3.1.3/include/linux/genhd.h linux-3.1.3/include/linux/genhd.h
15858 struct disk_events *ev;
15859 #ifdef CONFIG_BLK_DEV_INTEGRITY
15860 struct blk_integrity *integrity;
15861 -diff -urNp linux-3.1.3/include/linux/gracl.h linux-3.1.3/include/linux/gracl.h
15862 ---- linux-3.1.3/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
15863 -+++ linux-3.1.3/include/linux/gracl.h 2011-11-16 18:40:31.000000000 -0500
15864 +diff -urNp linux-3.1.4/include/linux/gracl.h linux-3.1.4/include/linux/gracl.h
15865 +--- linux-3.1.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
15866 ++++ linux-3.1.4/include/linux/gracl.h 2011-11-16 18:40:31.000000000 -0500
15867 @@ -0,0 +1,317 @@
15868 +#ifndef GR_ACL_H
15869 +#define GR_ACL_H
15870 @@ -58464,9 +59331,9 @@ diff -urNp linux-3.1.3/include/linux/gracl.h linux-3.1.3/include/linux/gracl.h
15871 +
15872 +#endif
15873 +
15874 -diff -urNp linux-3.1.3/include/linux/gralloc.h linux-3.1.3/include/linux/gralloc.h
15875 ---- linux-3.1.3/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
15876 -+++ linux-3.1.3/include/linux/gralloc.h 2011-11-16 18:40:31.000000000 -0500
15877 +diff -urNp linux-3.1.4/include/linux/gralloc.h linux-3.1.4/include/linux/gralloc.h
15878 +--- linux-3.1.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
15879 ++++ linux-3.1.4/include/linux/gralloc.h 2011-11-16 18:40:31.000000000 -0500
15880 @@ -0,0 +1,9 @@
15881 +#ifndef __GRALLOC_H
15882 +#define __GRALLOC_H
15883 @@ -58477,9 +59344,9 @@ diff -urNp linux-3.1.3/include/linux/gralloc.h linux-3.1.3/include/linux/gralloc
15884 +void *acl_alloc_num(unsigned long num, unsigned long len);
15885 +
15886 +#endif
15887 -diff -urNp linux-3.1.3/include/linux/grdefs.h linux-3.1.3/include/linux/grdefs.h
15888 ---- linux-3.1.3/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
15889 -+++ linux-3.1.3/include/linux/grdefs.h 2011-11-16 18:40:31.000000000 -0500
15890 +diff -urNp linux-3.1.4/include/linux/grdefs.h linux-3.1.4/include/linux/grdefs.h
15891 +--- linux-3.1.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
15892 ++++ linux-3.1.4/include/linux/grdefs.h 2011-11-16 18:40:31.000000000 -0500
15893 @@ -0,0 +1,140 @@
15894 +#ifndef GRDEFS_H
15895 +#define GRDEFS_H
15896 @@ -58621,9 +59488,9 @@ diff -urNp linux-3.1.3/include/linux/grdefs.h linux-3.1.3/include/linux/grdefs.h
15897 +};
15898 +
15899 +#endif
15900 -diff -urNp linux-3.1.3/include/linux/grinternal.h linux-3.1.3/include/linux/grinternal.h
15901 ---- linux-3.1.3/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
15902 -+++ linux-3.1.3/include/linux/grinternal.h 2011-11-16 18:40:31.000000000 -0500
15903 +diff -urNp linux-3.1.4/include/linux/grinternal.h linux-3.1.4/include/linux/grinternal.h
15904 +--- linux-3.1.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
15905 ++++ linux-3.1.4/include/linux/grinternal.h 2011-11-16 18:40:31.000000000 -0500
15906 @@ -0,0 +1,220 @@
15907 +#ifndef __GRINTERNAL_H
15908 +#define __GRINTERNAL_H
15909 @@ -58845,9 +59712,9 @@ diff -urNp linux-3.1.3/include/linux/grinternal.h linux-3.1.3/include/linux/grin
15910 +#endif
15911 +
15912 +#endif
15913 -diff -urNp linux-3.1.3/include/linux/grmsg.h linux-3.1.3/include/linux/grmsg.h
15914 ---- linux-3.1.3/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
15915 -+++ linux-3.1.3/include/linux/grmsg.h 2011-11-16 18:40:31.000000000 -0500
15916 +diff -urNp linux-3.1.4/include/linux/grmsg.h linux-3.1.4/include/linux/grmsg.h
15917 +--- linux-3.1.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
15918 ++++ linux-3.1.4/include/linux/grmsg.h 2011-11-16 18:40:31.000000000 -0500
15919 @@ -0,0 +1,108 @@
15920 +#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"
15921 +#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"
15922 @@ -58957,9 +59824,9 @@ diff -urNp linux-3.1.3/include/linux/grmsg.h linux-3.1.3/include/linux/grmsg.h
15923 +#define GR_VM86_MSG "denied use of vm86 by "
15924 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
15925 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
15926 -diff -urNp linux-3.1.3/include/linux/grsecurity.h linux-3.1.3/include/linux/grsecurity.h
15927 ---- linux-3.1.3/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
15928 -+++ linux-3.1.3/include/linux/grsecurity.h 2011-11-17 00:16:10.000000000 -0500
15929 +diff -urNp linux-3.1.4/include/linux/grsecurity.h linux-3.1.4/include/linux/grsecurity.h
15930 +--- linux-3.1.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
15931 ++++ linux-3.1.4/include/linux/grsecurity.h 2011-11-17 00:16:10.000000000 -0500
15932 @@ -0,0 +1,228 @@
15933 +#ifndef GR_SECURITY_H
15934 +#define GR_SECURITY_H
15935 @@ -59189,9 +60056,9 @@ diff -urNp linux-3.1.3/include/linux/grsecurity.h linux-3.1.3/include/linux/grse
15936 +#endif
15937 +
15938 +#endif
15939 -diff -urNp linux-3.1.3/include/linux/grsock.h linux-3.1.3/include/linux/grsock.h
15940 ---- linux-3.1.3/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
15941 -+++ linux-3.1.3/include/linux/grsock.h 2011-11-16 18:40:31.000000000 -0500
15942 +diff -urNp linux-3.1.4/include/linux/grsock.h linux-3.1.4/include/linux/grsock.h
15943 +--- linux-3.1.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
15944 ++++ linux-3.1.4/include/linux/grsock.h 2011-11-16 18:40:31.000000000 -0500
15945 @@ -0,0 +1,19 @@
15946 +#ifndef __GRSOCK_H
15947 +#define __GRSOCK_H
15948 @@ -59212,9 +60079,9 @@ diff -urNp linux-3.1.3/include/linux/grsock.h linux-3.1.3/include/linux/grsock.h
15949 + const int protocol);
15950 +
15951 +#endif
15952 -diff -urNp linux-3.1.3/include/linux/hid.h linux-3.1.3/include/linux/hid.h
15953 ---- linux-3.1.3/include/linux/hid.h 2011-11-11 15:19:27.000000000 -0500
15954 -+++ linux-3.1.3/include/linux/hid.h 2011-11-16 18:39:08.000000000 -0500
15955 +diff -urNp linux-3.1.4/include/linux/hid.h linux-3.1.4/include/linux/hid.h
15956 +--- linux-3.1.4/include/linux/hid.h 2011-11-11 15:19:27.000000000 -0500
15957 ++++ linux-3.1.4/include/linux/hid.h 2011-11-16 18:39:08.000000000 -0500
15958 @@ -676,7 +676,7 @@ struct hid_ll_driver {
15959 unsigned int code, int value);
15960
15961 @@ -59224,9 +60091,9 @@ diff -urNp linux-3.1.3/include/linux/hid.h linux-3.1.3/include/linux/hid.h
15962
15963 #define PM_HINT_FULLON 1<<5
15964 #define PM_HINT_NORMAL 1<<1
15965 -diff -urNp linux-3.1.3/include/linux/highmem.h linux-3.1.3/include/linux/highmem.h
15966 ---- linux-3.1.3/include/linux/highmem.h 2011-11-11 15:19:27.000000000 -0500
15967 -+++ linux-3.1.3/include/linux/highmem.h 2011-11-16 18:39:08.000000000 -0500
15968 +diff -urNp linux-3.1.4/include/linux/highmem.h linux-3.1.4/include/linux/highmem.h
15969 +--- linux-3.1.4/include/linux/highmem.h 2011-11-11 15:19:27.000000000 -0500
15970 ++++ linux-3.1.4/include/linux/highmem.h 2011-11-16 18:39:08.000000000 -0500
15971 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct
15972 kunmap_atomic(kaddr, KM_USER0);
15973 }
15974 @@ -59246,9 +60113,9 @@ diff -urNp linux-3.1.3/include/linux/highmem.h linux-3.1.3/include/linux/highmem
15975 static inline void zero_user_segments(struct page *page,
15976 unsigned start1, unsigned end1,
15977 unsigned start2, unsigned end2)
15978 -diff -urNp linux-3.1.3/include/linux/i2c.h linux-3.1.3/include/linux/i2c.h
15979 ---- linux-3.1.3/include/linux/i2c.h 2011-11-11 15:19:27.000000000 -0500
15980 -+++ linux-3.1.3/include/linux/i2c.h 2011-11-16 18:39:08.000000000 -0500
15981 +diff -urNp linux-3.1.4/include/linux/i2c.h linux-3.1.4/include/linux/i2c.h
15982 +--- linux-3.1.4/include/linux/i2c.h 2011-11-11 15:19:27.000000000 -0500
15983 ++++ linux-3.1.4/include/linux/i2c.h 2011-11-16 18:39:08.000000000 -0500
15984 @@ -346,6 +346,7 @@ struct i2c_algorithm {
15985 /* To determine what the adapter supports */
15986 u32 (*functionality) (struct i2c_adapter *);
15987 @@ -59257,9 +60124,9 @@ diff -urNp linux-3.1.3/include/linux/i2c.h linux-3.1.3/include/linux/i2c.h
15988
15989 /*
15990 * i2c_adapter is the structure used to identify a physical i2c bus along
15991 -diff -urNp linux-3.1.3/include/linux/i2o.h linux-3.1.3/include/linux/i2o.h
15992 ---- linux-3.1.3/include/linux/i2o.h 2011-11-11 15:19:27.000000000 -0500
15993 -+++ linux-3.1.3/include/linux/i2o.h 2011-11-16 18:39:08.000000000 -0500
15994 +diff -urNp linux-3.1.4/include/linux/i2o.h linux-3.1.4/include/linux/i2o.h
15995 +--- linux-3.1.4/include/linux/i2o.h 2011-11-11 15:19:27.000000000 -0500
15996 ++++ linux-3.1.4/include/linux/i2o.h 2011-11-16 18:39:08.000000000 -0500
15997 @@ -564,7 +564,7 @@ struct i2o_controller {
15998 struct i2o_device *exec; /* Executive */
15999 #if BITS_PER_LONG == 64
16000 @@ -59269,9 +60136,9 @@ diff -urNp linux-3.1.3/include/linux/i2o.h linux-3.1.3/include/linux/i2o.h
16001 struct list_head context_list; /* list of context id's
16002 and pointers */
16003 #endif
16004 -diff -urNp linux-3.1.3/include/linux/init.h linux-3.1.3/include/linux/init.h
16005 ---- linux-3.1.3/include/linux/init.h 2011-11-11 15:19:27.000000000 -0500
16006 -+++ linux-3.1.3/include/linux/init.h 2011-11-16 18:39:08.000000000 -0500
16007 +diff -urNp linux-3.1.4/include/linux/init.h linux-3.1.4/include/linux/init.h
16008 +--- linux-3.1.4/include/linux/init.h 2011-11-11 15:19:27.000000000 -0500
16009 ++++ linux-3.1.4/include/linux/init.h 2011-11-16 18:39:08.000000000 -0500
16010 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
16011
16012 /* Each module must use one module_init(). */
16013 @@ -59288,9 +60155,9 @@ diff -urNp linux-3.1.3/include/linux/init.h linux-3.1.3/include/linux/init.h
16014 { return exitfn; } \
16015 void cleanup_module(void) __attribute__((alias(#exitfn)));
16016
16017 -diff -urNp linux-3.1.3/include/linux/init_task.h linux-3.1.3/include/linux/init_task.h
16018 ---- linux-3.1.3/include/linux/init_task.h 2011-11-11 15:19:27.000000000 -0500
16019 -+++ linux-3.1.3/include/linux/init_task.h 2011-11-16 18:39:08.000000000 -0500
16020 +diff -urNp linux-3.1.4/include/linux/init_task.h linux-3.1.4/include/linux/init_task.h
16021 +--- linux-3.1.4/include/linux/init_task.h 2011-11-11 15:19:27.000000000 -0500
16022 ++++ linux-3.1.4/include/linux/init_task.h 2011-11-16 18:39:08.000000000 -0500
16023 @@ -126,6 +126,12 @@ extern struct cred init_cred;
16024 # define INIT_PERF_EVENTS(tsk)
16025 #endif
16026 @@ -59312,9 +60179,9 @@ diff -urNp linux-3.1.3/include/linux/init_task.h linux-3.1.3/include/linux/init_
16027 .fs = &init_fs, \
16028 .files = &init_files, \
16029 .signal = &init_signals, \
16030 -diff -urNp linux-3.1.3/include/linux/intel-iommu.h linux-3.1.3/include/linux/intel-iommu.h
16031 ---- linux-3.1.3/include/linux/intel-iommu.h 2011-11-11 15:19:27.000000000 -0500
16032 -+++ linux-3.1.3/include/linux/intel-iommu.h 2011-11-16 18:39:08.000000000 -0500
16033 +diff -urNp linux-3.1.4/include/linux/intel-iommu.h linux-3.1.4/include/linux/intel-iommu.h
16034 +--- linux-3.1.4/include/linux/intel-iommu.h 2011-11-11 15:19:27.000000000 -0500
16035 ++++ linux-3.1.4/include/linux/intel-iommu.h 2011-11-16 18:39:08.000000000 -0500
16036 @@ -296,7 +296,7 @@ struct iommu_flush {
16037 u8 fm, u64 type);
16038 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
16039 @@ -59324,9 +60191,9 @@ diff -urNp linux-3.1.3/include/linux/intel-iommu.h linux-3.1.3/include/linux/int
16040
16041 enum {
16042 SR_DMAR_FECTL_REG,
16043 -diff -urNp linux-3.1.3/include/linux/interrupt.h linux-3.1.3/include/linux/interrupt.h
16044 ---- linux-3.1.3/include/linux/interrupt.h 2011-11-11 15:19:27.000000000 -0500
16045 -+++ linux-3.1.3/include/linux/interrupt.h 2011-11-16 18:39:08.000000000 -0500
16046 +diff -urNp linux-3.1.4/include/linux/interrupt.h linux-3.1.4/include/linux/interrupt.h
16047 +--- linux-3.1.4/include/linux/interrupt.h 2011-11-11 15:19:27.000000000 -0500
16048 ++++ linux-3.1.4/include/linux/interrupt.h 2011-11-16 18:39:08.000000000 -0500
16049 @@ -425,7 +425,7 @@ enum
16050 /* map softirq index to softirq name. update 'softirq_to_name' in
16051 * kernel/softirq.c when adding a new softirq.
16052 @@ -59351,9 +60218,9 @@ diff -urNp linux-3.1.3/include/linux/interrupt.h linux-3.1.3/include/linux/inter
16053 extern void softirq_init(void);
16054 static inline void __raise_softirq_irqoff(unsigned int nr)
16055 {
16056 -diff -urNp linux-3.1.3/include/linux/kallsyms.h linux-3.1.3/include/linux/kallsyms.h
16057 ---- linux-3.1.3/include/linux/kallsyms.h 2011-11-11 15:19:27.000000000 -0500
16058 -+++ linux-3.1.3/include/linux/kallsyms.h 2011-11-16 18:40:31.000000000 -0500
16059 +diff -urNp linux-3.1.4/include/linux/kallsyms.h linux-3.1.4/include/linux/kallsyms.h
16060 +--- linux-3.1.4/include/linux/kallsyms.h 2011-11-11 15:19:27.000000000 -0500
16061 ++++ linux-3.1.4/include/linux/kallsyms.h 2011-11-16 18:40:31.000000000 -0500
16062 @@ -15,7 +15,8 @@
16063
16064 struct module;
16065 @@ -59381,9 +60248,9 @@ diff -urNp linux-3.1.3/include/linux/kallsyms.h linux-3.1.3/include/linux/kallsy
16066
16067 /* This macro allows us to keep printk typechecking */
16068 static void __check_printsym_format(const char *fmt, ...)
16069 -diff -urNp linux-3.1.3/include/linux/kgdb.h linux-3.1.3/include/linux/kgdb.h
16070 ---- linux-3.1.3/include/linux/kgdb.h 2011-11-11 15:19:27.000000000 -0500
16071 -+++ linux-3.1.3/include/linux/kgdb.h 2011-11-16 18:39:08.000000000 -0500
16072 +diff -urNp linux-3.1.4/include/linux/kgdb.h linux-3.1.4/include/linux/kgdb.h
16073 +--- linux-3.1.4/include/linux/kgdb.h 2011-11-11 15:19:27.000000000 -0500
16074 ++++ linux-3.1.4/include/linux/kgdb.h 2011-11-16 18:39:08.000000000 -0500
16075 @@ -53,7 +53,7 @@ extern int kgdb_connected;
16076 extern int kgdb_io_module_registered;
16077
16078 @@ -59411,9 +60278,9 @@ diff -urNp linux-3.1.3/include/linux/kgdb.h linux-3.1.3/include/linux/kgdb.h
16079
16080 extern struct kgdb_arch arch_kgdb_ops;
16081
16082 -diff -urNp linux-3.1.3/include/linux/kmod.h linux-3.1.3/include/linux/kmod.h
16083 ---- linux-3.1.3/include/linux/kmod.h 2011-11-11 15:19:27.000000000 -0500
16084 -+++ linux-3.1.3/include/linux/kmod.h 2011-11-16 18:40:31.000000000 -0500
16085 +diff -urNp linux-3.1.4/include/linux/kmod.h linux-3.1.4/include/linux/kmod.h
16086 +--- linux-3.1.4/include/linux/kmod.h 2011-11-11 15:19:27.000000000 -0500
16087 ++++ linux-3.1.4/include/linux/kmod.h 2011-11-16 18:40:31.000000000 -0500
16088 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
16089 * usually useless though. */
16090 extern int __request_module(bool wait, const char *name, ...) \
16091 @@ -59423,9 +60290,9 @@ diff -urNp linux-3.1.3/include/linux/kmod.h linux-3.1.3/include/linux/kmod.h
16092 #define request_module(mod...) __request_module(true, mod)
16093 #define request_module_nowait(mod...) __request_module(false, mod)
16094 #define try_then_request_module(x, mod...) \
16095 -diff -urNp linux-3.1.3/include/linux/kvm_host.h linux-3.1.3/include/linux/kvm_host.h
16096 ---- linux-3.1.3/include/linux/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
16097 -+++ linux-3.1.3/include/linux/kvm_host.h 2011-11-16 18:39:08.000000000 -0500
16098 +diff -urNp linux-3.1.4/include/linux/kvm_host.h linux-3.1.4/include/linux/kvm_host.h
16099 +--- linux-3.1.4/include/linux/kvm_host.h 2011-11-11 15:19:27.000000000 -0500
16100 ++++ linux-3.1.4/include/linux/kvm_host.h 2011-11-16 18:39:08.000000000 -0500
16101 @@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
16102 void vcpu_load(struct kvm_vcpu *vcpu);
16103 void vcpu_put(struct kvm_vcpu *vcpu);
16104 @@ -59444,9 +60311,9 @@ diff -urNp linux-3.1.3/include/linux/kvm_host.h linux-3.1.3/include/linux/kvm_ho
16105 void kvm_arch_exit(void);
16106
16107 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
16108 -diff -urNp linux-3.1.3/include/linux/libata.h linux-3.1.3/include/linux/libata.h
16109 ---- linux-3.1.3/include/linux/libata.h 2011-11-11 15:19:27.000000000 -0500
16110 -+++ linux-3.1.3/include/linux/libata.h 2011-11-16 18:39:08.000000000 -0500
16111 +diff -urNp linux-3.1.4/include/linux/libata.h linux-3.1.4/include/linux/libata.h
16112 +--- linux-3.1.4/include/linux/libata.h 2011-11-11 15:19:27.000000000 -0500
16113 ++++ linux-3.1.4/include/linux/libata.h 2011-11-16 18:39:08.000000000 -0500
16114 @@ -909,7 +909,7 @@ struct ata_port_operations {
16115 * fields must be pointers.
16116 */
16117 @@ -59456,9 +60323,9 @@ diff -urNp linux-3.1.3/include/linux/libata.h linux-3.1.3/include/linux/libata.h
16118
16119 struct ata_port_info {
16120 unsigned long flags;
16121 -diff -urNp linux-3.1.3/include/linux/mca.h linux-3.1.3/include/linux/mca.h
16122 ---- linux-3.1.3/include/linux/mca.h 2011-11-11 15:19:27.000000000 -0500
16123 -+++ linux-3.1.3/include/linux/mca.h 2011-11-16 18:39:08.000000000 -0500
16124 +diff -urNp linux-3.1.4/include/linux/mca.h linux-3.1.4/include/linux/mca.h
16125 +--- linux-3.1.4/include/linux/mca.h 2011-11-11 15:19:27.000000000 -0500
16126 ++++ linux-3.1.4/include/linux/mca.h 2011-11-16 18:39:08.000000000 -0500
16127 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
16128 int region);
16129 void * (*mca_transform_memory)(struct mca_device *,
16130 @@ -59468,9 +60335,9 @@ diff -urNp linux-3.1.3/include/linux/mca.h linux-3.1.3/include/linux/mca.h
16131
16132 struct mca_bus {
16133 u64 default_dma_mask;
16134 -diff -urNp linux-3.1.3/include/linux/memory.h linux-3.1.3/include/linux/memory.h
16135 ---- linux-3.1.3/include/linux/memory.h 2011-11-11 15:19:27.000000000 -0500
16136 -+++ linux-3.1.3/include/linux/memory.h 2011-11-16 18:39:08.000000000 -0500
16137 +diff -urNp linux-3.1.4/include/linux/memory.h linux-3.1.4/include/linux/memory.h
16138 +--- linux-3.1.4/include/linux/memory.h 2011-11-11 15:19:27.000000000 -0500
16139 ++++ linux-3.1.4/include/linux/memory.h 2011-11-16 18:39:08.000000000 -0500
16140 @@ -144,7 +144,7 @@ struct memory_accessor {
16141 size_t count);
16142 ssize_t (*write)(struct memory_accessor *, const char *buf,
16143 @@ -59480,9 +60347,9 @@ diff -urNp linux-3.1.3/include/linux/memory.h linux-3.1.3/include/linux/memory.h
16144
16145 /*
16146 * Kernel text modification mutex, used for code patching. Users of this lock
16147 -diff -urNp linux-3.1.3/include/linux/mfd/abx500.h linux-3.1.3/include/linux/mfd/abx500.h
16148 ---- linux-3.1.3/include/linux/mfd/abx500.h 2011-11-11 15:19:27.000000000 -0500
16149 -+++ linux-3.1.3/include/linux/mfd/abx500.h 2011-11-16 18:39:08.000000000 -0500
16150 +diff -urNp linux-3.1.4/include/linux/mfd/abx500.h linux-3.1.4/include/linux/mfd/abx500.h
16151 +--- linux-3.1.4/include/linux/mfd/abx500.h 2011-11-11 15:19:27.000000000 -0500
16152 ++++ linux-3.1.4/include/linux/mfd/abx500.h 2011-11-16 18:39:08.000000000 -0500
16153 @@ -234,6 +234,7 @@ struct abx500_ops {
16154 int (*event_registers_startup_state_get) (struct device *, u8 *);
16155 int (*startup_irq_enabled) (struct device *, unsigned int);
16156 @@ -59491,9 +60358,9 @@ diff -urNp linux-3.1.3/include/linux/mfd/abx500.h linux-3.1.3/include/linux/mfd/
16157
16158 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
16159 void abx500_remove_ops(struct device *dev);
16160 -diff -urNp linux-3.1.3/include/linux/mm.h linux-3.1.3/include/linux/mm.h
16161 ---- linux-3.1.3/include/linux/mm.h 2011-11-11 15:19:27.000000000 -0500
16162 -+++ linux-3.1.3/include/linux/mm.h 2011-11-16 18:39:08.000000000 -0500
16163 +diff -urNp linux-3.1.4/include/linux/mm.h linux-3.1.4/include/linux/mm.h
16164 +--- linux-3.1.4/include/linux/mm.h 2011-11-11 15:19:27.000000000 -0500
16165 ++++ linux-3.1.4/include/linux/mm.h 2011-11-16 18:39:08.000000000 -0500
16166 @@ -114,7 +114,14 @@ extern unsigned int kobjsize(const void
16167
16168 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
16169 @@ -59616,9 +60483,9 @@ diff -urNp linux-3.1.3/include/linux/mm.h linux-3.1.3/include/linux/mm.h
16170 +
16171 #endif /* __KERNEL__ */
16172 #endif /* _LINUX_MM_H */
16173 -diff -urNp linux-3.1.3/include/linux/mm_types.h linux-3.1.3/include/linux/mm_types.h
16174 ---- linux-3.1.3/include/linux/mm_types.h 2011-11-11 15:19:27.000000000 -0500
16175 -+++ linux-3.1.3/include/linux/mm_types.h 2011-11-16 18:39:08.000000000 -0500
16176 +diff -urNp linux-3.1.4/include/linux/mm_types.h linux-3.1.4/include/linux/mm_types.h
16177 +--- linux-3.1.4/include/linux/mm_types.h 2011-11-11 15:19:27.000000000 -0500
16178 ++++ linux-3.1.4/include/linux/mm_types.h 2011-11-16 18:39:08.000000000 -0500
16179 @@ -230,6 +230,8 @@ struct vm_area_struct {
16180 #ifdef CONFIG_NUMA
16181 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
16182 @@ -59653,9 +60520,9 @@ diff -urNp linux-3.1.3/include/linux/mm_types.h linux-3.1.3/include/linux/mm_typ
16183 };
16184
16185 static inline void mm_init_cpumask(struct mm_struct *mm)
16186 -diff -urNp linux-3.1.3/include/linux/mmu_notifier.h linux-3.1.3/include/linux/mmu_notifier.h
16187 ---- linux-3.1.3/include/linux/mmu_notifier.h 2011-11-11 15:19:27.000000000 -0500
16188 -+++ linux-3.1.3/include/linux/mmu_notifier.h 2011-11-16 18:39:08.000000000 -0500
16189 +diff -urNp linux-3.1.4/include/linux/mmu_notifier.h linux-3.1.4/include/linux/mmu_notifier.h
16190 +--- linux-3.1.4/include/linux/mmu_notifier.h 2011-11-11 15:19:27.000000000 -0500
16191 ++++ linux-3.1.4/include/linux/mmu_notifier.h 2011-11-16 18:39:08.000000000 -0500
16192 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
16193 */
16194 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
16195 @@ -59672,9 +60539,9 @@ diff -urNp linux-3.1.3/include/linux/mmu_notifier.h linux-3.1.3/include/linux/mm
16196 })
16197
16198 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
16199 -diff -urNp linux-3.1.3/include/linux/mmzone.h linux-3.1.3/include/linux/mmzone.h
16200 ---- linux-3.1.3/include/linux/mmzone.h 2011-11-11 15:19:27.000000000 -0500
16201 -+++ linux-3.1.3/include/linux/mmzone.h 2011-11-16 18:39:08.000000000 -0500
16202 +diff -urNp linux-3.1.4/include/linux/mmzone.h linux-3.1.4/include/linux/mmzone.h
16203 +--- linux-3.1.4/include/linux/mmzone.h 2011-11-11 15:19:27.000000000 -0500
16204 ++++ linux-3.1.4/include/linux/mmzone.h 2011-11-16 18:39:08.000000000 -0500
16205 @@ -356,7 +356,7 @@ struct zone {
16206 unsigned long flags; /* zone flags, see below */
16207
16208 @@ -59684,9 +60551,9 @@ diff -urNp linux-3.1.3/include/linux/mmzone.h linux-3.1.3/include/linux/mmzone.h
16209
16210 /*
16211 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
16212 -diff -urNp linux-3.1.3/include/linux/mod_devicetable.h linux-3.1.3/include/linux/mod_devicetable.h
16213 ---- linux-3.1.3/include/linux/mod_devicetable.h 2011-11-11 15:19:27.000000000 -0500
16214 -+++ linux-3.1.3/include/linux/mod_devicetable.h 2011-11-16 18:39:08.000000000 -0500
16215 +diff -urNp linux-3.1.4/include/linux/mod_devicetable.h linux-3.1.4/include/linux/mod_devicetable.h
16216 +--- linux-3.1.4/include/linux/mod_devicetable.h 2011-11-11 15:19:27.000000000 -0500
16217 ++++ linux-3.1.4/include/linux/mod_devicetable.h 2011-11-16 18:39:08.000000000 -0500
16218 @@ -12,7 +12,7 @@
16219 typedef unsigned long kernel_ulong_t;
16220 #endif
16221 @@ -59705,9 +60572,9 @@ diff -urNp linux-3.1.3/include/linux/mod_devicetable.h linux-3.1.3/include/linux
16222
16223 struct hid_device_id {
16224 __u16 bus;
16225 -diff -urNp linux-3.1.3/include/linux/module.h linux-3.1.3/include/linux/module.h
16226 ---- linux-3.1.3/include/linux/module.h 2011-11-11 15:19:27.000000000 -0500
16227 -+++ linux-3.1.3/include/linux/module.h 2011-11-16 18:39:08.000000000 -0500
16228 +diff -urNp linux-3.1.4/include/linux/module.h linux-3.1.4/include/linux/module.h
16229 +--- linux-3.1.4/include/linux/module.h 2011-11-11 15:19:27.000000000 -0500
16230 ++++ linux-3.1.4/include/linux/module.h 2011-11-16 18:39:08.000000000 -0500
16231 @@ -16,6 +16,7 @@
16232 #include <linux/kobject.h>
16233 #include <linux/moduleparam.h>
16234 @@ -59802,9 +60669,9 @@ diff -urNp linux-3.1.3/include/linux/module.h linux-3.1.3/include/linux/module.h
16235 }
16236
16237 /* Search for module by name: must hold module_mutex. */
16238 -diff -urNp linux-3.1.3/include/linux/moduleloader.h linux-3.1.3/include/linux/moduleloader.h
16239 ---- linux-3.1.3/include/linux/moduleloader.h 2011-11-11 15:19:27.000000000 -0500
16240 -+++ linux-3.1.3/include/linux/moduleloader.h 2011-11-16 18:39:08.000000000 -0500
16241 +diff -urNp linux-3.1.4/include/linux/moduleloader.h linux-3.1.4/include/linux/moduleloader.h
16242 +--- linux-3.1.4/include/linux/moduleloader.h 2011-11-11 15:19:27.000000000 -0500
16243 ++++ linux-3.1.4/include/linux/moduleloader.h 2011-11-16 18:39:08.000000000 -0500
16244 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(st
16245 sections. Returns NULL on failure. */
16246 void *module_alloc(unsigned long size);
16247 @@ -59827,9 +60694,9 @@ diff -urNp linux-3.1.3/include/linux/moduleloader.h linux-3.1.3/include/linux/mo
16248 /* Apply the given relocation to the (simplified) ELF. Return -error
16249 or 0. */
16250 int apply_relocate(Elf_Shdr *sechdrs,
16251 -diff -urNp linux-3.1.3/include/linux/moduleparam.h linux-3.1.3/include/linux/moduleparam.h
16252 ---- linux-3.1.3/include/linux/moduleparam.h 2011-11-11 15:19:27.000000000 -0500
16253 -+++ linux-3.1.3/include/linux/moduleparam.h 2011-11-16 18:39:08.000000000 -0500
16254 +diff -urNp linux-3.1.4/include/linux/moduleparam.h linux-3.1.4/include/linux/moduleparam.h
16255 +--- linux-3.1.4/include/linux/moduleparam.h 2011-11-11 15:19:27.000000000 -0500
16256 ++++ linux-3.1.4/include/linux/moduleparam.h 2011-11-16 18:39:08.000000000 -0500
16257 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
16258 * @len is usually just sizeof(string).
16259 */
16260 @@ -59848,9 +60715,9 @@ diff -urNp linux-3.1.3/include/linux/moduleparam.h linux-3.1.3/include/linux/mod
16261 = { .max = ARRAY_SIZE(array), .num = nump, \
16262 .ops = &param_ops_##type, \
16263 .elemsize = sizeof(array[0]), .elem = array }; \
16264 -diff -urNp linux-3.1.3/include/linux/namei.h linux-3.1.3/include/linux/namei.h
16265 ---- linux-3.1.3/include/linux/namei.h 2011-11-11 15:19:27.000000000 -0500
16266 -+++ linux-3.1.3/include/linux/namei.h 2011-11-16 18:39:08.000000000 -0500
16267 +diff -urNp linux-3.1.4/include/linux/namei.h linux-3.1.4/include/linux/namei.h
16268 +--- linux-3.1.4/include/linux/namei.h 2011-11-11 15:19:27.000000000 -0500
16269 ++++ linux-3.1.4/include/linux/namei.h 2011-11-16 18:39:08.000000000 -0500
16270 @@ -24,7 +24,7 @@ struct nameidata {
16271 unsigned seq;
16272 int last_type;
16273 @@ -59875,9 +60742,9 @@ diff -urNp linux-3.1.3/include/linux/namei.h linux-3.1.3/include/linux/namei.h
16274 {
16275 return nd->saved_names[nd->depth];
16276 }
16277 -diff -urNp linux-3.1.3/include/linux/netdevice.h linux-3.1.3/include/linux/netdevice.h
16278 ---- linux-3.1.3/include/linux/netdevice.h 2011-11-11 15:19:27.000000000 -0500
16279 -+++ linux-3.1.3/include/linux/netdevice.h 2011-11-16 18:39:08.000000000 -0500
16280 +diff -urNp linux-3.1.4/include/linux/netdevice.h linux-3.1.4/include/linux/netdevice.h
16281 +--- linux-3.1.4/include/linux/netdevice.h 2011-11-11 15:19:27.000000000 -0500
16282 ++++ linux-3.1.4/include/linux/netdevice.h 2011-11-16 18:39:08.000000000 -0500
16283 @@ -944,6 +944,7 @@ struct net_device_ops {
16284 int (*ndo_set_features)(struct net_device *dev,
16285 u32 features);
16286 @@ -59886,9 +60753,9 @@ diff -urNp linux-3.1.3/include/linux/netdevice.h linux-3.1.3/include/linux/netde
16287
16288 /*
16289 * The DEVICE structure.
16290 -diff -urNp linux-3.1.3/include/linux/netfilter/xt_gradm.h linux-3.1.3/include/linux/netfilter/xt_gradm.h
16291 ---- linux-3.1.3/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
16292 -+++ linux-3.1.3/include/linux/netfilter/xt_gradm.h 2011-11-16 18:40:31.000000000 -0500
16293 +diff -urNp linux-3.1.4/include/linux/netfilter/xt_gradm.h linux-3.1.4/include/linux/netfilter/xt_gradm.h
16294 +--- linux-3.1.4/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
16295 ++++ linux-3.1.4/include/linux/netfilter/xt_gradm.h 2011-11-16 18:40:31.000000000 -0500
16296 @@ -0,0 +1,9 @@
16297 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
16298 +#define _LINUX_NETFILTER_XT_GRADM_H 1
16299 @@ -59899,9 +60766,9 @@ diff -urNp linux-3.1.3/include/linux/netfilter/xt_gradm.h linux-3.1.3/include/li
16300 +};
16301 +
16302 +#endif
16303 -diff -urNp linux-3.1.3/include/linux/of_pdt.h linux-3.1.3/include/linux/of_pdt.h
16304 ---- linux-3.1.3/include/linux/of_pdt.h 2011-11-11 15:19:27.000000000 -0500
16305 -+++ linux-3.1.3/include/linux/of_pdt.h 2011-11-16 18:39:08.000000000 -0500
16306 +diff -urNp linux-3.1.4/include/linux/of_pdt.h linux-3.1.4/include/linux/of_pdt.h
16307 +--- linux-3.1.4/include/linux/of_pdt.h 2011-11-11 15:19:27.000000000 -0500
16308 ++++ linux-3.1.4/include/linux/of_pdt.h 2011-11-16 18:39:08.000000000 -0500
16309 @@ -32,7 +32,7 @@ struct of_pdt_ops {
16310
16311 /* return 0 on success; fill in 'len' with number of bytes in path */
16312 @@ -59911,9 +60778,9 @@ diff -urNp linux-3.1.3/include/linux/of_pdt.h linux-3.1.3/include/linux/of_pdt.h
16313
16314 extern void *prom_early_alloc(unsigned long size);
16315
16316 -diff -urNp linux-3.1.3/include/linux/oprofile.h linux-3.1.3/include/linux/oprofile.h
16317 ---- linux-3.1.3/include/linux/oprofile.h 2011-11-11 15:19:27.000000000 -0500
16318 -+++ linux-3.1.3/include/linux/oprofile.h 2011-11-16 18:39:08.000000000 -0500
16319 +diff -urNp linux-3.1.4/include/linux/oprofile.h linux-3.1.4/include/linux/oprofile.h
16320 +--- linux-3.1.4/include/linux/oprofile.h 2011-11-11 15:19:27.000000000 -0500
16321 ++++ linux-3.1.4/include/linux/oprofile.h 2011-11-16 18:39:08.000000000 -0500
16322 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super
16323 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
16324 char const * name, ulong * val);
16325 @@ -59926,9 +60793,9 @@ diff -urNp linux-3.1.3/include/linux/oprofile.h linux-3.1.3/include/linux/oprofi
16326
16327 /** create a directory */
16328 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
16329 -diff -urNp linux-3.1.3/include/linux/padata.h linux-3.1.3/include/linux/padata.h
16330 ---- linux-3.1.3/include/linux/padata.h 2011-11-11 15:19:27.000000000 -0500
16331 -+++ linux-3.1.3/include/linux/padata.h 2011-11-16 18:39:08.000000000 -0500
16332 +diff -urNp linux-3.1.4/include/linux/padata.h linux-3.1.4/include/linux/padata.h
16333 +--- linux-3.1.4/include/linux/padata.h 2011-11-11 15:19:27.000000000 -0500
16334 ++++ linux-3.1.4/include/linux/padata.h 2011-11-16 18:39:08.000000000 -0500
16335 @@ -129,7 +129,7 @@ struct parallel_data {
16336 struct padata_instance *pinst;
16337 struct padata_parallel_queue __percpu *pqueue;
16338 @@ -59938,9 +60805,9 @@ diff -urNp linux-3.1.3/include/linux/padata.h linux-3.1.3/include/linux/padata.h
16339 atomic_t reorder_objects;
16340 atomic_t refcnt;
16341 unsigned int max_seq_nr;
16342 -diff -urNp linux-3.1.3/include/linux/perf_event.h linux-3.1.3/include/linux/perf_event.h
16343 ---- linux-3.1.3/include/linux/perf_event.h 2011-11-11 15:19:27.000000000 -0500
16344 -+++ linux-3.1.3/include/linux/perf_event.h 2011-11-16 18:39:08.000000000 -0500
16345 +diff -urNp linux-3.1.4/include/linux/perf_event.h linux-3.1.4/include/linux/perf_event.h
16346 +--- linux-3.1.4/include/linux/perf_event.h 2011-11-11 15:19:27.000000000 -0500
16347 ++++ linux-3.1.4/include/linux/perf_event.h 2011-11-16 18:39:08.000000000 -0500
16348 @@ -745,8 +745,8 @@ struct perf_event {
16349
16350 enum perf_event_active_state state;
16351 @@ -59963,9 +60830,9 @@ diff -urNp linux-3.1.3/include/linux/perf_event.h linux-3.1.3/include/linux/perf
16352
16353 /*
16354 * Protect attach/detach and child_list:
16355 -diff -urNp linux-3.1.3/include/linux/pipe_fs_i.h linux-3.1.3/include/linux/pipe_fs_i.h
16356 ---- linux-3.1.3/include/linux/pipe_fs_i.h 2011-11-11 15:19:27.000000000 -0500
16357 -+++ linux-3.1.3/include/linux/pipe_fs_i.h 2011-11-16 18:39:08.000000000 -0500
16358 +diff -urNp linux-3.1.4/include/linux/pipe_fs_i.h linux-3.1.4/include/linux/pipe_fs_i.h
16359 +--- linux-3.1.4/include/linux/pipe_fs_i.h 2011-11-11 15:19:27.000000000 -0500
16360 ++++ linux-3.1.4/include/linux/pipe_fs_i.h 2011-11-16 18:39:08.000000000 -0500
16361 @@ -46,9 +46,9 @@ struct pipe_buffer {
16362 struct pipe_inode_info {
16363 wait_queue_head_t wait;
16364 @@ -59979,9 +60846,9 @@ diff -urNp linux-3.1.3/include/linux/pipe_fs_i.h linux-3.1.3/include/linux/pipe_
16365 unsigned int r_counter;
16366 unsigned int w_counter;
16367 struct page *tmp_page;
16368 -diff -urNp linux-3.1.3/include/linux/pm_runtime.h linux-3.1.3/include/linux/pm_runtime.h
16369 ---- linux-3.1.3/include/linux/pm_runtime.h 2011-11-11 15:19:27.000000000 -0500
16370 -+++ linux-3.1.3/include/linux/pm_runtime.h 2011-11-16 18:39:08.000000000 -0500
16371 +diff -urNp linux-3.1.4/include/linux/pm_runtime.h linux-3.1.4/include/linux/pm_runtime.h
16372 +--- linux-3.1.4/include/linux/pm_runtime.h 2011-11-11 15:19:27.000000000 -0500
16373 ++++ linux-3.1.4/include/linux/pm_runtime.h 2011-11-16 18:39:08.000000000 -0500
16374 @@ -99,7 +99,7 @@ static inline bool pm_runtime_callbacks_
16375
16376 static inline void pm_runtime_mark_last_busy(struct device *dev)
16377 @@ -59991,9 +60858,9 @@ diff -urNp linux-3.1.3/include/linux/pm_runtime.h linux-3.1.3/include/linux/pm_r
16378 }
16379
16380 #else /* !CONFIG_PM_RUNTIME */
16381 -diff -urNp linux-3.1.3/include/linux/poison.h linux-3.1.3/include/linux/poison.h
16382 ---- linux-3.1.3/include/linux/poison.h 2011-11-11 15:19:27.000000000 -0500
16383 -+++ linux-3.1.3/include/linux/poison.h 2011-11-16 18:39:08.000000000 -0500
16384 +diff -urNp linux-3.1.4/include/linux/poison.h linux-3.1.4/include/linux/poison.h
16385 +--- linux-3.1.4/include/linux/poison.h 2011-11-11 15:19:27.000000000 -0500
16386 ++++ linux-3.1.4/include/linux/poison.h 2011-11-16 18:39:08.000000000 -0500
16387 @@ -19,8 +19,8 @@
16388 * under normal circumstances, used to verify that nobody uses
16389 * non-initialized list entries.
16390 @@ -60005,9 +60872,9 @@ diff -urNp linux-3.1.3/include/linux/poison.h linux-3.1.3/include/linux/poison.h
16391
16392 /********** include/linux/timer.h **********/
16393 /*
16394 -diff -urNp linux-3.1.3/include/linux/preempt.h linux-3.1.3/include/linux/preempt.h
16395 ---- linux-3.1.3/include/linux/preempt.h 2011-11-11 15:19:27.000000000 -0500
16396 -+++ linux-3.1.3/include/linux/preempt.h 2011-11-16 18:39:08.000000000 -0500
16397 +diff -urNp linux-3.1.4/include/linux/preempt.h linux-3.1.4/include/linux/preempt.h
16398 +--- linux-3.1.4/include/linux/preempt.h 2011-11-11 15:19:27.000000000 -0500
16399 ++++ linux-3.1.4/include/linux/preempt.h 2011-11-16 18:39:08.000000000 -0500
16400 @@ -123,7 +123,7 @@ struct preempt_ops {
16401 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
16402 void (*sched_out)(struct preempt_notifier *notifier,
16403 @@ -60017,9 +60884,9 @@ diff -urNp linux-3.1.3/include/linux/preempt.h linux-3.1.3/include/linux/preempt
16404
16405 /**
16406 * preempt_notifier - key for installing preemption notifiers
16407 -diff -urNp linux-3.1.3/include/linux/proc_fs.h linux-3.1.3/include/linux/proc_fs.h
16408 ---- linux-3.1.3/include/linux/proc_fs.h 2011-11-11 15:19:27.000000000 -0500
16409 -+++ linux-3.1.3/include/linux/proc_fs.h 2011-11-16 18:40:31.000000000 -0500
16410 +diff -urNp linux-3.1.4/include/linux/proc_fs.h linux-3.1.4/include/linux/proc_fs.h
16411 +--- linux-3.1.4/include/linux/proc_fs.h 2011-11-11 15:19:27.000000000 -0500
16412 ++++ linux-3.1.4/include/linux/proc_fs.h 2011-11-16 18:40:31.000000000 -0500
16413 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
16414 return proc_create_data(name, mode, parent, proc_fops, NULL);
16415 }
16416 @@ -60049,9 +60916,9 @@ diff -urNp linux-3.1.3/include/linux/proc_fs.h linux-3.1.3/include/linux/proc_fs
16417
16418 struct ctl_table_header;
16419 struct ctl_table;
16420 -diff -urNp linux-3.1.3/include/linux/ptrace.h linux-3.1.3/include/linux/ptrace.h
16421 ---- linux-3.1.3/include/linux/ptrace.h 2011-11-11 15:19:27.000000000 -0500
16422 -+++ linux-3.1.3/include/linux/ptrace.h 2011-11-16 18:40:31.000000000 -0500
16423 +diff -urNp linux-3.1.4/include/linux/ptrace.h linux-3.1.4/include/linux/ptrace.h
16424 +--- linux-3.1.4/include/linux/ptrace.h 2011-11-11 15:19:27.000000000 -0500
16425 ++++ linux-3.1.4/include/linux/ptrace.h 2011-11-16 18:40:31.000000000 -0500
16426 @@ -129,10 +129,10 @@ extern void __ptrace_unlink(struct task_
16427 extern void exit_ptrace(struct task_struct *tracer);
16428 #define PTRACE_MODE_READ 1
16429 @@ -60065,9 +60932,9 @@ diff -urNp linux-3.1.3/include/linux/ptrace.h linux-3.1.3/include/linux/ptrace.h
16430
16431 static inline int ptrace_reparented(struct task_struct *child)
16432 {
16433 -diff -urNp linux-3.1.3/include/linux/random.h linux-3.1.3/include/linux/random.h
16434 ---- linux-3.1.3/include/linux/random.h 2011-11-11 15:19:27.000000000 -0500
16435 -+++ linux-3.1.3/include/linux/random.h 2011-11-16 18:39:08.000000000 -0500
16436 +diff -urNp linux-3.1.4/include/linux/random.h linux-3.1.4/include/linux/random.h
16437 +--- linux-3.1.4/include/linux/random.h 2011-11-11 15:19:27.000000000 -0500
16438 ++++ linux-3.1.4/include/linux/random.h 2011-11-16 18:39:08.000000000 -0500
16439 @@ -69,12 +69,17 @@ void srandom32(u32 seed);
16440
16441 u32 prandom32(struct rnd_state *);
16442 @@ -60087,9 +60954,9 @@ diff -urNp linux-3.1.3/include/linux/random.h linux-3.1.3/include/linux/random.h
16443 }
16444
16445 /**
16446 -diff -urNp linux-3.1.3/include/linux/reboot.h linux-3.1.3/include/linux/reboot.h
16447 ---- linux-3.1.3/include/linux/reboot.h 2011-11-11 15:19:27.000000000 -0500
16448 -+++ linux-3.1.3/include/linux/reboot.h 2011-11-16 18:39:08.000000000 -0500
16449 +diff -urNp linux-3.1.4/include/linux/reboot.h linux-3.1.4/include/linux/reboot.h
16450 +--- linux-3.1.4/include/linux/reboot.h 2011-11-11 15:19:27.000000000 -0500
16451 ++++ linux-3.1.4/include/linux/reboot.h 2011-11-16 18:39:08.000000000 -0500
16452 @@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(st
16453 * Architecture-specific implementations of sys_reboot commands.
16454 */
16455 @@ -60125,9 +60992,9 @@ diff -urNp linux-3.1.3/include/linux/reboot.h linux-3.1.3/include/linux/reboot.h
16456 #include <asm/emergency-restart.h>
16457
16458 #endif
16459 -diff -urNp linux-3.1.3/include/linux/reiserfs_fs.h linux-3.1.3/include/linux/reiserfs_fs.h
16460 ---- linux-3.1.3/include/linux/reiserfs_fs.h 2011-11-11 15:19:27.000000000 -0500
16461 -+++ linux-3.1.3/include/linux/reiserfs_fs.h 2011-11-16 18:39:08.000000000 -0500
16462 +diff -urNp linux-3.1.4/include/linux/reiserfs_fs.h linux-3.1.4/include/linux/reiserfs_fs.h
16463 +--- linux-3.1.4/include/linux/reiserfs_fs.h 2011-11-11 15:19:27.000000000 -0500
16464 ++++ linux-3.1.4/include/linux/reiserfs_fs.h 2011-11-16 18:39:08.000000000 -0500
16465 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
16466 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
16467
16468 @@ -60137,9 +61004,9 @@ diff -urNp linux-3.1.3/include/linux/reiserfs_fs.h linux-3.1.3/include/linux/rei
16469 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
16470 #define __fs_changed(gen,s) (gen != get_generation (s))
16471 #define fs_changed(gen,s) \
16472 -diff -urNp linux-3.1.3/include/linux/reiserfs_fs_sb.h linux-3.1.3/include/linux/reiserfs_fs_sb.h
16473 ---- linux-3.1.3/include/linux/reiserfs_fs_sb.h 2011-11-11 15:19:27.000000000 -0500
16474 -+++ linux-3.1.3/include/linux/reiserfs_fs_sb.h 2011-11-16 18:39:08.000000000 -0500
16475 +diff -urNp linux-3.1.4/include/linux/reiserfs_fs_sb.h linux-3.1.4/include/linux/reiserfs_fs_sb.h
16476 +--- linux-3.1.4/include/linux/reiserfs_fs_sb.h 2011-11-11 15:19:27.000000000 -0500
16477 ++++ linux-3.1.4/include/linux/reiserfs_fs_sb.h 2011-11-16 18:39:08.000000000 -0500
16478 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
16479 /* Comment? -Hans */
16480 wait_queue_head_t s_wait;
16481 @@ -60149,9 +61016,9 @@ diff -urNp linux-3.1.3/include/linux/reiserfs_fs_sb.h linux-3.1.3/include/linux/
16482 // tree gets re-balanced
16483 unsigned long s_properties; /* File system properties. Currently holds
16484 on-disk FS format */
16485 -diff -urNp linux-3.1.3/include/linux/relay.h linux-3.1.3/include/linux/relay.h
16486 ---- linux-3.1.3/include/linux/relay.h 2011-11-11 15:19:27.000000000 -0500
16487 -+++ linux-3.1.3/include/linux/relay.h 2011-11-16 18:39:08.000000000 -0500
16488 +diff -urNp linux-3.1.4/include/linux/relay.h linux-3.1.4/include/linux/relay.h
16489 +--- linux-3.1.4/include/linux/relay.h 2011-11-11 15:19:27.000000000 -0500
16490 ++++ linux-3.1.4/include/linux/relay.h 2011-11-16 18:39:08.000000000 -0500
16491 @@ -159,7 +159,7 @@ struct rchan_callbacks
16492 * The callback should return 0 if successful, negative if not.
16493 */
16494 @@ -60161,9 +61028,9 @@ diff -urNp linux-3.1.3/include/linux/relay.h linux-3.1.3/include/linux/relay.h
16495
16496 /*
16497 * CONFIG_RELAY kernel API, kernel/relay.c
16498 -diff -urNp linux-3.1.3/include/linux/rfkill.h linux-3.1.3/include/linux/rfkill.h
16499 ---- linux-3.1.3/include/linux/rfkill.h 2011-11-11 15:19:27.000000000 -0500
16500 -+++ linux-3.1.3/include/linux/rfkill.h 2011-11-16 18:39:08.000000000 -0500
16501 +diff -urNp linux-3.1.4/include/linux/rfkill.h linux-3.1.4/include/linux/rfkill.h
16502 +--- linux-3.1.4/include/linux/rfkill.h 2011-11-11 15:19:27.000000000 -0500
16503 ++++ linux-3.1.4/include/linux/rfkill.h 2011-11-16 18:39:08.000000000 -0500
16504 @@ -147,6 +147,7 @@ struct rfkill_ops {
16505 void (*query)(struct rfkill *rfkill, void *data);
16506 int (*set_block)(void *data, bool blocked);
16507 @@ -60172,9 +61039,9 @@ diff -urNp linux-3.1.3/include/linux/rfkill.h linux-3.1.3/include/linux/rfkill.h
16508
16509 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
16510 /**
16511 -diff -urNp linux-3.1.3/include/linux/rmap.h linux-3.1.3/include/linux/rmap.h
16512 ---- linux-3.1.3/include/linux/rmap.h 2011-11-11 15:19:27.000000000 -0500
16513 -+++ linux-3.1.3/include/linux/rmap.h 2011-11-16 18:39:08.000000000 -0500
16514 +diff -urNp linux-3.1.4/include/linux/rmap.h linux-3.1.4/include/linux/rmap.h
16515 +--- linux-3.1.4/include/linux/rmap.h 2011-11-11 15:19:27.000000000 -0500
16516 ++++ linux-3.1.4/include/linux/rmap.h 2011-11-16 18:39:08.000000000 -0500
16517 @@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc
16518 void anon_vma_init(void); /* create anon_vma_cachep */
16519 int anon_vma_prepare(struct vm_area_struct *);
16520 @@ -60186,9 +61053,9 @@ diff -urNp linux-3.1.3/include/linux/rmap.h linux-3.1.3/include/linux/rmap.h
16521 void __anon_vma_link(struct vm_area_struct *);
16522
16523 static inline void anon_vma_merge(struct vm_area_struct *vma,
16524 -diff -urNp linux-3.1.3/include/linux/sched.h linux-3.1.3/include/linux/sched.h
16525 ---- linux-3.1.3/include/linux/sched.h 2011-11-11 15:19:27.000000000 -0500
16526 -+++ linux-3.1.3/include/linux/sched.h 2011-11-16 18:40:31.000000000 -0500
16527 +diff -urNp linux-3.1.4/include/linux/sched.h linux-3.1.4/include/linux/sched.h
16528 +--- linux-3.1.4/include/linux/sched.h 2011-11-11 15:19:27.000000000 -0500
16529 ++++ linux-3.1.4/include/linux/sched.h 2011-11-16 18:40:31.000000000 -0500
16530 @@ -100,6 +100,7 @@ struct bio_list;
16531 struct fs_struct;
16532 struct perf_event_context;
16533 @@ -60422,9 +61289,9 @@ diff -urNp linux-3.1.3/include/linux/sched.h linux-3.1.3/include/linux/sched.h
16534 extern void thread_info_cache_init(void);
16535
16536 #ifdef CONFIG_DEBUG_STACK_USAGE
16537 -diff -urNp linux-3.1.3/include/linux/screen_info.h linux-3.1.3/include/linux/screen_info.h
16538 ---- linux-3.1.3/include/linux/screen_info.h 2011-11-11 15:19:27.000000000 -0500
16539 -+++ linux-3.1.3/include/linux/screen_info.h 2011-11-16 18:39:08.000000000 -0500
16540 +diff -urNp linux-3.1.4/include/linux/screen_info.h linux-3.1.4/include/linux/screen_info.h
16541 +--- linux-3.1.4/include/linux/screen_info.h 2011-11-11 15:19:27.000000000 -0500
16542 ++++ linux-3.1.4/include/linux/screen_info.h 2011-11-16 18:39:08.000000000 -0500
16543 @@ -43,7 +43,8 @@ struct screen_info {
16544 __u16 pages; /* 0x32 */
16545 __u16 vesa_attributes; /* 0x34 */
16546 @@ -60435,9 +61302,9 @@ diff -urNp linux-3.1.3/include/linux/screen_info.h linux-3.1.3/include/linux/scr
16547 } __attribute__((packed));
16548
16549 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
16550 -diff -urNp linux-3.1.3/include/linux/security.h linux-3.1.3/include/linux/security.h
16551 ---- linux-3.1.3/include/linux/security.h 2011-11-11 15:19:27.000000000 -0500
16552 -+++ linux-3.1.3/include/linux/security.h 2011-11-16 18:40:31.000000000 -0500
16553 +diff -urNp linux-3.1.4/include/linux/security.h linux-3.1.4/include/linux/security.h
16554 +--- linux-3.1.4/include/linux/security.h 2011-11-11 15:19:27.000000000 -0500
16555 ++++ linux-3.1.4/include/linux/security.h 2011-11-16 18:40:31.000000000 -0500
16556 @@ -36,6 +36,7 @@
16557 #include <linux/key.h>
16558 #include <linux/xfrm.h>
16559 @@ -60446,9 +61313,9 @@ diff -urNp linux-3.1.3/include/linux/security.h linux-3.1.3/include/linux/securi
16560 #include <net/flow.h>
16561
16562 /* Maximum number of letters for an LSM name string */
16563 -diff -urNp linux-3.1.3/include/linux/seq_file.h linux-3.1.3/include/linux/seq_file.h
16564 ---- linux-3.1.3/include/linux/seq_file.h 2011-11-11 15:19:27.000000000 -0500
16565 -+++ linux-3.1.3/include/linux/seq_file.h 2011-11-16 18:39:08.000000000 -0500
16566 +diff -urNp linux-3.1.4/include/linux/seq_file.h linux-3.1.4/include/linux/seq_file.h
16567 +--- linux-3.1.4/include/linux/seq_file.h 2011-11-11 15:19:27.000000000 -0500
16568 ++++ linux-3.1.4/include/linux/seq_file.h 2011-11-16 18:39:08.000000000 -0500
16569 @@ -33,6 +33,7 @@ struct seq_operations {
16570 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
16571 int (*show) (struct seq_file *m, void *v);
16572 @@ -60457,9 +61324,9 @@ diff -urNp linux-3.1.3/include/linux/seq_file.h linux-3.1.3/include/linux/seq_fi
16573
16574 #define SEQ_SKIP 1
16575
16576 -diff -urNp linux-3.1.3/include/linux/shm.h linux-3.1.3/include/linux/shm.h
16577 ---- linux-3.1.3/include/linux/shm.h 2011-11-11 15:19:27.000000000 -0500
16578 -+++ linux-3.1.3/include/linux/shm.h 2011-11-16 18:59:58.000000000 -0500
16579 +diff -urNp linux-3.1.4/include/linux/shm.h linux-3.1.4/include/linux/shm.h
16580 +--- linux-3.1.4/include/linux/shm.h 2011-11-11 15:19:27.000000000 -0500
16581 ++++ linux-3.1.4/include/linux/shm.h 2011-11-16 18:59:58.000000000 -0500
16582 @@ -98,6 +98,10 @@ struct shmid_kernel /* private to the ke
16583
16584 /* The task created the shm object. NULL if the task is dead. */
16585 @@ -60471,9 +61338,9 @@ diff -urNp linux-3.1.3/include/linux/shm.h linux-3.1.3/include/linux/shm.h
16586 };
16587
16588 /* shm_mode upper byte flags */
16589 -diff -urNp linux-3.1.3/include/linux/skbuff.h linux-3.1.3/include/linux/skbuff.h
16590 ---- linux-3.1.3/include/linux/skbuff.h 2011-11-11 15:19:27.000000000 -0500
16591 -+++ linux-3.1.3/include/linux/skbuff.h 2011-11-16 18:39:08.000000000 -0500
16592 +diff -urNp linux-3.1.4/include/linux/skbuff.h linux-3.1.4/include/linux/skbuff.h
16593 +--- linux-3.1.4/include/linux/skbuff.h 2011-11-11 15:19:27.000000000 -0500
16594 ++++ linux-3.1.4/include/linux/skbuff.h 2011-11-16 18:39:08.000000000 -0500
16595 @@ -610,7 +610,7 @@ static inline struct skb_shared_hwtstamp
16596 */
16597 static inline int skb_queue_empty(const struct sk_buff_head *list)
16598 @@ -60510,9 +61377,9 @@ diff -urNp linux-3.1.3/include/linux/skbuff.h linux-3.1.3/include/linux/skbuff.h
16599 #endif
16600
16601 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
16602 -diff -urNp linux-3.1.3/include/linux/slab_def.h linux-3.1.3/include/linux/slab_def.h
16603 ---- linux-3.1.3/include/linux/slab_def.h 2011-11-11 15:19:27.000000000 -0500
16604 -+++ linux-3.1.3/include/linux/slab_def.h 2011-11-16 18:39:08.000000000 -0500
16605 +diff -urNp linux-3.1.4/include/linux/slab_def.h linux-3.1.4/include/linux/slab_def.h
16606 +--- linux-3.1.4/include/linux/slab_def.h 2011-11-11 15:19:27.000000000 -0500
16607 ++++ linux-3.1.4/include/linux/slab_def.h 2011-11-16 18:39:08.000000000 -0500
16608 @@ -68,10 +68,10 @@ struct kmem_cache {
16609 unsigned long node_allocs;
16610 unsigned long node_frees;
16611 @@ -60528,9 +61395,9 @@ diff -urNp linux-3.1.3/include/linux/slab_def.h linux-3.1.3/include/linux/slab_d
16612
16613 /*
16614 * If debugging is enabled, then the allocator can add additional
16615 -diff -urNp linux-3.1.3/include/linux/slab.h linux-3.1.3/include/linux/slab.h
16616 ---- linux-3.1.3/include/linux/slab.h 2011-11-11 15:19:27.000000000 -0500
16617 -+++ linux-3.1.3/include/linux/slab.h 2011-11-16 18:39:08.000000000 -0500
16618 +diff -urNp linux-3.1.4/include/linux/slab.h linux-3.1.4/include/linux/slab.h
16619 +--- linux-3.1.4/include/linux/slab.h 2011-11-11 15:19:27.000000000 -0500
16620 ++++ linux-3.1.4/include/linux/slab.h 2011-11-16 18:39:08.000000000 -0500
16621 @@ -11,12 +11,20 @@
16622
16623 #include <linux/gfp.h>
16624 @@ -60637,9 +61504,9 @@ diff -urNp linux-3.1.3/include/linux/slab.h linux-3.1.3/include/linux/slab.h
16625 +})
16626 +
16627 #endif /* _LINUX_SLAB_H */
16628 -diff -urNp linux-3.1.3/include/linux/slub_def.h linux-3.1.3/include/linux/slub_def.h
16629 ---- linux-3.1.3/include/linux/slub_def.h 2011-11-11 15:19:27.000000000 -0500
16630 -+++ linux-3.1.3/include/linux/slub_def.h 2011-11-16 18:39:08.000000000 -0500
16631 +diff -urNp linux-3.1.4/include/linux/slub_def.h linux-3.1.4/include/linux/slub_def.h
16632 +--- linux-3.1.4/include/linux/slub_def.h 2011-11-11 15:19:27.000000000 -0500
16633 ++++ linux-3.1.4/include/linux/slub_def.h 2011-11-16 18:39:08.000000000 -0500
16634 @@ -85,7 +85,7 @@ struct kmem_cache {
16635 struct kmem_cache_order_objects max;
16636 struct kmem_cache_order_objects min;
16637 @@ -60658,9 +61525,9 @@ diff -urNp linux-3.1.3/include/linux/slub_def.h linux-3.1.3/include/linux/slub_d
16638
16639 static __always_inline void *
16640 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
16641 -diff -urNp linux-3.1.3/include/linux/sonet.h linux-3.1.3/include/linux/sonet.h
16642 ---- linux-3.1.3/include/linux/sonet.h 2011-11-11 15:19:27.000000000 -0500
16643 -+++ linux-3.1.3/include/linux/sonet.h 2011-11-16 18:39:08.000000000 -0500
16644 +diff -urNp linux-3.1.4/include/linux/sonet.h linux-3.1.4/include/linux/sonet.h
16645 +--- linux-3.1.4/include/linux/sonet.h 2011-11-11 15:19:27.000000000 -0500
16646 ++++ linux-3.1.4/include/linux/sonet.h 2011-11-16 18:39:08.000000000 -0500
16647 @@ -61,7 +61,7 @@ struct sonet_stats {
16648 #include <linux/atomic.h>
16649
16650 @@ -60670,9 +61537,9 @@ diff -urNp linux-3.1.3/include/linux/sonet.h linux-3.1.3/include/linux/sonet.h
16651 __SONET_ITEMS
16652 #undef __HANDLE_ITEM
16653 };
16654 -diff -urNp linux-3.1.3/include/linux/sunrpc/clnt.h linux-3.1.3/include/linux/sunrpc/clnt.h
16655 ---- linux-3.1.3/include/linux/sunrpc/clnt.h 2011-11-11 15:19:27.000000000 -0500
16656 -+++ linux-3.1.3/include/linux/sunrpc/clnt.h 2011-11-16 18:39:08.000000000 -0500
16657 +diff -urNp linux-3.1.4/include/linux/sunrpc/clnt.h linux-3.1.4/include/linux/sunrpc/clnt.h
16658 +--- linux-3.1.4/include/linux/sunrpc/clnt.h 2011-11-11 15:19:27.000000000 -0500
16659 ++++ linux-3.1.4/include/linux/sunrpc/clnt.h 2011-11-16 18:39:08.000000000 -0500
16660 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
16661 {
16662 switch (sap->sa_family) {
16663 @@ -60703,9 +61570,9 @@ diff -urNp linux-3.1.3/include/linux/sunrpc/clnt.h linux-3.1.3/include/linux/sun
16664 }
16665
16666 #endif /* __KERNEL__ */
16667 -diff -urNp linux-3.1.3/include/linux/sunrpc/sched.h linux-3.1.3/include/linux/sunrpc/sched.h
16668 ---- linux-3.1.3/include/linux/sunrpc/sched.h 2011-11-11 15:19:27.000000000 -0500
16669 -+++ linux-3.1.3/include/linux/sunrpc/sched.h 2011-11-16 18:39:08.000000000 -0500
16670 +diff -urNp linux-3.1.4/include/linux/sunrpc/sched.h linux-3.1.4/include/linux/sunrpc/sched.h
16671 +--- linux-3.1.4/include/linux/sunrpc/sched.h 2011-11-11 15:19:27.000000000 -0500
16672 ++++ linux-3.1.4/include/linux/sunrpc/sched.h 2011-11-16 18:39:08.000000000 -0500
16673 @@ -105,6 +105,7 @@ struct rpc_call_ops {
16674 void (*rpc_call_done)(struct rpc_task *, void *);
16675 void (*rpc_release)(void *);
16676 @@ -60714,9 +61581,9 @@ diff -urNp linux-3.1.3/include/linux/sunrpc/sched.h linux-3.1.3/include/linux/su
16677
16678 struct rpc_task_setup {
16679 struct rpc_task *task;
16680 -diff -urNp linux-3.1.3/include/linux/sunrpc/svc_rdma.h linux-3.1.3/include/linux/sunrpc/svc_rdma.h
16681 ---- linux-3.1.3/include/linux/sunrpc/svc_rdma.h 2011-11-11 15:19:27.000000000 -0500
16682 -+++ linux-3.1.3/include/linux/sunrpc/svc_rdma.h 2011-11-16 18:39:08.000000000 -0500
16683 +diff -urNp linux-3.1.4/include/linux/sunrpc/svc_rdma.h linux-3.1.4/include/linux/sunrpc/svc_rdma.h
16684 +--- linux-3.1.4/include/linux/sunrpc/svc_rdma.h 2011-11-11 15:19:27.000000000 -0500
16685 ++++ linux-3.1.4/include/linux/sunrpc/svc_rdma.h 2011-11-16 18:39:08.000000000 -0500
16686 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
16687 extern unsigned int svcrdma_max_requests;
16688 extern unsigned int svcrdma_max_req_size;
16689 @@ -60742,9 +61609,9 @@ diff -urNp linux-3.1.3/include/linux/sunrpc/svc_rdma.h linux-3.1.3/include/linux
16690
16691 #define RPCRDMA_VERSION 1
16692
16693 -diff -urNp linux-3.1.3/include/linux/sysctl.h linux-3.1.3/include/linux/sysctl.h
16694 ---- linux-3.1.3/include/linux/sysctl.h 2011-11-11 15:19:27.000000000 -0500
16695 -+++ linux-3.1.3/include/linux/sysctl.h 2011-11-16 18:40:31.000000000 -0500
16696 +diff -urNp linux-3.1.4/include/linux/sysctl.h linux-3.1.4/include/linux/sysctl.h
16697 +--- linux-3.1.4/include/linux/sysctl.h 2011-11-11 15:19:27.000000000 -0500
16698 ++++ linux-3.1.4/include/linux/sysctl.h 2011-11-16 18:40:31.000000000 -0500
16699 @@ -155,7 +155,11 @@ enum
16700 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
16701 };
16702 @@ -60767,9 +61634,9 @@ diff -urNp linux-3.1.3/include/linux/sysctl.h linux-3.1.3/include/linux/sysctl.h
16703 extern int proc_dointvec(struct ctl_table *, int,
16704 void __user *, size_t *, loff_t *);
16705 extern int proc_dointvec_minmax(struct ctl_table *, int,
16706 -diff -urNp linux-3.1.3/include/linux/tty_ldisc.h linux-3.1.3/include/linux/tty_ldisc.h
16707 ---- linux-3.1.3/include/linux/tty_ldisc.h 2011-11-11 15:19:27.000000000 -0500
16708 -+++ linux-3.1.3/include/linux/tty_ldisc.h 2011-11-16 18:39:08.000000000 -0500
16709 +diff -urNp linux-3.1.4/include/linux/tty_ldisc.h linux-3.1.4/include/linux/tty_ldisc.h
16710 +--- linux-3.1.4/include/linux/tty_ldisc.h 2011-11-11 15:19:27.000000000 -0500
16711 ++++ linux-3.1.4/include/linux/tty_ldisc.h 2011-11-16 18:39:08.000000000 -0500
16712 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
16713
16714 struct module *owner;
16715 @@ -60779,9 +61646,9 @@ diff -urNp linux-3.1.3/include/linux/tty_ldisc.h linux-3.1.3/include/linux/tty_l
16716 };
16717
16718 struct tty_ldisc {
16719 -diff -urNp linux-3.1.3/include/linux/types.h linux-3.1.3/include/linux/types.h
16720 ---- linux-3.1.3/include/linux/types.h 2011-11-11 15:19:27.000000000 -0500
16721 -+++ linux-3.1.3/include/linux/types.h 2011-11-16 18:39:08.000000000 -0500
16722 +diff -urNp linux-3.1.4/include/linux/types.h linux-3.1.4/include/linux/types.h
16723 +--- linux-3.1.4/include/linux/types.h 2011-11-11 15:19:27.000000000 -0500
16724 ++++ linux-3.1.4/include/linux/types.h 2011-11-16 18:39:08.000000000 -0500
16725 @@ -213,10 +213,26 @@ typedef struct {
16726 int counter;
16727 } atomic_t;
16728 @@ -60809,9 +61676,9 @@ diff -urNp linux-3.1.3/include/linux/types.h linux-3.1.3/include/linux/types.h
16729 #endif
16730
16731 struct list_head {
16732 -diff -urNp linux-3.1.3/include/linux/uaccess.h linux-3.1.3/include/linux/uaccess.h
16733 ---- linux-3.1.3/include/linux/uaccess.h 2011-11-11 15:19:27.000000000 -0500
16734 -+++ linux-3.1.3/include/linux/uaccess.h 2011-11-16 18:39:08.000000000 -0500
16735 +diff -urNp linux-3.1.4/include/linux/uaccess.h linux-3.1.4/include/linux/uaccess.h
16736 +--- linux-3.1.4/include/linux/uaccess.h 2011-11-11 15:19:27.000000000 -0500
16737 ++++ linux-3.1.4/include/linux/uaccess.h 2011-11-16 18:39:08.000000000 -0500
16738 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
16739 long ret; \
16740 mm_segment_t old_fs = get_fs(); \
16741 @@ -60827,9 +61694,9 @@ diff -urNp linux-3.1.3/include/linux/uaccess.h linux-3.1.3/include/linux/uaccess
16742 ret; \
16743 })
16744
16745 -diff -urNp linux-3.1.3/include/linux/unaligned/access_ok.h linux-3.1.3/include/linux/unaligned/access_ok.h
16746 ---- linux-3.1.3/include/linux/unaligned/access_ok.h 2011-11-11 15:19:27.000000000 -0500
16747 -+++ linux-3.1.3/include/linux/unaligned/access_ok.h 2011-11-16 18:39:08.000000000 -0500
16748 +diff -urNp linux-3.1.4/include/linux/unaligned/access_ok.h linux-3.1.4/include/linux/unaligned/access_ok.h
16749 +--- linux-3.1.4/include/linux/unaligned/access_ok.h 2011-11-11 15:19:27.000000000 -0500
16750 ++++ linux-3.1.4/include/linux/unaligned/access_ok.h 2011-11-16 18:39:08.000000000 -0500
16751 @@ -6,32 +6,32 @@
16752
16753 static inline u16 get_unaligned_le16(const void *p)
16754 @@ -60869,9 +61736,9 @@ diff -urNp linux-3.1.3/include/linux/unaligned/access_ok.h linux-3.1.3/include/l
16755 }
16756
16757 static inline void put_unaligned_le16(u16 val, void *p)
16758 -diff -urNp linux-3.1.3/include/linux/vermagic.h linux-3.1.3/include/linux/vermagic.h
16759 ---- linux-3.1.3/include/linux/vermagic.h 2011-11-11 15:19:27.000000000 -0500
16760 -+++ linux-3.1.3/include/linux/vermagic.h 2011-11-16 18:54:54.000000000 -0500
16761 +diff -urNp linux-3.1.4/include/linux/vermagic.h linux-3.1.4/include/linux/vermagic.h
16762 +--- linux-3.1.4/include/linux/vermagic.h 2011-11-11 15:19:27.000000000 -0500
16763 ++++ linux-3.1.4/include/linux/vermagic.h 2011-11-16 18:54:54.000000000 -0500
16764 @@ -26,9 +26,35 @@
16765 #define MODULE_ARCH_VERMAGIC ""
16766 #endif
16767 @@ -60909,9 +61776,9 @@ diff -urNp linux-3.1.3/include/linux/vermagic.h linux-3.1.3/include/linux/vermag
16768 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
16769 + MODULE_GRSEC
16770
16771 -diff -urNp linux-3.1.3/include/linux/vmalloc.h linux-3.1.3/include/linux/vmalloc.h
16772 ---- linux-3.1.3/include/linux/vmalloc.h 2011-11-11 15:19:27.000000000 -0500
16773 -+++ linux-3.1.3/include/linux/vmalloc.h 2011-11-16 18:39:08.000000000 -0500
16774 +diff -urNp linux-3.1.4/include/linux/vmalloc.h linux-3.1.4/include/linux/vmalloc.h
16775 +--- linux-3.1.4/include/linux/vmalloc.h 2011-11-11 15:19:27.000000000 -0500
16776 ++++ linux-3.1.4/include/linux/vmalloc.h 2011-11-16 18:39:08.000000000 -0500
16777 @@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining
16778 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
16779 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
16780 @@ -61028,9 +61895,9 @@ diff -urNp linux-3.1.3/include/linux/vmalloc.h linux-3.1.3/include/linux/vmalloc
16781 +})
16782 +
16783 #endif /* _LINUX_VMALLOC_H */
16784 -diff -urNp linux-3.1.3/include/linux/vmstat.h linux-3.1.3/include/linux/vmstat.h
16785 ---- linux-3.1.3/include/linux/vmstat.h 2011-11-11 15:19:27.000000000 -0500
16786 -+++ linux-3.1.3/include/linux/vmstat.h 2011-11-16 18:39:08.000000000 -0500
16787 +diff -urNp linux-3.1.4/include/linux/vmstat.h linux-3.1.4/include/linux/vmstat.h
16788 +--- linux-3.1.4/include/linux/vmstat.h 2011-11-11 15:19:27.000000000 -0500
16789 ++++ linux-3.1.4/include/linux/vmstat.h 2011-11-16 18:39:08.000000000 -0500
16790 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
16791 /*
16792 * Zone based page accounting with per cpu differentials.
16793 @@ -61094,9 +61961,9 @@ diff -urNp linux-3.1.3/include/linux/vmstat.h linux-3.1.3/include/linux/vmstat.h
16794 }
16795
16796 static inline void __dec_zone_page_state(struct page *page,
16797 -diff -urNp linux-3.1.3/include/media/saa7146_vv.h linux-3.1.3/include/media/saa7146_vv.h
16798 ---- linux-3.1.3/include/media/saa7146_vv.h 2011-11-11 15:19:27.000000000 -0500
16799 -+++ linux-3.1.3/include/media/saa7146_vv.h 2011-11-16 18:39:08.000000000 -0500
16800 +diff -urNp linux-3.1.4/include/media/saa7146_vv.h linux-3.1.4/include/media/saa7146_vv.h
16801 +--- linux-3.1.4/include/media/saa7146_vv.h 2011-11-11 15:19:27.000000000 -0500
16802 ++++ linux-3.1.4/include/media/saa7146_vv.h 2011-11-16 18:39:08.000000000 -0500
16803 @@ -163,7 +163,7 @@ struct saa7146_ext_vv
16804 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
16805
16806 @@ -61106,9 +61973,9 @@ diff -urNp linux-3.1.3/include/media/saa7146_vv.h linux-3.1.3/include/media/saa7
16807 /* pointer to the saa7146 core ops */
16808 const struct v4l2_ioctl_ops *core_ops;
16809
16810 -diff -urNp linux-3.1.3/include/media/v4l2-dev.h linux-3.1.3/include/media/v4l2-dev.h
16811 ---- linux-3.1.3/include/media/v4l2-dev.h 2011-11-11 15:19:27.000000000 -0500
16812 -+++ linux-3.1.3/include/media/v4l2-dev.h 2011-11-16 18:39:08.000000000 -0500
16813 +diff -urNp linux-3.1.4/include/media/v4l2-dev.h linux-3.1.4/include/media/v4l2-dev.h
16814 +--- linux-3.1.4/include/media/v4l2-dev.h 2011-11-11 15:19:27.000000000 -0500
16815 ++++ linux-3.1.4/include/media/v4l2-dev.h 2011-11-16 18:39:08.000000000 -0500
16816 @@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta
16817
16818
16819 @@ -61126,9 +61993,9 @@ diff -urNp linux-3.1.3/include/media/v4l2-dev.h linux-3.1.3/include/media/v4l2-d
16820
16821 /*
16822 * Newer version of video_device, handled by videodev2.c
16823 -diff -urNp linux-3.1.3/include/media/v4l2-ioctl.h linux-3.1.3/include/media/v4l2-ioctl.h
16824 ---- linux-3.1.3/include/media/v4l2-ioctl.h 2011-11-11 15:19:27.000000000 -0500
16825 -+++ linux-3.1.3/include/media/v4l2-ioctl.h 2011-11-17 18:44:20.000000000 -0500
16826 +diff -urNp linux-3.1.4/include/media/v4l2-ioctl.h linux-3.1.4/include/media/v4l2-ioctl.h
16827 +--- linux-3.1.4/include/media/v4l2-ioctl.h 2011-11-11 15:19:27.000000000 -0500
16828 ++++ linux-3.1.4/include/media/v4l2-ioctl.h 2011-11-17 18:44:20.000000000 -0500
16829 @@ -272,7 +272,7 @@ struct v4l2_ioctl_ops {
16830 long (*vidioc_default) (struct file *file, void *fh,
16831 bool valid_prio, int cmd, void *arg);
16832 @@ -61138,9 +62005,9 @@ diff -urNp linux-3.1.3/include/media/v4l2-ioctl.h linux-3.1.3/include/media/v4l2
16833
16834 /* v4l debugging and diagnostics */
16835
16836 -diff -urNp linux-3.1.3/include/net/caif/caif_hsi.h linux-3.1.3/include/net/caif/caif_hsi.h
16837 ---- linux-3.1.3/include/net/caif/caif_hsi.h 2011-11-11 15:19:27.000000000 -0500
16838 -+++ linux-3.1.3/include/net/caif/caif_hsi.h 2011-11-16 18:39:08.000000000 -0500
16839 +diff -urNp linux-3.1.4/include/net/caif/caif_hsi.h linux-3.1.4/include/net/caif/caif_hsi.h
16840 +--- linux-3.1.4/include/net/caif/caif_hsi.h 2011-11-11 15:19:27.000000000 -0500
16841 ++++ linux-3.1.4/include/net/caif/caif_hsi.h 2011-11-16 18:39:08.000000000 -0500
16842 @@ -94,7 +94,7 @@ struct cfhsi_drv {
16843 void (*rx_done_cb) (struct cfhsi_drv *drv);
16844 void (*wake_up_cb) (struct cfhsi_drv *drv);
16845 @@ -61150,9 +62017,9 @@ diff -urNp linux-3.1.3/include/net/caif/caif_hsi.h linux-3.1.3/include/net/caif/
16846
16847 /* Structure implemented by HSI device. */
16848 struct cfhsi_dev {
16849 -diff -urNp linux-3.1.3/include/net/caif/cfctrl.h linux-3.1.3/include/net/caif/cfctrl.h
16850 ---- linux-3.1.3/include/net/caif/cfctrl.h 2011-11-11 15:19:27.000000000 -0500
16851 -+++ linux-3.1.3/include/net/caif/cfctrl.h 2011-11-16 18:39:08.000000000 -0500
16852 +diff -urNp linux-3.1.4/include/net/caif/cfctrl.h linux-3.1.4/include/net/caif/cfctrl.h
16853 +--- linux-3.1.4/include/net/caif/cfctrl.h 2011-11-11 15:19:27.000000000 -0500
16854 ++++ linux-3.1.4/include/net/caif/cfctrl.h 2011-11-16 18:39:08.000000000 -0500
16855 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
16856 void (*radioset_rsp)(void);
16857 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
16858 @@ -61173,9 +62040,9 @@ diff -urNp linux-3.1.3/include/net/caif/cfctrl.h linux-3.1.3/include/net/caif/cf
16859 struct list_head list;
16860 /* Protects from simultaneous access to first_req list */
16861 spinlock_t info_list_lock;
16862 -diff -urNp linux-3.1.3/include/net/flow.h linux-3.1.3/include/net/flow.h
16863 ---- linux-3.1.3/include/net/flow.h 2011-11-11 15:19:27.000000000 -0500
16864 -+++ linux-3.1.3/include/net/flow.h 2011-11-16 18:39:08.000000000 -0500
16865 +diff -urNp linux-3.1.4/include/net/flow.h linux-3.1.4/include/net/flow.h
16866 +--- linux-3.1.4/include/net/flow.h 2011-11-11 15:19:27.000000000 -0500
16867 ++++ linux-3.1.4/include/net/flow.h 2011-11-16 18:39:08.000000000 -0500
16868 @@ -207,6 +207,6 @@ extern struct flow_cache_object *flow_ca
16869 u8 dir, flow_resolve_t resolver, void *ctx);
16870
16871 @@ -61184,9 +62051,9 @@ diff -urNp linux-3.1.3/include/net/flow.h linux-3.1.3/include/net/flow.h
16872 +extern atomic_unchecked_t flow_cache_genid;
16873
16874 #endif
16875 -diff -urNp linux-3.1.3/include/net/inetpeer.h linux-3.1.3/include/net/inetpeer.h
16876 ---- linux-3.1.3/include/net/inetpeer.h 2011-11-11 15:19:27.000000000 -0500
16877 -+++ linux-3.1.3/include/net/inetpeer.h 2011-11-16 18:39:08.000000000 -0500
16878 +diff -urNp linux-3.1.4/include/net/inetpeer.h linux-3.1.4/include/net/inetpeer.h
16879 +--- linux-3.1.4/include/net/inetpeer.h 2011-11-11 15:19:27.000000000 -0500
16880 ++++ linux-3.1.4/include/net/inetpeer.h 2011-11-16 18:39:08.000000000 -0500
16881 @@ -47,8 +47,8 @@ struct inet_peer {
16882 */
16883 union {
16884 @@ -61212,9 +62079,9 @@ diff -urNp linux-3.1.3/include/net/inetpeer.h linux-3.1.3/include/net/inetpeer.h
16885 return new;
16886 }
16887
16888 -diff -urNp linux-3.1.3/include/net/ip_fib.h linux-3.1.3/include/net/ip_fib.h
16889 ---- linux-3.1.3/include/net/ip_fib.h 2011-11-11 15:19:27.000000000 -0500
16890 -+++ linux-3.1.3/include/net/ip_fib.h 2011-11-16 18:39:08.000000000 -0500
16891 +diff -urNp linux-3.1.4/include/net/ip_fib.h linux-3.1.4/include/net/ip_fib.h
16892 +--- linux-3.1.4/include/net/ip_fib.h 2011-11-11 15:19:27.000000000 -0500
16893 ++++ linux-3.1.4/include/net/ip_fib.h 2011-11-16 18:39:08.000000000 -0500
16894 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
16895
16896 #define FIB_RES_SADDR(net, res) \
16897 @@ -61224,9 +62091,9 @@ diff -urNp linux-3.1.3/include/net/ip_fib.h linux-3.1.3/include/net/ip_fib.h
16898 FIB_RES_NH(res).nh_saddr : \
16899 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
16900 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
16901 -diff -urNp linux-3.1.3/include/net/ip_vs.h linux-3.1.3/include/net/ip_vs.h
16902 ---- linux-3.1.3/include/net/ip_vs.h 2011-11-11 15:19:27.000000000 -0500
16903 -+++ linux-3.1.3/include/net/ip_vs.h 2011-11-16 18:39:08.000000000 -0500
16904 +diff -urNp linux-3.1.4/include/net/ip_vs.h linux-3.1.4/include/net/ip_vs.h
16905 +--- linux-3.1.4/include/net/ip_vs.h 2011-11-11 15:19:27.000000000 -0500
16906 ++++ linux-3.1.4/include/net/ip_vs.h 2011-11-16 18:39:08.000000000 -0500
16907 @@ -509,7 +509,7 @@ struct ip_vs_conn {
16908 struct ip_vs_conn *control; /* Master control connection */
16909 atomic_t n_control; /* Number of controlled ones */
16910 @@ -61245,9 +62112,9 @@ diff -urNp linux-3.1.3/include/net/ip_vs.h linux-3.1.3/include/net/ip_vs.h
16911 atomic_t weight; /* server weight */
16912
16913 atomic_t refcnt; /* reference counter */
16914 -diff -urNp linux-3.1.3/include/net/irda/ircomm_core.h linux-3.1.3/include/net/irda/ircomm_core.h
16915 ---- linux-3.1.3/include/net/irda/ircomm_core.h 2011-11-11 15:19:27.000000000 -0500
16916 -+++ linux-3.1.3/include/net/irda/ircomm_core.h 2011-11-16 18:39:08.000000000 -0500
16917 +diff -urNp linux-3.1.4/include/net/irda/ircomm_core.h linux-3.1.4/include/net/irda/ircomm_core.h
16918 +--- linux-3.1.4/include/net/irda/ircomm_core.h 2011-11-11 15:19:27.000000000 -0500
16919 ++++ linux-3.1.4/include/net/irda/ircomm_core.h 2011-11-16 18:39:08.000000000 -0500
16920 @@ -51,7 +51,7 @@ typedef struct {
16921 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
16922 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
16923 @@ -61257,9 +62124,9 @@ diff -urNp linux-3.1.3/include/net/irda/ircomm_core.h linux-3.1.3/include/net/ir
16924
16925 struct ircomm_cb {
16926 irda_queue_t queue;
16927 -diff -urNp linux-3.1.3/include/net/irda/ircomm_tty.h linux-3.1.3/include/net/irda/ircomm_tty.h
16928 ---- linux-3.1.3/include/net/irda/ircomm_tty.h 2011-11-11 15:19:27.000000000 -0500
16929 -+++ linux-3.1.3/include/net/irda/ircomm_tty.h 2011-11-16 18:39:08.000000000 -0500
16930 +diff -urNp linux-3.1.4/include/net/irda/ircomm_tty.h linux-3.1.4/include/net/irda/ircomm_tty.h
16931 +--- linux-3.1.4/include/net/irda/ircomm_tty.h 2011-11-11 15:19:27.000000000 -0500
16932 ++++ linux-3.1.4/include/net/irda/ircomm_tty.h 2011-11-16 18:39:08.000000000 -0500
16933 @@ -35,6 +35,7 @@
16934 #include <linux/termios.h>
16935 #include <linux/timer.h>
16936 @@ -61279,9 +62146,9 @@ diff -urNp linux-3.1.3/include/net/irda/ircomm_tty.h linux-3.1.3/include/net/ird
16937
16938 /* Protect concurent access to :
16939 * o self->open_count
16940 -diff -urNp linux-3.1.3/include/net/iucv/af_iucv.h linux-3.1.3/include/net/iucv/af_iucv.h
16941 ---- linux-3.1.3/include/net/iucv/af_iucv.h 2011-11-11 15:19:27.000000000 -0500
16942 -+++ linux-3.1.3/include/net/iucv/af_iucv.h 2011-11-16 18:39:08.000000000 -0500
16943 +diff -urNp linux-3.1.4/include/net/iucv/af_iucv.h linux-3.1.4/include/net/iucv/af_iucv.h
16944 +--- linux-3.1.4/include/net/iucv/af_iucv.h 2011-11-11 15:19:27.000000000 -0500
16945 ++++ linux-3.1.4/include/net/iucv/af_iucv.h 2011-11-16 18:39:08.000000000 -0500
16946 @@ -87,7 +87,7 @@ struct iucv_sock {
16947 struct iucv_sock_list {
16948 struct hlist_head head;
16949 @@ -61291,9 +62158,9 @@ diff -urNp linux-3.1.3/include/net/iucv/af_iucv.h linux-3.1.3/include/net/iucv/a
16950 };
16951
16952 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
16953 -diff -urNp linux-3.1.3/include/net/lapb.h linux-3.1.3/include/net/lapb.h
16954 ---- linux-3.1.3/include/net/lapb.h 2011-11-11 15:19:27.000000000 -0500
16955 -+++ linux-3.1.3/include/net/lapb.h 2011-11-16 18:39:08.000000000 -0500
16956 +diff -urNp linux-3.1.4/include/net/lapb.h linux-3.1.4/include/net/lapb.h
16957 +--- linux-3.1.4/include/net/lapb.h 2011-11-11 15:19:27.000000000 -0500
16958 ++++ linux-3.1.4/include/net/lapb.h 2011-11-16 18:39:08.000000000 -0500
16959 @@ -95,7 +95,7 @@ struct lapb_cb {
16960 struct sk_buff_head write_queue;
16961 struct sk_buff_head ack_queue;
16962 @@ -61303,9 +62170,9 @@ diff -urNp linux-3.1.3/include/net/lapb.h linux-3.1.3/include/net/lapb.h
16963
16964 /* FRMR control information */
16965 struct lapb_frame frmr_data;
16966 -diff -urNp linux-3.1.3/include/net/neighbour.h linux-3.1.3/include/net/neighbour.h
16967 ---- linux-3.1.3/include/net/neighbour.h 2011-11-11 15:19:27.000000000 -0500
16968 -+++ linux-3.1.3/include/net/neighbour.h 2011-11-16 18:39:08.000000000 -0500
16969 +diff -urNp linux-3.1.4/include/net/neighbour.h linux-3.1.4/include/net/neighbour.h
16970 +--- linux-3.1.4/include/net/neighbour.h 2011-11-11 15:19:27.000000000 -0500
16971 ++++ linux-3.1.4/include/net/neighbour.h 2011-11-16 18:39:08.000000000 -0500
16972 @@ -122,7 +122,7 @@ struct neigh_ops {
16973 void (*error_report)(struct neighbour *, struct sk_buff *);
16974 int (*output)(struct neighbour *, struct sk_buff *);
16975 @@ -61315,9 +62182,9 @@ diff -urNp linux-3.1.3/include/net/neighbour.h linux-3.1.3/include/net/neighbour
16976
16977 struct pneigh_entry {
16978 struct pneigh_entry *next;
16979 -diff -urNp linux-3.1.3/include/net/netlink.h linux-3.1.3/include/net/netlink.h
16980 ---- linux-3.1.3/include/net/netlink.h 2011-11-11 15:19:27.000000000 -0500
16981 -+++ linux-3.1.3/include/net/netlink.h 2011-11-16 18:39:08.000000000 -0500
16982 +diff -urNp linux-3.1.4/include/net/netlink.h linux-3.1.4/include/net/netlink.h
16983 +--- linux-3.1.4/include/net/netlink.h 2011-11-11 15:19:27.000000000 -0500
16984 ++++ linux-3.1.4/include/net/netlink.h 2011-11-16 18:39:08.000000000 -0500
16985 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
16986 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
16987 {
16988 @@ -61327,9 +62194,9 @@ diff -urNp linux-3.1.3/include/net/netlink.h linux-3.1.3/include/net/netlink.h
16989 }
16990
16991 /**
16992 -diff -urNp linux-3.1.3/include/net/netns/ipv4.h linux-3.1.3/include/net/netns/ipv4.h
16993 ---- linux-3.1.3/include/net/netns/ipv4.h 2011-11-11 15:19:27.000000000 -0500
16994 -+++ linux-3.1.3/include/net/netns/ipv4.h 2011-11-16 18:39:08.000000000 -0500
16995 +diff -urNp linux-3.1.4/include/net/netns/ipv4.h linux-3.1.4/include/net/netns/ipv4.h
16996 +--- linux-3.1.4/include/net/netns/ipv4.h 2011-11-11 15:19:27.000000000 -0500
16997 ++++ linux-3.1.4/include/net/netns/ipv4.h 2011-11-16 18:39:08.000000000 -0500
16998 @@ -56,8 +56,8 @@ struct netns_ipv4 {
16999
17000 unsigned int sysctl_ping_group_range[2];
17001 @@ -61341,9 +62208,9 @@ diff -urNp linux-3.1.3/include/net/netns/ipv4.h linux-3.1.3/include/net/netns/ip
17002
17003 #ifdef CONFIG_IP_MROUTE
17004 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
17005 -diff -urNp linux-3.1.3/include/net/sctp/sctp.h linux-3.1.3/include/net/sctp/sctp.h
17006 ---- linux-3.1.3/include/net/sctp/sctp.h 2011-11-11 15:19:27.000000000 -0500
17007 -+++ linux-3.1.3/include/net/sctp/sctp.h 2011-11-16 18:39:08.000000000 -0500
17008 +diff -urNp linux-3.1.4/include/net/sctp/sctp.h linux-3.1.4/include/net/sctp/sctp.h
17009 +--- linux-3.1.4/include/net/sctp/sctp.h 2011-11-11 15:19:27.000000000 -0500
17010 ++++ linux-3.1.4/include/net/sctp/sctp.h 2011-11-16 18:39:08.000000000 -0500
17011 @@ -318,9 +318,9 @@ do { \
17012
17013 #else /* SCTP_DEBUG */
17014 @@ -61357,9 +62224,9 @@ diff -urNp linux-3.1.3/include/net/sctp/sctp.h linux-3.1.3/include/net/sctp/sctp
17015 #define SCTP_ENABLE_DEBUG
17016 #define SCTP_DISABLE_DEBUG
17017 #define SCTP_ASSERT(expr, str, func)
17018 -diff -urNp linux-3.1.3/include/net/sock.h linux-3.1.3/include/net/sock.h
17019 ---- linux-3.1.3/include/net/sock.h 2011-11-11 15:19:27.000000000 -0500
17020 -+++ linux-3.1.3/include/net/sock.h 2011-11-16 18:39:08.000000000 -0500
17021 +diff -urNp linux-3.1.4/include/net/sock.h linux-3.1.4/include/net/sock.h
17022 +--- linux-3.1.4/include/net/sock.h 2011-11-11 15:19:27.000000000 -0500
17023 ++++ linux-3.1.4/include/net/sock.h 2011-11-16 18:39:08.000000000 -0500
17024 @@ -278,7 +278,7 @@ struct sock {
17025 #ifdef CONFIG_RPS
17026 __u32 sk_rxhash;
17027 @@ -61378,9 +62245,9 @@ diff -urNp linux-3.1.3/include/net/sock.h linux-3.1.3/include/net/sock.h
17028 int copy, int offset)
17029 {
17030 if (skb->ip_summed == CHECKSUM_NONE) {
17031 -diff -urNp linux-3.1.3/include/net/tcp.h linux-3.1.3/include/net/tcp.h
17032 ---- linux-3.1.3/include/net/tcp.h 2011-11-11 15:19:27.000000000 -0500
17033 -+++ linux-3.1.3/include/net/tcp.h 2011-11-16 18:39:08.000000000 -0500
17034 +diff -urNp linux-3.1.4/include/net/tcp.h linux-3.1.4/include/net/tcp.h
17035 +--- linux-3.1.4/include/net/tcp.h 2011-11-11 15:19:27.000000000 -0500
17036 ++++ linux-3.1.4/include/net/tcp.h 2011-11-16 18:39:08.000000000 -0500
17037 @@ -1401,8 +1401,8 @@ enum tcp_seq_states {
17038 struct tcp_seq_afinfo {
17039 char *name;
17040 @@ -61392,9 +62259,9 @@ diff -urNp linux-3.1.3/include/net/tcp.h linux-3.1.3/include/net/tcp.h
17041 };
17042
17043 struct tcp_iter_state {
17044 -diff -urNp linux-3.1.3/include/net/udp.h linux-3.1.3/include/net/udp.h
17045 ---- linux-3.1.3/include/net/udp.h 2011-11-11 15:19:27.000000000 -0500
17046 -+++ linux-3.1.3/include/net/udp.h 2011-11-16 18:39:08.000000000 -0500
17047 +diff -urNp linux-3.1.4/include/net/udp.h linux-3.1.4/include/net/udp.h
17048 +--- linux-3.1.4/include/net/udp.h 2011-11-11 15:19:27.000000000 -0500
17049 ++++ linux-3.1.4/include/net/udp.h 2011-11-16 18:39:08.000000000 -0500
17050 @@ -234,8 +234,8 @@ struct udp_seq_afinfo {
17051 char *name;
17052 sa_family_t family;
17053 @@ -61406,9 +62273,9 @@ diff -urNp linux-3.1.3/include/net/udp.h linux-3.1.3/include/net/udp.h
17054 };
17055
17056 struct udp_iter_state {
17057 -diff -urNp linux-3.1.3/include/net/xfrm.h linux-3.1.3/include/net/xfrm.h
17058 ---- linux-3.1.3/include/net/xfrm.h 2011-11-11 15:19:27.000000000 -0500
17059 -+++ linux-3.1.3/include/net/xfrm.h 2011-11-16 18:39:08.000000000 -0500
17060 +diff -urNp linux-3.1.4/include/net/xfrm.h linux-3.1.4/include/net/xfrm.h
17061 +--- linux-3.1.4/include/net/xfrm.h 2011-11-11 15:19:27.000000000 -0500
17062 ++++ linux-3.1.4/include/net/xfrm.h 2011-11-16 18:39:08.000000000 -0500
17063 @@ -505,7 +505,7 @@ struct xfrm_policy {
17064 struct timer_list timer;
17065
17066 @@ -61418,9 +62285,9 @@ diff -urNp linux-3.1.3/include/net/xfrm.h linux-3.1.3/include/net/xfrm.h
17067 u32 priority;
17068 u32 index;
17069 struct xfrm_mark mark;
17070 -diff -urNp linux-3.1.3/include/rdma/iw_cm.h linux-3.1.3/include/rdma/iw_cm.h
17071 ---- linux-3.1.3/include/rdma/iw_cm.h 2011-11-11 15:19:27.000000000 -0500
17072 -+++ linux-3.1.3/include/rdma/iw_cm.h 2011-11-16 18:39:08.000000000 -0500
17073 +diff -urNp linux-3.1.4/include/rdma/iw_cm.h linux-3.1.4/include/rdma/iw_cm.h
17074 +--- linux-3.1.4/include/rdma/iw_cm.h 2011-11-11 15:19:27.000000000 -0500
17075 ++++ linux-3.1.4/include/rdma/iw_cm.h 2011-11-16 18:39:08.000000000 -0500
17076 @@ -120,7 +120,7 @@ struct iw_cm_verbs {
17077 int backlog);
17078
17079 @@ -61430,9 +62297,9 @@ diff -urNp linux-3.1.3/include/rdma/iw_cm.h linux-3.1.3/include/rdma/iw_cm.h
17080
17081 /**
17082 * iw_create_cm_id - Create an IW CM identifier.
17083 -diff -urNp linux-3.1.3/include/scsi/libfc.h linux-3.1.3/include/scsi/libfc.h
17084 ---- linux-3.1.3/include/scsi/libfc.h 2011-11-11 15:19:27.000000000 -0500
17085 -+++ linux-3.1.3/include/scsi/libfc.h 2011-11-16 18:39:08.000000000 -0500
17086 +diff -urNp linux-3.1.4/include/scsi/libfc.h linux-3.1.4/include/scsi/libfc.h
17087 +--- linux-3.1.4/include/scsi/libfc.h 2011-11-11 15:19:27.000000000 -0500
17088 ++++ linux-3.1.4/include/scsi/libfc.h 2011-11-16 18:39:08.000000000 -0500
17089 @@ -758,6 +758,7 @@ struct libfc_function_template {
17090 */
17091 void (*disc_stop_final) (struct fc_lport *);
17092 @@ -61450,9 +62317,9 @@ diff -urNp linux-3.1.3/include/scsi/libfc.h linux-3.1.3/include/scsi/libfc.h
17093 u8 link_up;
17094 u8 qfull;
17095 enum fc_lport_state state;
17096 -diff -urNp linux-3.1.3/include/scsi/scsi_device.h linux-3.1.3/include/scsi/scsi_device.h
17097 ---- linux-3.1.3/include/scsi/scsi_device.h 2011-11-11 15:19:27.000000000 -0500
17098 -+++ linux-3.1.3/include/scsi/scsi_device.h 2011-11-16 18:39:08.000000000 -0500
17099 +diff -urNp linux-3.1.4/include/scsi/scsi_device.h linux-3.1.4/include/scsi/scsi_device.h
17100 +--- linux-3.1.4/include/scsi/scsi_device.h 2011-11-11 15:19:27.000000000 -0500
17101 ++++ linux-3.1.4/include/scsi/scsi_device.h 2011-11-16 18:39:08.000000000 -0500
17102 @@ -161,9 +161,9 @@ struct scsi_device {
17103 unsigned int max_device_blocked; /* what device_blocked counts down from */
17104 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
17105 @@ -61466,9 +62333,9 @@ diff -urNp linux-3.1.3/include/scsi/scsi_device.h linux-3.1.3/include/scsi/scsi_
17106
17107 struct device sdev_gendev,
17108 sdev_dev;
17109 -diff -urNp linux-3.1.3/include/scsi/scsi_transport_fc.h linux-3.1.3/include/scsi/scsi_transport_fc.h
17110 ---- linux-3.1.3/include/scsi/scsi_transport_fc.h 2011-11-11 15:19:27.000000000 -0500
17111 -+++ linux-3.1.3/include/scsi/scsi_transport_fc.h 2011-11-16 18:39:08.000000000 -0500
17112 +diff -urNp linux-3.1.4/include/scsi/scsi_transport_fc.h linux-3.1.4/include/scsi/scsi_transport_fc.h
17113 +--- linux-3.1.4/include/scsi/scsi_transport_fc.h 2011-11-11 15:19:27.000000000 -0500
17114 ++++ linux-3.1.4/include/scsi/scsi_transport_fc.h 2011-11-16 18:39:08.000000000 -0500
17115 @@ -711,7 +711,7 @@ struct fc_function_template {
17116 unsigned long show_host_system_hostname:1;
17117
17118 @@ -61478,9 +62345,9 @@ diff -urNp linux-3.1.3/include/scsi/scsi_transport_fc.h linux-3.1.3/include/scsi
17119
17120
17121 /**
17122 -diff -urNp linux-3.1.3/include/sound/ak4xxx-adda.h linux-3.1.3/include/sound/ak4xxx-adda.h
17123 ---- linux-3.1.3/include/sound/ak4xxx-adda.h 2011-11-11 15:19:27.000000000 -0500
17124 -+++ linux-3.1.3/include/sound/ak4xxx-adda.h 2011-11-16 18:39:08.000000000 -0500
17125 +diff -urNp linux-3.1.4/include/sound/ak4xxx-adda.h linux-3.1.4/include/sound/ak4xxx-adda.h
17126 +--- linux-3.1.4/include/sound/ak4xxx-adda.h 2011-11-11 15:19:27.000000000 -0500
17127 ++++ linux-3.1.4/include/sound/ak4xxx-adda.h 2011-11-16 18:39:08.000000000 -0500
17128 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
17129 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
17130 unsigned char val);
17131 @@ -61490,9 +62357,9 @@ diff -urNp linux-3.1.3/include/sound/ak4xxx-adda.h linux-3.1.3/include/sound/ak4
17132
17133 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
17134
17135 -diff -urNp linux-3.1.3/include/sound/hwdep.h linux-3.1.3/include/sound/hwdep.h
17136 ---- linux-3.1.3/include/sound/hwdep.h 2011-11-11 15:19:27.000000000 -0500
17137 -+++ linux-3.1.3/include/sound/hwdep.h 2011-11-16 18:39:08.000000000 -0500
17138 +diff -urNp linux-3.1.4/include/sound/hwdep.h linux-3.1.4/include/sound/hwdep.h
17139 +--- linux-3.1.4/include/sound/hwdep.h 2011-11-11 15:19:27.000000000 -0500
17140 ++++ linux-3.1.4/include/sound/hwdep.h 2011-11-16 18:39:08.000000000 -0500
17141 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
17142 struct snd_hwdep_dsp_status *status);
17143 int (*dsp_load)(struct snd_hwdep *hw,
17144 @@ -61502,9 +62369,9 @@ diff -urNp linux-3.1.3/include/sound/hwdep.h linux-3.1.3/include/sound/hwdep.h
17145
17146 struct snd_hwdep {
17147 struct snd_card *card;
17148 -diff -urNp linux-3.1.3/include/sound/info.h linux-3.1.3/include/sound/info.h
17149 ---- linux-3.1.3/include/sound/info.h 2011-11-11 15:19:27.000000000 -0500
17150 -+++ linux-3.1.3/include/sound/info.h 2011-11-16 18:39:08.000000000 -0500
17151 +diff -urNp linux-3.1.4/include/sound/info.h linux-3.1.4/include/sound/info.h
17152 +--- linux-3.1.4/include/sound/info.h 2011-11-11 15:19:27.000000000 -0500
17153 ++++ linux-3.1.4/include/sound/info.h 2011-11-16 18:39:08.000000000 -0500
17154 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
17155 struct snd_info_buffer *buffer);
17156 void (*write)(struct snd_info_entry *entry,
17157 @@ -61514,9 +62381,9 @@ diff -urNp linux-3.1.3/include/sound/info.h linux-3.1.3/include/sound/info.h
17158
17159 struct snd_info_entry_ops {
17160 int (*open)(struct snd_info_entry *entry,
17161 -diff -urNp linux-3.1.3/include/sound/pcm.h linux-3.1.3/include/sound/pcm.h
17162 ---- linux-3.1.3/include/sound/pcm.h 2011-11-11 15:19:27.000000000 -0500
17163 -+++ linux-3.1.3/include/sound/pcm.h 2011-11-16 18:39:08.000000000 -0500
17164 +diff -urNp linux-3.1.4/include/sound/pcm.h linux-3.1.4/include/sound/pcm.h
17165 +--- linux-3.1.4/include/sound/pcm.h 2011-11-11 15:19:27.000000000 -0500
17166 ++++ linux-3.1.4/include/sound/pcm.h 2011-11-16 18:39:08.000000000 -0500
17167 @@ -81,6 +81,7 @@ struct snd_pcm_ops {
17168 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
17169 int (*ack)(struct snd_pcm_substream *substream);
17170 @@ -61525,9 +62392,9 @@ diff -urNp linux-3.1.3/include/sound/pcm.h linux-3.1.3/include/sound/pcm.h
17171
17172 /*
17173 *
17174 -diff -urNp linux-3.1.3/include/sound/sb16_csp.h linux-3.1.3/include/sound/sb16_csp.h
17175 ---- linux-3.1.3/include/sound/sb16_csp.h 2011-11-11 15:19:27.000000000 -0500
17176 -+++ linux-3.1.3/include/sound/sb16_csp.h 2011-11-16 18:39:08.000000000 -0500
17177 +diff -urNp linux-3.1.4/include/sound/sb16_csp.h linux-3.1.4/include/sound/sb16_csp.h
17178 +--- linux-3.1.4/include/sound/sb16_csp.h 2011-11-11 15:19:27.000000000 -0500
17179 ++++ linux-3.1.4/include/sound/sb16_csp.h 2011-11-16 18:39:08.000000000 -0500
17180 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
17181 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
17182 int (*csp_stop) (struct snd_sb_csp * p);
17183 @@ -61537,9 +62404,9 @@ diff -urNp linux-3.1.3/include/sound/sb16_csp.h linux-3.1.3/include/sound/sb16_c
17184
17185 /*
17186 * CSP private data
17187 -diff -urNp linux-3.1.3/include/sound/soc.h linux-3.1.3/include/sound/soc.h
17188 ---- linux-3.1.3/include/sound/soc.h 2011-11-11 15:19:27.000000000 -0500
17189 -+++ linux-3.1.3/include/sound/soc.h 2011-11-16 18:39:08.000000000 -0500
17190 +diff -urNp linux-3.1.4/include/sound/soc.h linux-3.1.4/include/sound/soc.h
17191 +--- linux-3.1.4/include/sound/soc.h 2011-11-11 15:19:27.000000000 -0500
17192 ++++ linux-3.1.4/include/sound/soc.h 2011-11-16 18:39:08.000000000 -0500
17193 @@ -676,7 +676,7 @@ struct snd_soc_platform_driver {
17194 /* platform IO - used for platform DAPM */
17195 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
17196 @@ -61549,9 +62416,9 @@ diff -urNp linux-3.1.3/include/sound/soc.h linux-3.1.3/include/sound/soc.h
17197
17198 struct snd_soc_platform {
17199 const char *name;
17200 -diff -urNp linux-3.1.3/include/sound/ymfpci.h linux-3.1.3/include/sound/ymfpci.h
17201 ---- linux-3.1.3/include/sound/ymfpci.h 2011-11-11 15:19:27.000000000 -0500
17202 -+++ linux-3.1.3/include/sound/ymfpci.h 2011-11-16 18:39:08.000000000 -0500
17203 +diff -urNp linux-3.1.4/include/sound/ymfpci.h linux-3.1.4/include/sound/ymfpci.h
17204 +--- linux-3.1.4/include/sound/ymfpci.h 2011-11-11 15:19:27.000000000 -0500
17205 ++++ linux-3.1.4/include/sound/ymfpci.h 2011-11-16 18:39:08.000000000 -0500
17206 @@ -358,7 +358,7 @@ struct snd_ymfpci {
17207 spinlock_t reg_lock;
17208 spinlock_t voice_lock;
17209 @@ -61561,9 +62428,9 @@ diff -urNp linux-3.1.3/include/sound/ymfpci.h linux-3.1.3/include/sound/ymfpci.h
17210 struct snd_info_entry *proc_entry;
17211 const struct firmware *dsp_microcode;
17212 const struct firmware *controller_microcode;
17213 -diff -urNp linux-3.1.3/include/target/target_core_base.h linux-3.1.3/include/target/target_core_base.h
17214 ---- linux-3.1.3/include/target/target_core_base.h 2011-11-11 15:19:27.000000000 -0500
17215 -+++ linux-3.1.3/include/target/target_core_base.h 2011-11-16 18:39:08.000000000 -0500
17216 +diff -urNp linux-3.1.4/include/target/target_core_base.h linux-3.1.4/include/target/target_core_base.h
17217 +--- linux-3.1.4/include/target/target_core_base.h 2011-11-11 15:19:27.000000000 -0500
17218 ++++ linux-3.1.4/include/target/target_core_base.h 2011-11-16 18:39:08.000000000 -0500
17219 @@ -356,7 +356,7 @@ struct t10_reservation_ops {
17220 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
17221 int (*t10_pr_register)(struct se_cmd *);
17222 @@ -61593,9 +62460,9 @@ diff -urNp linux-3.1.3/include/target/target_core_base.h linux-3.1.3/include/tar
17223 atomic_t dev_tur_active;
17224 atomic_t execute_tasks;
17225 atomic_t dev_status_thr_count;
17226 -diff -urNp linux-3.1.3/include/trace/events/irq.h linux-3.1.3/include/trace/events/irq.h
17227 ---- linux-3.1.3/include/trace/events/irq.h 2011-11-11 15:19:27.000000000 -0500
17228 -+++ linux-3.1.3/include/trace/events/irq.h 2011-11-16 18:39:08.000000000 -0500
17229 +diff -urNp linux-3.1.4/include/trace/events/irq.h linux-3.1.4/include/trace/events/irq.h
17230 +--- linux-3.1.4/include/trace/events/irq.h 2011-11-11 15:19:27.000000000 -0500
17231 ++++ linux-3.1.4/include/trace/events/irq.h 2011-11-16 18:39:08.000000000 -0500
17232 @@ -36,7 +36,7 @@ struct softirq_action;
17233 */
17234 TRACE_EVENT(irq_handler_entry,
17235 @@ -61614,9 +62481,9 @@ diff -urNp linux-3.1.3/include/trace/events/irq.h linux-3.1.3/include/trace/even
17236
17237 TP_ARGS(irq, action, ret),
17238
17239 -diff -urNp linux-3.1.3/include/video/udlfb.h linux-3.1.3/include/video/udlfb.h
17240 ---- linux-3.1.3/include/video/udlfb.h 2011-11-11 15:19:27.000000000 -0500
17241 -+++ linux-3.1.3/include/video/udlfb.h 2011-11-16 18:39:08.000000000 -0500
17242 +diff -urNp linux-3.1.4/include/video/udlfb.h linux-3.1.4/include/video/udlfb.h
17243 +--- linux-3.1.4/include/video/udlfb.h 2011-11-11 15:19:27.000000000 -0500
17244 ++++ linux-3.1.4/include/video/udlfb.h 2011-11-16 18:39:08.000000000 -0500
17245 @@ -51,10 +51,10 @@ struct dlfb_data {
17246 int base8;
17247 u32 pseudo_palette[256];
17248 @@ -61632,9 +62499,9 @@ diff -urNp linux-3.1.3/include/video/udlfb.h linux-3.1.3/include/video/udlfb.h
17249 };
17250
17251 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
17252 -diff -urNp linux-3.1.3/include/video/uvesafb.h linux-3.1.3/include/video/uvesafb.h
17253 ---- linux-3.1.3/include/video/uvesafb.h 2011-11-11 15:19:27.000000000 -0500
17254 -+++ linux-3.1.3/include/video/uvesafb.h 2011-11-16 18:39:08.000000000 -0500
17255 +diff -urNp linux-3.1.4/include/video/uvesafb.h linux-3.1.4/include/video/uvesafb.h
17256 +--- linux-3.1.4/include/video/uvesafb.h 2011-11-11 15:19:27.000000000 -0500
17257 ++++ linux-3.1.4/include/video/uvesafb.h 2011-11-16 18:39:08.000000000 -0500
17258 @@ -177,6 +177,7 @@ struct uvesafb_par {
17259 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
17260 u8 pmi_setpal; /* PMI for palette changes */
17261 @@ -61643,9 +62510,9 @@ diff -urNp linux-3.1.3/include/video/uvesafb.h linux-3.1.3/include/video/uvesafb
17262 void *pmi_start;
17263 void *pmi_pal;
17264 u8 *vbe_state_orig; /*
17265 -diff -urNp linux-3.1.3/init/do_mounts.c linux-3.1.3/init/do_mounts.c
17266 ---- linux-3.1.3/init/do_mounts.c 2011-11-11 15:19:27.000000000 -0500
17267 -+++ linux-3.1.3/init/do_mounts.c 2011-11-16 18:39:08.000000000 -0500
17268 +diff -urNp linux-3.1.4/init/do_mounts.c linux-3.1.4/init/do_mounts.c
17269 +--- linux-3.1.4/init/do_mounts.c 2011-11-11 15:19:27.000000000 -0500
17270 ++++ linux-3.1.4/init/do_mounts.c 2011-11-16 18:39:08.000000000 -0500
17271 @@ -287,11 +287,11 @@ static void __init get_fs_names(char *pa
17272
17273 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
17274 @@ -61691,9 +62558,9 @@ diff -urNp linux-3.1.3/init/do_mounts.c linux-3.1.3/init/do_mounts.c
17275 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
17276 + sys_chroot((const char __force_user *)".");
17277 }
17278 -diff -urNp linux-3.1.3/init/do_mounts.h linux-3.1.3/init/do_mounts.h
17279 ---- linux-3.1.3/init/do_mounts.h 2011-11-11 15:19:27.000000000 -0500
17280 -+++ linux-3.1.3/init/do_mounts.h 2011-11-16 18:39:08.000000000 -0500
17281 +diff -urNp linux-3.1.4/init/do_mounts.h linux-3.1.4/init/do_mounts.h
17282 +--- linux-3.1.4/init/do_mounts.h 2011-11-11 15:19:27.000000000 -0500
17283 ++++ linux-3.1.4/init/do_mounts.h 2011-11-16 18:39:08.000000000 -0500
17284 @@ -15,15 +15,15 @@ extern int root_mountflags;
17285
17286 static inline int create_dev(char *name, dev_t dev)
17287 @@ -61722,9 +62589,9 @@ diff -urNp linux-3.1.3/init/do_mounts.h linux-3.1.3/init/do_mounts.h
17288 return 0;
17289 if (!S_ISBLK(stat.st_mode))
17290 return 0;
17291 -diff -urNp linux-3.1.3/init/do_mounts_initrd.c linux-3.1.3/init/do_mounts_initrd.c
17292 ---- linux-3.1.3/init/do_mounts_initrd.c 2011-11-11 15:19:27.000000000 -0500
17293 -+++ linux-3.1.3/init/do_mounts_initrd.c 2011-11-16 18:39:08.000000000 -0500
17294 +diff -urNp linux-3.1.4/init/do_mounts_initrd.c linux-3.1.4/init/do_mounts_initrd.c
17295 +--- linux-3.1.4/init/do_mounts_initrd.c 2011-11-11 15:19:27.000000000 -0500
17296 ++++ linux-3.1.4/init/do_mounts_initrd.c 2011-11-16 18:39:08.000000000 -0500
17297 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
17298 create_dev("/dev/root.old", Root_RAM0);
17299 /* mount initrd on rootfs' /root */
17300 @@ -61799,9 +62666,9 @@ diff -urNp linux-3.1.3/init/do_mounts_initrd.c linux-3.1.3/init/do_mounts_initrd
17301 + sys_unlink((const char __force_user *)"/initrd.image");
17302 return 0;
17303 }
17304 -diff -urNp linux-3.1.3/init/do_mounts_md.c linux-3.1.3/init/do_mounts_md.c
17305 ---- linux-3.1.3/init/do_mounts_md.c 2011-11-11 15:19:27.000000000 -0500
17306 -+++ linux-3.1.3/init/do_mounts_md.c 2011-11-16 18:39:08.000000000 -0500
17307 +diff -urNp linux-3.1.4/init/do_mounts_md.c linux-3.1.4/init/do_mounts_md.c
17308 +--- linux-3.1.4/init/do_mounts_md.c 2011-11-11 15:19:27.000000000 -0500
17309 ++++ linux-3.1.4/init/do_mounts_md.c 2011-11-16 18:39:08.000000000 -0500
17310 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
17311 partitioned ? "_d" : "", minor,
17312 md_setup_args[ent].device_names);
17313 @@ -61829,9 +62696,9 @@ diff -urNp linux-3.1.3/init/do_mounts_md.c linux-3.1.3/init/do_mounts_md.c
17314 if (fd >= 0) {
17315 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
17316 sys_close(fd);
17317 -diff -urNp linux-3.1.3/init/initramfs.c linux-3.1.3/init/initramfs.c
17318 ---- linux-3.1.3/init/initramfs.c 2011-11-11 15:19:27.000000000 -0500
17319 -+++ linux-3.1.3/init/initramfs.c 2011-11-16 18:39:08.000000000 -0500
17320 +diff -urNp linux-3.1.4/init/initramfs.c linux-3.1.4/init/initramfs.c
17321 +--- linux-3.1.4/init/initramfs.c 2011-11-11 15:19:27.000000000 -0500
17322 ++++ linux-3.1.4/init/initramfs.c 2011-11-16 18:39:08.000000000 -0500
17323 @@ -74,7 +74,7 @@ static void __init free_hash(void)
17324 }
17325 }
17326 @@ -61940,9 +62807,9 @@ diff -urNp linux-3.1.3/init/initramfs.c linux-3.1.3/init/initramfs.c
17327 state = SkipIt;
17328 next_state = Reset;
17329 return 0;
17330 -diff -urNp linux-3.1.3/init/Kconfig linux-3.1.3/init/Kconfig
17331 ---- linux-3.1.3/init/Kconfig 2011-11-11 15:19:27.000000000 -0500
17332 -+++ linux-3.1.3/init/Kconfig 2011-11-16 18:39:08.000000000 -0500
17333 +diff -urNp linux-3.1.4/init/Kconfig linux-3.1.4/init/Kconfig
17334 +--- linux-3.1.4/init/Kconfig 2011-11-11 15:19:27.000000000 -0500
17335 ++++ linux-3.1.4/init/Kconfig 2011-11-16 18:39:08.000000000 -0500
17336 @@ -1202,7 +1202,7 @@ config SLUB_DEBUG
17337
17338 config COMPAT_BRK
17339 @@ -61952,9 +62819,9 @@ diff -urNp linux-3.1.3/init/Kconfig linux-3.1.3/init/Kconfig
17340 help
17341 Randomizing heap placement makes heap exploits harder, but it
17342 also breaks ancient binaries (including anything libc5 based).
17343 -diff -urNp linux-3.1.3/init/main.c linux-3.1.3/init/main.c
17344 ---- linux-3.1.3/init/main.c 2011-11-11 15:19:27.000000000 -0500
17345 -+++ linux-3.1.3/init/main.c 2011-11-16 18:40:44.000000000 -0500
17346 +diff -urNp linux-3.1.4/init/main.c linux-3.1.4/init/main.c
17347 +--- linux-3.1.4/init/main.c 2011-11-11 15:19:27.000000000 -0500
17348 ++++ linux-3.1.4/init/main.c 2011-11-16 18:40:44.000000000 -0500
17349 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void)
17350 extern void tc_init(void);
17351 #endif
17352 @@ -62066,9 +62933,9 @@ diff -urNp linux-3.1.3/init/main.c linux-3.1.3/init/main.c
17353 /*
17354 * Ok, we have completed the initial bootup, and
17355 * we're essentially up and running. Get rid of the
17356 -diff -urNp linux-3.1.3/ipc/mqueue.c linux-3.1.3/ipc/mqueue.c
17357 ---- linux-3.1.3/ipc/mqueue.c 2011-11-11 15:19:27.000000000 -0500
17358 -+++ linux-3.1.3/ipc/mqueue.c 2011-11-16 18:40:44.000000000 -0500
17359 +diff -urNp linux-3.1.4/ipc/mqueue.c linux-3.1.4/ipc/mqueue.c
17360 +--- linux-3.1.4/ipc/mqueue.c 2011-11-11 15:19:27.000000000 -0500
17361 ++++ linux-3.1.4/ipc/mqueue.c 2011-11-16 18:40:44.000000000 -0500
17362 @@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st
17363 mq_bytes = (mq_msg_tblsz +
17364 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
17365 @@ -62077,9 +62944,9 @@ diff -urNp linux-3.1.3/ipc/mqueue.c linux-3.1.3/ipc/mqueue.c
17366 spin_lock(&mq_lock);
17367 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
17368 u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
17369 -diff -urNp linux-3.1.3/ipc/msg.c linux-3.1.3/ipc/msg.c
17370 ---- linux-3.1.3/ipc/msg.c 2011-11-11 15:19:27.000000000 -0500
17371 -+++ linux-3.1.3/ipc/msg.c 2011-11-16 18:39:08.000000000 -0500
17372 +diff -urNp linux-3.1.4/ipc/msg.c linux-3.1.4/ipc/msg.c
17373 +--- linux-3.1.4/ipc/msg.c 2011-11-11 15:19:27.000000000 -0500
17374 ++++ linux-3.1.4/ipc/msg.c 2011-11-16 18:39:08.000000000 -0500
17375 @@ -309,18 +309,19 @@ static inline int msg_security(struct ke
17376 return security_msg_queue_associate(msq, msgflg);
17377 }
17378 @@ -62105,9 +62972,9 @@ diff -urNp linux-3.1.3/ipc/msg.c linux-3.1.3/ipc/msg.c
17379 msg_params.key = key;
17380 msg_params.flg = msgflg;
17381
17382 -diff -urNp linux-3.1.3/ipc/sem.c linux-3.1.3/ipc/sem.c
17383 ---- linux-3.1.3/ipc/sem.c 2011-11-11 15:19:27.000000000 -0500
17384 -+++ linux-3.1.3/ipc/sem.c 2011-11-16 18:40:44.000000000 -0500
17385 +diff -urNp linux-3.1.4/ipc/sem.c linux-3.1.4/ipc/sem.c
17386 +--- linux-3.1.4/ipc/sem.c 2011-11-11 15:19:27.000000000 -0500
17387 ++++ linux-3.1.4/ipc/sem.c 2011-11-16 18:40:44.000000000 -0500
17388 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
17389 return 0;
17390 }
17391 @@ -62154,9 +63021,9 @@ diff -urNp linux-3.1.3/ipc/sem.c linux-3.1.3/ipc/sem.c
17392 ns = current->nsproxy->ipc_ns;
17393
17394 if (nsops < 1 || semid < 0)
17395 -diff -urNp linux-3.1.3/ipc/shm.c linux-3.1.3/ipc/shm.c
17396 ---- linux-3.1.3/ipc/shm.c 2011-11-11 15:19:27.000000000 -0500
17397 -+++ linux-3.1.3/ipc/shm.c 2011-11-16 18:40:44.000000000 -0500
17398 +diff -urNp linux-3.1.4/ipc/shm.c linux-3.1.4/ipc/shm.c
17399 +--- linux-3.1.4/ipc/shm.c 2011-11-11 15:19:27.000000000 -0500
17400 ++++ linux-3.1.4/ipc/shm.c 2011-11-16 18:40:44.000000000 -0500
17401 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
17402 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
17403 #endif
17404 @@ -62243,9 +63110,9 @@ diff -urNp linux-3.1.3/ipc/shm.c linux-3.1.3/ipc/shm.c
17405 size = i_size_read(path.dentry->d_inode);
17406 shm_unlock(shp);
17407
17408 -diff -urNp linux-3.1.3/kernel/acct.c linux-3.1.3/kernel/acct.c
17409 ---- linux-3.1.3/kernel/acct.c 2011-11-11 15:19:27.000000000 -0500
17410 -+++ linux-3.1.3/kernel/acct.c 2011-11-16 18:39:08.000000000 -0500
17411 +diff -urNp linux-3.1.4/kernel/acct.c linux-3.1.4/kernel/acct.c
17412 +--- linux-3.1.4/kernel/acct.c 2011-11-11 15:19:27.000000000 -0500
17413 ++++ linux-3.1.4/kernel/acct.c 2011-11-16 18:39:08.000000000 -0500
17414 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
17415 */
17416 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
17417 @@ -62255,9 +63122,9 @@ diff -urNp linux-3.1.3/kernel/acct.c linux-3.1.3/kernel/acct.c
17418 sizeof(acct_t), &file->f_pos);
17419 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
17420 set_fs(fs);
17421 -diff -urNp linux-3.1.3/kernel/audit.c linux-3.1.3/kernel/audit.c
17422 ---- linux-3.1.3/kernel/audit.c 2011-11-11 15:19:27.000000000 -0500
17423 -+++ linux-3.1.3/kernel/audit.c 2011-11-16 18:39:08.000000000 -0500
17424 +diff -urNp linux-3.1.4/kernel/audit.c linux-3.1.4/kernel/audit.c
17425 +--- linux-3.1.4/kernel/audit.c 2011-11-11 15:19:27.000000000 -0500
17426 ++++ linux-3.1.4/kernel/audit.c 2011-11-16 18:39:08.000000000 -0500
17427 @@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
17428 3) suppressed due to audit_rate_limit
17429 4) suppressed due to audit_backlog_limit
17430 @@ -62294,9 +63161,9 @@ diff -urNp linux-3.1.3/kernel/audit.c linux-3.1.3/kernel/audit.c
17431 status_set.backlog = skb_queue_len(&audit_skb_queue);
17432 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
17433 &status_set, sizeof(status_set));
17434 -diff -urNp linux-3.1.3/kernel/auditsc.c linux-3.1.3/kernel/auditsc.c
17435 ---- linux-3.1.3/kernel/auditsc.c 2011-11-11 15:19:27.000000000 -0500
17436 -+++ linux-3.1.3/kernel/auditsc.c 2011-11-16 18:39:08.000000000 -0500
17437 +diff -urNp linux-3.1.4/kernel/auditsc.c linux-3.1.4/kernel/auditsc.c
17438 +--- linux-3.1.4/kernel/auditsc.c 2011-11-11 15:19:27.000000000 -0500
17439 ++++ linux-3.1.4/kernel/auditsc.c 2011-11-16 18:39:08.000000000 -0500
17440 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
17441 }
17442
17443 @@ -62315,9 +63182,9 @@ diff -urNp linux-3.1.3/kernel/auditsc.c linux-3.1.3/kernel/auditsc.c
17444 struct audit_context *context = task->audit_context;
17445
17446 if (context && context->in_syscall) {
17447 -diff -urNp linux-3.1.3/kernel/capability.c linux-3.1.3/kernel/capability.c
17448 ---- linux-3.1.3/kernel/capability.c 2011-11-11 15:19:27.000000000 -0500
17449 -+++ linux-3.1.3/kernel/capability.c 2011-11-16 18:40:44.000000000 -0500
17450 +diff -urNp linux-3.1.4/kernel/capability.c linux-3.1.4/kernel/capability.c
17451 +--- linux-3.1.4/kernel/capability.c 2011-11-11 15:19:27.000000000 -0500
17452 ++++ linux-3.1.4/kernel/capability.c 2011-11-16 18:40:44.000000000 -0500
17453 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
17454 * before modification is attempted and the application
17455 * fails.
17456 @@ -62378,9 +63245,9 @@ diff -urNp linux-3.1.3/kernel/capability.c linux-3.1.3/kernel/capability.c
17457 /**
17458 * nsown_capable - Check superior capability to one's own user_ns
17459 * @cap: The capability in question
17460 -diff -urNp linux-3.1.3/kernel/cgroup.c linux-3.1.3/kernel/cgroup.c
17461 ---- linux-3.1.3/kernel/cgroup.c 2011-11-11 15:19:27.000000000 -0500
17462 -+++ linux-3.1.3/kernel/cgroup.c 2011-11-16 18:40:44.000000000 -0500
17463 +diff -urNp linux-3.1.4/kernel/cgroup.c linux-3.1.4/kernel/cgroup.c
17464 +--- linux-3.1.4/kernel/cgroup.c 2011-11-11 15:19:27.000000000 -0500
17465 ++++ linux-3.1.4/kernel/cgroup.c 2011-11-16 18:40:44.000000000 -0500
17466 @@ -595,6 +595,8 @@ static struct css_set *find_css_set(
17467 struct hlist_head *hhead;
17468 struct cg_cgroup_link *link;
17469 @@ -62390,9 +63257,9 @@ diff -urNp linux-3.1.3/kernel/cgroup.c linux-3.1.3/kernel/cgroup.c
17470 /* First see if we already have a cgroup group that matches
17471 * the desired set */
17472 read_lock(&css_set_lock);
17473 -diff -urNp linux-3.1.3/kernel/compat.c linux-3.1.3/kernel/compat.c
17474 ---- linux-3.1.3/kernel/compat.c 2011-11-11 15:19:27.000000000 -0500
17475 -+++ linux-3.1.3/kernel/compat.c 2011-11-16 18:40:44.000000000 -0500
17476 +diff -urNp linux-3.1.4/kernel/compat.c linux-3.1.4/kernel/compat.c
17477 +--- linux-3.1.4/kernel/compat.c 2011-11-11 15:19:27.000000000 -0500
17478 ++++ linux-3.1.4/kernel/compat.c 2011-11-16 18:40:44.000000000 -0500
17479 @@ -13,6 +13,7 @@
17480
17481 #include <linux/linkage.h>
17482 @@ -62558,9 +63425,9 @@ diff -urNp linux-3.1.3/kernel/compat.c linux-3.1.3/kernel/compat.c
17483 set_fs(oldfs);
17484
17485 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
17486 -diff -urNp linux-3.1.3/kernel/configs.c linux-3.1.3/kernel/configs.c
17487 ---- linux-3.1.3/kernel/configs.c 2011-11-11 15:19:27.000000000 -0500
17488 -+++ linux-3.1.3/kernel/configs.c 2011-11-16 18:40:44.000000000 -0500
17489 +diff -urNp linux-3.1.4/kernel/configs.c linux-3.1.4/kernel/configs.c
17490 +--- linux-3.1.4/kernel/configs.c 2011-11-11 15:19:27.000000000 -0500
17491 ++++ linux-3.1.4/kernel/configs.c 2011-11-16 18:40:44.000000000 -0500
17492 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
17493 struct proc_dir_entry *entry;
17494
17495 @@ -62581,9 +63448,9 @@ diff -urNp linux-3.1.3/kernel/configs.c linux-3.1.3/kernel/configs.c
17496 if (!entry)
17497 return -ENOMEM;
17498
17499 -diff -urNp linux-3.1.3/kernel/cred.c linux-3.1.3/kernel/cred.c
17500 ---- linux-3.1.3/kernel/cred.c 2011-11-11 15:19:27.000000000 -0500
17501 -+++ linux-3.1.3/kernel/cred.c 2011-11-16 18:40:44.000000000 -0500
17502 +diff -urNp linux-3.1.4/kernel/cred.c linux-3.1.4/kernel/cred.c
17503 +--- linux-3.1.4/kernel/cred.c 2011-11-11 15:19:27.000000000 -0500
17504 ++++ linux-3.1.4/kernel/cred.c 2011-11-16 18:40:44.000000000 -0500
17505 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
17506 */
17507 void __put_cred(struct cred *cred)
17508 @@ -62719,9 +63586,9 @@ diff -urNp linux-3.1.3/kernel/cred.c linux-3.1.3/kernel/cred.c
17509 ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
17510 if (ret < 0)
17511 return ret;
17512 -diff -urNp linux-3.1.3/kernel/debug/debug_core.c linux-3.1.3/kernel/debug/debug_core.c
17513 ---- linux-3.1.3/kernel/debug/debug_core.c 2011-11-11 15:19:27.000000000 -0500
17514 -+++ linux-3.1.3/kernel/debug/debug_core.c 2011-11-16 18:39:08.000000000 -0500
17515 +diff -urNp linux-3.1.4/kernel/debug/debug_core.c linux-3.1.4/kernel/debug/debug_core.c
17516 +--- linux-3.1.4/kernel/debug/debug_core.c 2011-11-11 15:19:27.000000000 -0500
17517 ++++ linux-3.1.4/kernel/debug/debug_core.c 2011-11-16 18:39:08.000000000 -0500
17518 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
17519 */
17520 static atomic_t masters_in_kgdb;
17521 @@ -62782,9 +63649,9 @@ diff -urNp linux-3.1.3/kernel/debug/debug_core.c linux-3.1.3/kernel/debug/debug_
17522 tasklet_schedule(&kgdb_tasklet_breakpoint);
17523 }
17524 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
17525 -diff -urNp linux-3.1.3/kernel/debug/kdb/kdb_main.c linux-3.1.3/kernel/debug/kdb/kdb_main.c
17526 ---- linux-3.1.3/kernel/debug/kdb/kdb_main.c 2011-11-11 15:19:27.000000000 -0500
17527 -+++ linux-3.1.3/kernel/debug/kdb/kdb_main.c 2011-11-16 18:39:08.000000000 -0500
17528 +diff -urNp linux-3.1.4/kernel/debug/kdb/kdb_main.c linux-3.1.4/kernel/debug/kdb/kdb_main.c
17529 +--- linux-3.1.4/kernel/debug/kdb/kdb_main.c 2011-11-11 15:19:27.000000000 -0500
17530 ++++ linux-3.1.4/kernel/debug/kdb/kdb_main.c 2011-11-16 18:39:08.000000000 -0500
17531 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
17532 list_for_each_entry(mod, kdb_modules, list) {
17533
17534 @@ -62803,9 +63670,9 @@ diff -urNp linux-3.1.3/kernel/debug/kdb/kdb_main.c linux-3.1.3/kernel/debug/kdb/
17535
17536 #ifdef CONFIG_MODULE_UNLOAD
17537 {
17538 -diff -urNp linux-3.1.3/kernel/events/core.c linux-3.1.3/kernel/events/core.c
17539 ---- linux-3.1.3/kernel/events/core.c 2011-11-11 15:19:27.000000000 -0500
17540 -+++ linux-3.1.3/kernel/events/core.c 2011-11-16 18:39:08.000000000 -0500
17541 +diff -urNp linux-3.1.4/kernel/events/core.c linux-3.1.4/kernel/events/core.c
17542 +--- linux-3.1.4/kernel/events/core.c 2011-11-11 15:19:27.000000000 -0500
17543 ++++ linux-3.1.4/kernel/events/core.c 2011-11-16 18:39:08.000000000 -0500
17544 @@ -172,7 +172,7 @@ int perf_proc_update_handler(struct ctl_
17545 return 0;
17546 }
17547 @@ -62901,9 +63768,9 @@ diff -urNp linux-3.1.3/kernel/events/core.c linux-3.1.3/kernel/events/core.c
17548 &parent_event->child_total_time_running);
17549
17550 /*
17551 -diff -urNp linux-3.1.3/kernel/exit.c linux-3.1.3/kernel/exit.c
17552 ---- linux-3.1.3/kernel/exit.c 2011-11-11 15:19:27.000000000 -0500
17553 -+++ linux-3.1.3/kernel/exit.c 2011-11-16 19:33:48.000000000 -0500
17554 +diff -urNp linux-3.1.4/kernel/exit.c linux-3.1.4/kernel/exit.c
17555 +--- linux-3.1.4/kernel/exit.c 2011-11-11 15:19:27.000000000 -0500
17556 ++++ linux-3.1.4/kernel/exit.c 2011-11-16 19:33:48.000000000 -0500
17557 @@ -57,6 +57,10 @@
17558 #include <asm/pgtable.h>
17559 #include <asm/mmu_context.h>
17560 @@ -63003,9 +63870,9 @@ diff -urNp linux-3.1.3/kernel/exit.c linux-3.1.3/kernel/exit.c
17561 exit_mm(tsk);
17562
17563 if (group_dead)
17564 -diff -urNp linux-3.1.3/kernel/fork.c linux-3.1.3/kernel/fork.c
17565 ---- linux-3.1.3/kernel/fork.c 2011-11-11 15:19:27.000000000 -0500
17566 -+++ linux-3.1.3/kernel/fork.c 2011-11-16 19:36:31.000000000 -0500
17567 +diff -urNp linux-3.1.4/kernel/fork.c linux-3.1.4/kernel/fork.c
17568 +--- linux-3.1.4/kernel/fork.c 2011-11-11 15:19:27.000000000 -0500
17569 ++++ linux-3.1.4/kernel/fork.c 2011-11-16 19:36:31.000000000 -0500
17570 @@ -285,7 +285,7 @@ static struct task_struct *dup_task_stru
17571 *stackend = STACK_END_MAGIC; /* for overflow detection */
17572
17573 @@ -63294,9 +64161,9 @@ diff -urNp linux-3.1.3/kernel/fork.c linux-3.1.3/kernel/fork.c
17574 new_fs = NULL;
17575 else
17576 new_fs = fs;
17577 -diff -urNp linux-3.1.3/kernel/futex.c linux-3.1.3/kernel/futex.c
17578 ---- linux-3.1.3/kernel/futex.c 2011-11-11 15:19:27.000000000 -0500
17579 -+++ linux-3.1.3/kernel/futex.c 2011-11-16 18:40:44.000000000 -0500
17580 +diff -urNp linux-3.1.4/kernel/futex.c linux-3.1.4/kernel/futex.c
17581 +--- linux-3.1.4/kernel/futex.c 2011-11-11 15:19:27.000000000 -0500
17582 ++++ linux-3.1.4/kernel/futex.c 2011-11-16 18:40:44.000000000 -0500
17583 @@ -54,6 +54,7 @@
17584 #include <linux/mount.h>
17585 #include <linux/pagemap.h>
17586 @@ -63384,9 +64251,9 @@ diff -urNp linux-3.1.3/kernel/futex.c linux-3.1.3/kernel/futex.c
17587
17588 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
17589 plist_head_init(&futex_queues[i].chain);
17590 -diff -urNp linux-3.1.3/kernel/futex_compat.c linux-3.1.3/kernel/futex_compat.c
17591 ---- linux-3.1.3/kernel/futex_compat.c 2011-11-11 15:19:27.000000000 -0500
17592 -+++ linux-3.1.3/kernel/futex_compat.c 2011-11-16 18:40:44.000000000 -0500
17593 +diff -urNp linux-3.1.4/kernel/futex_compat.c linux-3.1.4/kernel/futex_compat.c
17594 +--- linux-3.1.4/kernel/futex_compat.c 2011-11-11 15:19:27.000000000 -0500
17595 ++++ linux-3.1.4/kernel/futex_compat.c 2011-11-16 18:40:44.000000000 -0500
17596 @@ -10,6 +10,7 @@
17597 #include <linux/compat.h>
17598 #include <linux/nsproxy.h>
17599 @@ -63426,9 +64293,9 @@ diff -urNp linux-3.1.3/kernel/futex_compat.c linux-3.1.3/kernel/futex_compat.c
17600 head = p->compat_robust_list;
17601 rcu_read_unlock();
17602 }
17603 -diff -urNp linux-3.1.3/kernel/gcov/base.c linux-3.1.3/kernel/gcov/base.c
17604 ---- linux-3.1.3/kernel/gcov/base.c 2011-11-11 15:19:27.000000000 -0500
17605 -+++ linux-3.1.3/kernel/gcov/base.c 2011-11-16 18:39:08.000000000 -0500
17606 +diff -urNp linux-3.1.4/kernel/gcov/base.c linux-3.1.4/kernel/gcov/base.c
17607 +--- linux-3.1.4/kernel/gcov/base.c 2011-11-11 15:19:27.000000000 -0500
17608 ++++ linux-3.1.4/kernel/gcov/base.c 2011-11-16 18:39:08.000000000 -0500
17609 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
17610 }
17611
17612 @@ -63450,9 +64317,9 @@ diff -urNp linux-3.1.3/kernel/gcov/base.c linux-3.1.3/kernel/gcov/base.c
17613 if (prev)
17614 prev->next = info->next;
17615 else
17616 -diff -urNp linux-3.1.3/kernel/hrtimer.c linux-3.1.3/kernel/hrtimer.c
17617 ---- linux-3.1.3/kernel/hrtimer.c 2011-11-11 15:19:27.000000000 -0500
17618 -+++ linux-3.1.3/kernel/hrtimer.c 2011-11-16 18:39:08.000000000 -0500
17619 +diff -urNp linux-3.1.4/kernel/hrtimer.c linux-3.1.4/kernel/hrtimer.c
17620 +--- linux-3.1.4/kernel/hrtimer.c 2011-11-11 15:19:27.000000000 -0500
17621 ++++ linux-3.1.4/kernel/hrtimer.c 2011-11-16 18:39:08.000000000 -0500
17622 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
17623 local_irq_restore(flags);
17624 }
17625 @@ -63462,9 +64329,9 @@ diff -urNp linux-3.1.3/kernel/hrtimer.c linux-3.1.3/kernel/hrtimer.c
17626 {
17627 hrtimer_peek_ahead_timers();
17628 }
17629 -diff -urNp linux-3.1.3/kernel/jump_label.c linux-3.1.3/kernel/jump_label.c
17630 ---- linux-3.1.3/kernel/jump_label.c 2011-11-11 15:19:27.000000000 -0500
17631 -+++ linux-3.1.3/kernel/jump_label.c 2011-11-16 18:39:08.000000000 -0500
17632 +diff -urNp linux-3.1.4/kernel/jump_label.c linux-3.1.4/kernel/jump_label.c
17633 +--- linux-3.1.4/kernel/jump_label.c 2011-11-11 15:19:27.000000000 -0500
17634 ++++ linux-3.1.4/kernel/jump_label.c 2011-11-16 18:39:08.000000000 -0500
17635 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
17636
17637 size = (((unsigned long)stop - (unsigned long)start)
17638 @@ -63488,9 +64355,9 @@ diff -urNp linux-3.1.3/kernel/jump_label.c linux-3.1.3/kernel/jump_label.c
17639 }
17640
17641 static int
17642 -diff -urNp linux-3.1.3/kernel/kallsyms.c linux-3.1.3/kernel/kallsyms.c
17643 ---- linux-3.1.3/kernel/kallsyms.c 2011-11-11 15:19:27.000000000 -0500
17644 -+++ linux-3.1.3/kernel/kallsyms.c 2011-11-16 18:40:44.000000000 -0500
17645 +diff -urNp linux-3.1.4/kernel/kallsyms.c linux-3.1.4/kernel/kallsyms.c
17646 +--- linux-3.1.4/kernel/kallsyms.c 2011-11-11 15:19:27.000000000 -0500
17647 ++++ linux-3.1.4/kernel/kallsyms.c 2011-11-16 18:40:44.000000000 -0500
17648 @@ -11,6 +11,9 @@
17649 * Changed the compression method from stem compression to "table lookup"
17650 * compression (see scripts/kallsyms.c for a more complete description)
17651 @@ -63593,9 +64460,9 @@ diff -urNp linux-3.1.3/kernel/kallsyms.c linux-3.1.3/kernel/kallsyms.c
17652 if (!iter)
17653 return -ENOMEM;
17654 reset_iter(iter, 0);
17655 -diff -urNp linux-3.1.3/kernel/kexec.c linux-3.1.3/kernel/kexec.c
17656 ---- linux-3.1.3/kernel/kexec.c 2011-11-11 15:19:27.000000000 -0500
17657 -+++ linux-3.1.3/kernel/kexec.c 2011-11-16 18:39:08.000000000 -0500
17658 +diff -urNp linux-3.1.4/kernel/kexec.c linux-3.1.4/kernel/kexec.c
17659 +--- linux-3.1.4/kernel/kexec.c 2011-11-11 15:19:27.000000000 -0500
17660 ++++ linux-3.1.4/kernel/kexec.c 2011-11-16 18:39:08.000000000 -0500
17661 @@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un
17662 unsigned long flags)
17663 {
17664 @@ -63606,9 +64473,9 @@ diff -urNp linux-3.1.3/kernel/kexec.c linux-3.1.3/kernel/kexec.c
17665 unsigned long i, result;
17666
17667 /* Don't allow clients that don't understand the native
17668 -diff -urNp linux-3.1.3/kernel/kmod.c linux-3.1.3/kernel/kmod.c
17669 ---- linux-3.1.3/kernel/kmod.c 2011-11-11 15:19:27.000000000 -0500
17670 -+++ linux-3.1.3/kernel/kmod.c 2011-11-16 18:40:44.000000000 -0500
17671 +diff -urNp linux-3.1.4/kernel/kmod.c linux-3.1.4/kernel/kmod.c
17672 +--- linux-3.1.4/kernel/kmod.c 2011-11-11 15:19:27.000000000 -0500
17673 ++++ linux-3.1.4/kernel/kmod.c 2011-11-16 18:40:44.000000000 -0500
17674 @@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
17675 * If module auto-loading support is disabled then this function
17676 * becomes a no-operation.
17677 @@ -63714,9 +64581,9 @@ diff -urNp linux-3.1.3/kernel/kmod.c linux-3.1.3/kernel/kmod.c
17678
17679 /*
17680 * If ret is 0, either ____call_usermodehelper failed and the
17681 -diff -urNp linux-3.1.3/kernel/kprobes.c linux-3.1.3/kernel/kprobes.c
17682 ---- linux-3.1.3/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
17683 -+++ linux-3.1.3/kernel/kprobes.c 2011-11-16 18:39:08.000000000 -0500
17684 +diff -urNp linux-3.1.4/kernel/kprobes.c linux-3.1.4/kernel/kprobes.c
17685 +--- linux-3.1.4/kernel/kprobes.c 2011-11-11 15:19:27.000000000 -0500
17686 ++++ linux-3.1.4/kernel/kprobes.c 2011-11-16 18:39:08.000000000 -0500
17687 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
17688 * kernel image and loaded module images reside. This is required
17689 * so x86_64 can correctly handle the %rip-relative fixups.
17690 @@ -63753,9 +64620,9 @@ diff -urNp linux-3.1.3/kernel/kprobes.c linux-3.1.3/kernel/kprobes.c
17691
17692 head = &kprobe_table[i];
17693 preempt_disable();
17694 -diff -urNp linux-3.1.3/kernel/lockdep.c linux-3.1.3/kernel/lockdep.c
17695 ---- linux-3.1.3/kernel/lockdep.c 2011-11-11 15:19:27.000000000 -0500
17696 -+++ linux-3.1.3/kernel/lockdep.c 2011-11-16 18:39:08.000000000 -0500
17697 +diff -urNp linux-3.1.4/kernel/lockdep.c linux-3.1.4/kernel/lockdep.c
17698 +--- linux-3.1.4/kernel/lockdep.c 2011-11-11 15:19:27.000000000 -0500
17699 ++++ linux-3.1.4/kernel/lockdep.c 2011-11-16 18:39:08.000000000 -0500
17700 @@ -583,6 +583,10 @@ static int static_obj(void *obj)
17701 end = (unsigned long) &_end,
17702 addr = (unsigned long) obj;
17703 @@ -63784,9 +64651,9 @@ diff -urNp linux-3.1.3/kernel/lockdep.c linux-3.1.3/kernel/lockdep.c
17704 if (very_verbose(class)) {
17705 printk("\nacquire class [%p] %s", class->key, class->name);
17706 if (class->name_version > 1)
17707 -diff -urNp linux-3.1.3/kernel/lockdep_proc.c linux-3.1.3/kernel/lockdep_proc.c
17708 ---- linux-3.1.3/kernel/lockdep_proc.c 2011-11-11 15:19:27.000000000 -0500
17709 -+++ linux-3.1.3/kernel/lockdep_proc.c 2011-11-16 18:39:08.000000000 -0500
17710 +diff -urNp linux-3.1.4/kernel/lockdep_proc.c linux-3.1.4/kernel/lockdep_proc.c
17711 +--- linux-3.1.4/kernel/lockdep_proc.c 2011-11-11 15:19:27.000000000 -0500
17712 ++++ linux-3.1.4/kernel/lockdep_proc.c 2011-11-16 18:39:08.000000000 -0500
17713 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
17714
17715 static void print_name(struct seq_file *m, struct lock_class *class)
17716 @@ -63796,9 +64663,9 @@ diff -urNp linux-3.1.3/kernel/lockdep_proc.c linux-3.1.3/kernel/lockdep_proc.c
17717 const char *name = class->name;
17718
17719 if (!name) {
17720 -diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17721 ---- linux-3.1.3/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
17722 -+++ linux-3.1.3/kernel/module.c 2011-11-16 18:40:44.000000000 -0500
17723 +diff -urNp linux-3.1.4/kernel/module.c linux-3.1.4/kernel/module.c
17724 +--- linux-3.1.4/kernel/module.c 2011-11-11 15:19:27.000000000 -0500
17725 ++++ linux-3.1.4/kernel/module.c 2011-12-02 17:38:47.000000000 -0500
17726 @@ -58,6 +58,7 @@
17727 #include <linux/jump_label.h>
17728 #include <linux/pfn.h>
17729 @@ -64169,7 +65036,31 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17730 mutex_unlock(&module_mutex);
17731 }
17732 return ret;
17733 -@@ -2589,7 +2626,7 @@ static int move_module(struct module *mo
17734 +@@ -2474,8 +2511,14 @@ static struct module *setup_load_info(st
17735 + static int check_modinfo(struct module *mod, struct load_info *info)
17736 + {
17737 + const char *modmagic = get_modinfo(info, "vermagic");
17738 ++ const char *license = get_modinfo(info, "license");
17739 + int err;
17740 +
17741 ++#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
17742 ++ if (!license || !license_is_gpl_compatible(license))
17743 ++ return -ENOEXEC;
17744 ++#endif
17745 ++
17746 + /* This is allowed: modprobe --force will invalidate it. */
17747 + if (!modmagic) {
17748 + err = try_to_force_load(mod, "bad vermagic");
17749 +@@ -2495,7 +2538,7 @@ static int check_modinfo(struct module *
17750 + }
17751 +
17752 + /* Set up license info based on the info section */
17753 +- set_license(mod, get_modinfo(info, "license"));
17754 ++ set_license(mod, license);
17755 +
17756 + return 0;
17757 + }
17758 +@@ -2589,7 +2632,7 @@ static int move_module(struct module *mo
17759 void *ptr;
17760
17761 /* Do the allocs. */
17762 @@ -64178,7 +65069,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17763 /*
17764 * The pointer to this block is stored in the module structure
17765 * which is inside the block. Just mark it as not being a
17766 -@@ -2599,23 +2636,50 @@ static int move_module(struct module *mo
17767 +@@ -2599,23 +2642,50 @@ static int move_module(struct module *mo
17768 if (!ptr)
17769 return -ENOMEM;
17770
17771 @@ -64201,10 +65092,8 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17772 + kmemleak_not_leak(ptr);
17773 + if (!ptr && mod->init_size_rw) {
17774 + module_free(mod, mod->module_core_rw);
17775 - return -ENOMEM;
17776 - }
17777 -- memset(ptr, 0, mod->init_size);
17778 -- mod->module_init = ptr;
17779 ++ return -ENOMEM;
17780 ++ }
17781 + memset(ptr, 0, mod->init_size_rw);
17782 + mod->module_init_rw = ptr;
17783 +
17784 @@ -64213,8 +65102,10 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17785 + if (!ptr) {
17786 + module_free(mod, mod->module_init_rw);
17787 + module_free(mod, mod->module_core_rw);
17788 -+ return -ENOMEM;
17789 -+ }
17790 + return -ENOMEM;
17791 + }
17792 +- memset(ptr, 0, mod->init_size);
17793 +- mod->module_init = ptr;
17794 +
17795 + pax_open_kernel();
17796 + memset(ptr, 0, mod->core_size_rx);
17797 @@ -64237,7 +65128,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17798
17799 /* Transfer each section which specifies SHF_ALLOC */
17800 DEBUGP("final section addresses:\n");
17801 -@@ -2626,16 +2690,45 @@ static int move_module(struct module *mo
17802 +@@ -2626,16 +2696,45 @@ static int move_module(struct module *mo
17803 if (!(shdr->sh_flags & SHF_ALLOC))
17804 continue;
17805
17806 @@ -64290,7 +65181,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17807 DEBUGP("\t0x%lx %s\n",
17808 shdr->sh_addr, info->secstrings + shdr->sh_name);
17809 }
17810 -@@ -2686,12 +2779,12 @@ static void flush_module_icache(const st
17811 +@@ -2686,12 +2785,12 @@ static void flush_module_icache(const st
17812 * Do it before processing of module parameters, so the module
17813 * can provide parameter accessor functions of its own.
17814 */
17815 @@ -64309,7 +65200,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17816
17817 set_fs(old_fs);
17818 }
17819 -@@ -2771,8 +2864,10 @@ static void module_deallocate(struct mod
17820 +@@ -2771,8 +2870,10 @@ static void module_deallocate(struct mod
17821 {
17822 kfree(info->strmap);
17823 percpu_modfree(mod);
17824 @@ -64322,7 +65213,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17825 }
17826
17827 int __weak module_finalize(const Elf_Ehdr *hdr,
17828 -@@ -2836,9 +2931,38 @@ static struct module *load_module(void _
17829 +@@ -2836,9 +2937,38 @@ static struct module *load_module(void _
17830 if (err)
17831 goto free_unload;
17832
17833 @@ -64361,7 +65252,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17834 /* Fix up syms, so that st_value is a pointer to location. */
17835 err = simplify_symbols(mod, &info);
17836 if (err < 0)
17837 -@@ -2854,13 +2978,6 @@ static struct module *load_module(void _
17838 +@@ -2854,13 +2984,6 @@ static struct module *load_module(void _
17839
17840 flush_module_icache(mod);
17841
17842 @@ -64375,7 +65266,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17843 /* Mark state as coming so strong_try_module_get() ignores us. */
17844 mod->state = MODULE_STATE_COMING;
17845
17846 -@@ -2920,11 +3037,10 @@ static struct module *load_module(void _
17847 +@@ -2920,11 +3043,10 @@ static struct module *load_module(void _
17848 unlock:
17849 mutex_unlock(&module_mutex);
17850 synchronize_sched();
17851 @@ -64388,7 +65279,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17852 free_unload:
17853 module_unload_free(mod);
17854 free_module:
17855 -@@ -2965,16 +3081,16 @@ SYSCALL_DEFINE3(init_module, void __user
17856 +@@ -2965,16 +3087,16 @@ SYSCALL_DEFINE3(init_module, void __user
17857 MODULE_STATE_COMING, mod);
17858
17859 /* Set RO and NX regions for core */
17860 @@ -64413,7 +65304,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17861
17862 do_mod_ctors(mod);
17863 /* Start the module */
17864 -@@ -3020,11 +3136,12 @@ SYSCALL_DEFINE3(init_module, void __user
17865 +@@ -3020,11 +3142,12 @@ SYSCALL_DEFINE3(init_module, void __user
17866 mod->strtab = mod->core_strtab;
17867 #endif
17868 unset_module_init_ro_nx(mod);
17869 @@ -64431,7 +65322,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17870 mutex_unlock(&module_mutex);
17871
17872 return 0;
17873 -@@ -3055,10 +3172,16 @@ static const char *get_ksymbol(struct mo
17874 +@@ -3055,10 +3178,16 @@ static const char *get_ksymbol(struct mo
17875 unsigned long nextval;
17876
17877 /* At worse, next value is at end of module */
17878 @@ -64451,7 +65342,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17879
17880 /* Scan for closest preceding symbol, and next symbol. (ELF
17881 starts real symbols at 1). */
17882 -@@ -3304,7 +3427,7 @@ static int m_show(struct seq_file *m, vo
17883 +@@ -3304,7 +3433,7 @@ static int m_show(struct seq_file *m, vo
17884 char buf[8];
17885
17886 seq_printf(m, "%s %u",
17887 @@ -64460,7 +65351,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17888 print_unload_info(m, mod);
17889
17890 /* Informative for users. */
17891 -@@ -3313,7 +3436,7 @@ static int m_show(struct seq_file *m, vo
17892 +@@ -3313,7 +3442,7 @@ static int m_show(struct seq_file *m, vo
17893 mod->state == MODULE_STATE_COMING ? "Loading":
17894 "Live");
17895 /* Used by oprofile and other similar tools. */
17896 @@ -64469,7 +65360,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17897
17898 /* Taints info */
17899 if (mod->taints)
17900 -@@ -3349,7 +3472,17 @@ static const struct file_operations proc
17901 +@@ -3349,7 +3478,17 @@ static const struct file_operations proc
17902
17903 static int __init proc_modules_init(void)
17904 {
17905 @@ -64487,7 +65378,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17906 return 0;
17907 }
17908 module_init(proc_modules_init);
17909 -@@ -3408,12 +3541,12 @@ struct module *__module_address(unsigned
17910 +@@ -3408,12 +3547,12 @@ struct module *__module_address(unsigned
17911 {
17912 struct module *mod;
17913
17914 @@ -64503,7 +65394,7 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17915 return mod;
17916 return NULL;
17917 }
17918 -@@ -3447,11 +3580,20 @@ bool is_module_text_address(unsigned lon
17919 +@@ -3447,11 +3586,20 @@ bool is_module_text_address(unsigned lon
17920 */
17921 struct module *__module_text_address(unsigned long addr)
17922 {
17923 @@ -64527,9 +65418,9 @@ diff -urNp linux-3.1.3/kernel/module.c linux-3.1.3/kernel/module.c
17924 mod = NULL;
17925 }
17926 return mod;
17927 -diff -urNp linux-3.1.3/kernel/mutex.c linux-3.1.3/kernel/mutex.c
17928 ---- linux-3.1.3/kernel/mutex.c 2011-11-11 15:19:27.000000000 -0500
17929 -+++ linux-3.1.3/kernel/mutex.c 2011-11-16 18:39:08.000000000 -0500
17930 +diff -urNp linux-3.1.4/kernel/mutex.c linux-3.1.4/kernel/mutex.c
17931 +--- linux-3.1.4/kernel/mutex.c 2011-11-11 15:19:27.000000000 -0500
17932 ++++ linux-3.1.4/kernel/mutex.c 2011-11-16 18:39:08.000000000 -0500
17933 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock,
17934 spin_lock_mutex(&lock->wait_lock, flags);
17935
17936 @@ -64558,9 +65449,9 @@ diff -urNp linux-3.1.3/kernel/mutex.c linux-3.1.3/kernel/mutex.c
17937 mutex_set_owner(lock);
17938
17939 /* set it to 0 if there are no waiters left: */
17940 -diff -urNp linux-3.1.3/kernel/mutex-debug.c linux-3.1.3/kernel/mutex-debug.c
17941 ---- linux-3.1.3/kernel/mutex-debug.c 2011-11-11 15:19:27.000000000 -0500
17942 -+++ linux-3.1.3/kernel/mutex-debug.c 2011-11-16 18:39:08.000000000 -0500
17943 +diff -urNp linux-3.1.4/kernel/mutex-debug.c linux-3.1.4/kernel/mutex-debug.c
17944 +--- linux-3.1.4/kernel/mutex-debug.c 2011-11-11 15:19:27.000000000 -0500
17945 ++++ linux-3.1.4/kernel/mutex-debug.c 2011-11-16 18:39:08.000000000 -0500
17946 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
17947 }
17948
17949 @@ -64589,9 +65480,9 @@ diff -urNp linux-3.1.3/kernel/mutex-debug.c linux-3.1.3/kernel/mutex-debug.c
17950
17951 list_del_init(&waiter->list);
17952 waiter->task = NULL;
17953 -diff -urNp linux-3.1.3/kernel/mutex-debug.h linux-3.1.3/kernel/mutex-debug.h
17954 ---- linux-3.1.3/kernel/mutex-debug.h 2011-11-11 15:19:27.000000000 -0500
17955 -+++ linux-3.1.3/kernel/mutex-debug.h 2011-11-16 18:39:08.000000000 -0500
17956 +diff -urNp linux-3.1.4/kernel/mutex-debug.h linux-3.1.4/kernel/mutex-debug.h
17957 +--- linux-3.1.4/kernel/mutex-debug.h 2011-11-11 15:19:27.000000000 -0500
17958 ++++ linux-3.1.4/kernel/mutex-debug.h 2011-11-16 18:39:08.000000000 -0500
17959 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru
17960 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
17961 extern void debug_mutex_add_waiter(struct mutex *lock,
17962 @@ -64604,9 +65495,9 @@ diff -urNp linux-3.1.3/kernel/mutex-debug.h linux-3.1.3/kernel/mutex-debug.h
17963 extern void debug_mutex_unlock(struct mutex *lock);
17964 extern void debug_mutex_init(struct mutex *lock, const char *name,
17965 struct lock_class_key *key);
17966 -diff -urNp linux-3.1.3/kernel/padata.c linux-3.1.3/kernel/padata.c
17967 ---- linux-3.1.3/kernel/padata.c 2011-11-11 15:19:27.000000000 -0500
17968 -+++ linux-3.1.3/kernel/padata.c 2011-11-16 18:39:08.000000000 -0500
17969 +diff -urNp linux-3.1.4/kernel/padata.c linux-3.1.4/kernel/padata.c
17970 +--- linux-3.1.4/kernel/padata.c 2011-11-11 15:19:27.000000000 -0500
17971 ++++ linux-3.1.4/kernel/padata.c 2011-11-16 18:39:08.000000000 -0500
17972 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
17973 padata->pd = pd;
17974 padata->cb_cpu = cb_cpu;
17975 @@ -64630,9 +65521,9 @@ diff -urNp linux-3.1.3/kernel/padata.c linux-3.1.3/kernel/padata.c
17976 atomic_set(&pd->reorder_objects, 0);
17977 atomic_set(&pd->refcnt, 0);
17978 pd->pinst = pinst;
17979 -diff -urNp linux-3.1.3/kernel/panic.c linux-3.1.3/kernel/panic.c
17980 ---- linux-3.1.3/kernel/panic.c 2011-11-11 15:19:27.000000000 -0500
17981 -+++ linux-3.1.3/kernel/panic.c 2011-11-16 18:40:44.000000000 -0500
17982 +diff -urNp linux-3.1.4/kernel/panic.c linux-3.1.4/kernel/panic.c
17983 +--- linux-3.1.4/kernel/panic.c 2011-11-11 15:19:27.000000000 -0500
17984 ++++ linux-3.1.4/kernel/panic.c 2011-11-16 18:40:44.000000000 -0500
17985 @@ -371,7 +371,7 @@ static void warn_slowpath_common(const c
17986 const char *board;
17987
17988 @@ -64652,9 +65543,9 @@ diff -urNp linux-3.1.3/kernel/panic.c linux-3.1.3/kernel/panic.c
17989 __builtin_return_address(0));
17990 }
17991 EXPORT_SYMBOL(__stack_chk_fail);
17992 -diff -urNp linux-3.1.3/kernel/pid.c linux-3.1.3/kernel/pid.c
17993 ---- linux-3.1.3/kernel/pid.c 2011-11-11 15:19:27.000000000 -0500
17994 -+++ linux-3.1.3/kernel/pid.c 2011-11-16 18:40:44.000000000 -0500
17995 +diff -urNp linux-3.1.4/kernel/pid.c linux-3.1.4/kernel/pid.c
17996 +--- linux-3.1.4/kernel/pid.c 2011-11-11 15:19:27.000000000 -0500
17997 ++++ linux-3.1.4/kernel/pid.c 2011-11-16 18:40:44.000000000 -0500
17998 @@ -33,6 +33,7 @@
17999 #include <linux/rculist.h>
18000 #include <linux/bootmem.h>
18001 @@ -64702,9 +65593,9 @@ diff -urNp linux-3.1.3/kernel/pid.c linux-3.1.3/kernel/pid.c
18002 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
18003 {
18004 struct pid *pid;
18005 -diff -urNp linux-3.1.3/kernel/posix-cpu-timers.c linux-3.1.3/kernel/posix-cpu-timers.c
18006 ---- linux-3.1.3/kernel/posix-cpu-timers.c 2011-11-11 15:19:27.000000000 -0500
18007 -+++ linux-3.1.3/kernel/posix-cpu-timers.c 2011-11-16 18:40:44.000000000 -0500
18008 +diff -urNp linux-3.1.4/kernel/posix-cpu-timers.c linux-3.1.4/kernel/posix-cpu-timers.c
18009 +--- linux-3.1.4/kernel/posix-cpu-timers.c 2011-11-11 15:19:27.000000000 -0500
18010 ++++ linux-3.1.4/kernel/posix-cpu-timers.c 2011-11-16 18:40:44.000000000 -0500
18011 @@ -6,6 +6,7 @@
18012 #include <linux/posix-timers.h>
18013 #include <linux/errno.h>
18014 @@ -64730,9 +65621,9 @@ diff -urNp linux-3.1.3/kernel/posix-cpu-timers.c linux-3.1.3/kernel/posix-cpu-ti
18015 .clock_getres = thread_cpu_clock_getres,
18016 .clock_get = thread_cpu_clock_get,
18017 .timer_create = thread_cpu_timer_create,
18018 -diff -urNp linux-3.1.3/kernel/posix-timers.c linux-3.1.3/kernel/posix-timers.c
18019 ---- linux-3.1.3/kernel/posix-timers.c 2011-11-11 15:19:27.000000000 -0500
18020 -+++ linux-3.1.3/kernel/posix-timers.c 2011-11-16 18:40:44.000000000 -0500
18021 +diff -urNp linux-3.1.4/kernel/posix-timers.c linux-3.1.4/kernel/posix-timers.c
18022 +--- linux-3.1.4/kernel/posix-timers.c 2011-11-11 15:19:27.000000000 -0500
18023 ++++ linux-3.1.4/kernel/posix-timers.c 2011-11-16 18:40:44.000000000 -0500
18024 @@ -43,6 +43,7 @@
18025 #include <linux/idr.h>
18026 #include <linux/posix-clock.h>
18027 @@ -64836,9 +65727,9 @@ diff -urNp linux-3.1.3/kernel/posix-timers.c linux-3.1.3/kernel/posix-timers.c
18028 return kc->clock_set(which_clock, &new_tp);
18029 }
18030
18031 -diff -urNp linux-3.1.3/kernel/power/poweroff.c linux-3.1.3/kernel/power/poweroff.c
18032 ---- linux-3.1.3/kernel/power/poweroff.c 2011-11-11 15:19:27.000000000 -0500
18033 -+++ linux-3.1.3/kernel/power/poweroff.c 2011-11-16 18:39:08.000000000 -0500
18034 +diff -urNp linux-3.1.4/kernel/power/poweroff.c linux-3.1.4/kernel/power/poweroff.c
18035 +--- linux-3.1.4/kernel/power/poweroff.c 2011-11-11 15:19:27.000000000 -0500
18036 ++++ linux-3.1.4/kernel/power/poweroff.c 2011-11-16 18:39:08.000000000 -0500
18037 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
18038 .enable_mask = SYSRQ_ENABLE_BOOT,
18039 };
18040 @@ -64848,9 +65739,9 @@ diff -urNp linux-3.1.3/kernel/power/poweroff.c linux-3.1.3/kernel/power/poweroff
18041 {
18042 register_sysrq_key('o', &sysrq_poweroff_op);
18043 return 0;
18044 -diff -urNp linux-3.1.3/kernel/power/process.c linux-3.1.3/kernel/power/process.c
18045 ---- linux-3.1.3/kernel/power/process.c 2011-11-11 15:19:27.000000000 -0500
18046 -+++ linux-3.1.3/kernel/power/process.c 2011-11-16 18:39:08.000000000 -0500
18047 +diff -urNp linux-3.1.4/kernel/power/process.c linux-3.1.4/kernel/power/process.c
18048 +--- linux-3.1.4/kernel/power/process.c 2011-11-11 15:19:27.000000000 -0500
18049 ++++ linux-3.1.4/kernel/power/process.c 2011-11-16 18:39:08.000000000 -0500
18050 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
18051 u64 elapsed_csecs64;
18052 unsigned int elapsed_csecs;
18053 @@ -64893,9 +65784,9 @@ diff -urNp linux-3.1.3/kernel/power/process.c linux-3.1.3/kernel/power/process.c
18054 break;
18055
18056 if (pm_wakeup_pending()) {
18057 -diff -urNp linux-3.1.3/kernel/printk.c linux-3.1.3/kernel/printk.c
18058 ---- linux-3.1.3/kernel/printk.c 2011-11-11 15:19:27.000000000 -0500
18059 -+++ linux-3.1.3/kernel/printk.c 2011-11-16 19:38:11.000000000 -0500
18060 +diff -urNp linux-3.1.4/kernel/printk.c linux-3.1.4/kernel/printk.c
18061 +--- linux-3.1.4/kernel/printk.c 2011-11-11 15:19:27.000000000 -0500
18062 ++++ linux-3.1.4/kernel/printk.c 2011-11-16 19:38:11.000000000 -0500
18063 @@ -313,6 +313,11 @@ static int check_syslog_permissions(int
18064 if (from_file && type != SYSLOG_ACTION_OPEN)
18065 return 0;
18066 @@ -64908,9 +65799,9 @@ diff -urNp linux-3.1.3/kernel/printk.c linux-3.1.3/kernel/printk.c
18067 if (syslog_action_restricted(type)) {
18068 if (capable(CAP_SYSLOG))
18069 return 0;
18070 -diff -urNp linux-3.1.3/kernel/profile.c linux-3.1.3/kernel/profile.c
18071 ---- linux-3.1.3/kernel/profile.c 2011-11-11 15:19:27.000000000 -0500
18072 -+++ linux-3.1.3/kernel/profile.c 2011-11-16 18:39:08.000000000 -0500
18073 +diff -urNp linux-3.1.4/kernel/profile.c linux-3.1.4/kernel/profile.c
18074 +--- linux-3.1.4/kernel/profile.c 2011-11-11 15:19:27.000000000 -0500
18075 ++++ linux-3.1.4/kernel/profile.c 2011-11-16 18:39:08.000000000 -0500
18076 @@ -39,7 +39,7 @@ struct profile_hit {
18077 /* Oprofile timer tick hook */
18078 static int (*timer_hook)(struct pt_regs *) __read_mostly;
18079 @@ -64968,9 +65859,9 @@ diff -urNp linux-3.1.3/kernel/profile.c linux-3.1.3/kernel/profile.c
18080 return count;
18081 }
18082
18083 -diff -urNp linux-3.1.3/kernel/ptrace.c linux-3.1.3/kernel/ptrace.c
18084 ---- linux-3.1.3/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
18085 -+++ linux-3.1.3/kernel/ptrace.c 2011-11-16 19:50:22.000000000 -0500
18086 +diff -urNp linux-3.1.4/kernel/ptrace.c linux-3.1.4/kernel/ptrace.c
18087 +--- linux-3.1.4/kernel/ptrace.c 2011-11-11 15:19:27.000000000 -0500
18088 ++++ linux-3.1.4/kernel/ptrace.c 2011-11-16 19:50:22.000000000 -0500
18089 @@ -161,7 +161,8 @@ int ptrace_check_attach(struct task_stru
18090 return ret;
18091 }
18092 @@ -65143,9 +66034,9 @@ diff -urNp linux-3.1.3/kernel/ptrace.c linux-3.1.3/kernel/ptrace.c
18093 goto out_put_task_struct;
18094 }
18095
18096 -diff -urNp linux-3.1.3/kernel/rcutorture.c linux-3.1.3/kernel/rcutorture.c
18097 ---- linux-3.1.3/kernel/rcutorture.c 2011-11-11 15:19:27.000000000 -0500
18098 -+++ linux-3.1.3/kernel/rcutorture.c 2011-11-16 18:39:08.000000000 -0500
18099 +diff -urNp linux-3.1.4/kernel/rcutorture.c linux-3.1.4/kernel/rcutorture.c
18100 +--- linux-3.1.4/kernel/rcutorture.c 2011-11-11 15:19:27.000000000 -0500
18101 ++++ linux-3.1.4/kernel/rcutorture.c 2011-11-16 18:39:08.000000000 -0500
18102 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
18103 { 0 };
18104 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
18105 @@ -65306,9 +66197,9 @@ diff -urNp linux-3.1.3/kernel/rcutorture.c linux-3.1.3/kernel/rcutorture.c
18106 for_each_possible_cpu(cpu) {
18107 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
18108 per_cpu(rcu_torture_count, cpu)[i] = 0;
18109 -diff -urNp linux-3.1.3/kernel/rcutree.c linux-3.1.3/kernel/rcutree.c
18110 ---- linux-3.1.3/kernel/rcutree.c 2011-11-11 15:19:27.000000000 -0500
18111 -+++ linux-3.1.3/kernel/rcutree.c 2011-11-16 18:39:08.000000000 -0500
18112 +diff -urNp linux-3.1.4/kernel/rcutree.c linux-3.1.4/kernel/rcutree.c
18113 +--- linux-3.1.4/kernel/rcutree.c 2011-11-11 15:19:27.000000000 -0500
18114 ++++ linux-3.1.4/kernel/rcutree.c 2011-11-16 18:39:08.000000000 -0500
18115 @@ -356,9 +356,9 @@ void rcu_enter_nohz(void)
18116 }
18117 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
18118 @@ -65391,9 +66282,9 @@ diff -urNp linux-3.1.3/kernel/rcutree.c linux-3.1.3/kernel/rcutree.c
18119 {
18120 __rcu_process_callbacks(&rcu_sched_state,
18121 &__get_cpu_var(rcu_sched_data));
18122 -diff -urNp linux-3.1.3/kernel/rcutree.h linux-3.1.3/kernel/rcutree.h
18123 ---- linux-3.1.3/kernel/rcutree.h 2011-11-11 15:19:27.000000000 -0500
18124 -+++ linux-3.1.3/kernel/rcutree.h 2011-11-16 18:39:08.000000000 -0500
18125 +diff -urNp linux-3.1.4/kernel/rcutree.h linux-3.1.4/kernel/rcutree.h
18126 +--- linux-3.1.4/kernel/rcutree.h 2011-11-11 15:19:27.000000000 -0500
18127 ++++ linux-3.1.4/kernel/rcutree.h 2011-11-16 18:39:08.000000000 -0500
18128 @@ -86,7 +86,7 @@
18129 struct rcu_dynticks {
18130 int dynticks_nesting; /* Track irq/process nesting level. */
18131 @@ -65403,9 +66294,9 @@ diff -urNp linux-3.1.3/kernel/rcutree.h linux-3.1.3/kernel/rcutree.h
18132 };
18133
18134 /* RCU's kthread states for tracing. */
18135 -diff -urNp linux-3.1.3/kernel/rcutree_plugin.h linux-3.1.3/kernel/rcutree_plugin.h
18136 ---- linux-3.1.3/kernel/rcutree_plugin.h 2011-11-11 15:19:27.000000000 -0500
18137 -+++ linux-3.1.3/kernel/rcutree_plugin.h 2011-11-16 18:39:08.000000000 -0500
18138 +diff -urNp linux-3.1.4/kernel/rcutree_plugin.h linux-3.1.4/kernel/rcutree_plugin.h
18139 +--- linux-3.1.4/kernel/rcutree_plugin.h 2011-11-11 15:19:27.000000000 -0500
18140 ++++ linux-3.1.4/kernel/rcutree_plugin.h 2011-12-02 17:38:47.000000000 -0500
18141 @@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
18142
18143 /* Clean up and exit. */
18144 @@ -65468,9 +66359,39 @@ diff -urNp linux-3.1.3/kernel/rcutree_plugin.h linux-3.1.3/kernel/rcutree_plugin
18145
18146 put_online_cpus();
18147 }
18148 -diff -urNp linux-3.1.3/kernel/relay.c linux-3.1.3/kernel/relay.c
18149 ---- linux-3.1.3/kernel/relay.c 2011-11-11 15:19:27.000000000 -0500
18150 -+++ linux-3.1.3/kernel/relay.c 2011-11-16 18:40:44.000000000 -0500
18151 +@@ -1953,7 +1953,7 @@ int rcu_needs_cpu(int cpu)
18152 + for_each_online_cpu(thatcpu) {
18153 + if (thatcpu == cpu)
18154 + continue;
18155 +- snap = atomic_add_return(0, &per_cpu(rcu_dynticks,
18156 ++ snap = atomic_add_return_unchecked(0, &per_cpu(rcu_dynticks,
18157 + thatcpu).dynticks);
18158 + smp_mb(); /* Order sampling of snap with end of grace period. */
18159 + if ((snap & 0x1) != 0) {
18160 +diff -urNp linux-3.1.4/kernel/rcutree_trace.c linux-3.1.4/kernel/rcutree_trace.c
18161 +--- linux-3.1.4/kernel/rcutree_trace.c 2011-11-11 15:19:27.000000000 -0500
18162 ++++ linux-3.1.4/kernel/rcutree_trace.c 2011-12-02 17:38:47.000000000 -0500
18163 +@@ -74,7 +74,7 @@ static void print_one_rcu_data(struct se
18164 + rdp->qs_pending);
18165 + #ifdef CONFIG_NO_HZ
18166 + seq_printf(m, " dt=%d/%d/%d df=%lu",
18167 +- atomic_read(&rdp->dynticks->dynticks),
18168 ++ atomic_read_unchecked(&rdp->dynticks->dynticks),
18169 + rdp->dynticks->dynticks_nesting,
18170 + rdp->dynticks->dynticks_nmi_nesting,
18171 + rdp->dynticks_fqs);
18172 +@@ -148,7 +148,7 @@ static void print_one_rcu_data_csv(struc
18173 + rdp->qs_pending);
18174 + #ifdef CONFIG_NO_HZ
18175 + seq_printf(m, ",%d,%d,%d,%lu",
18176 +- atomic_read(&rdp->dynticks->dynticks),
18177 ++ atomic_read_unchecked(&rdp->dynticks->dynticks),
18178 + rdp->dynticks->dynticks_nesting,
18179 + rdp->dynticks->dynticks_nmi_nesting,
18180 + rdp->dynticks_fqs);
18181 +diff -urNp linux-3.1.4/kernel/relay.c linux-3.1.4/kernel/relay.c
18182 +--- linux-3.1.4/kernel/relay.c 2011-11-11 15:19:27.000000000 -0500
18183 ++++ linux-3.1.4/kernel/relay.c 2011-11-16 18:40:44.000000000 -0500
18184 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
18185 };
18186 ssize_t ret;
18187 @@ -65480,9 +66401,9 @@ diff -urNp linux-3.1.3/kernel/relay.c linux-3.1.3/kernel/relay.c
18188 if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
18189 return 0;
18190 if (splice_grow_spd(pipe, &spd))
18191 -diff -urNp linux-3.1.3/kernel/resource.c linux-3.1.3/kernel/resource.c
18192 ---- linux-3.1.3/kernel/resource.c 2011-11-11 15:19:27.000000000 -0500
18193 -+++ linux-3.1.3/kernel/resource.c 2011-11-16 18:40:44.000000000 -0500
18194 +diff -urNp linux-3.1.4/kernel/resource.c linux-3.1.4/kernel/resource.c
18195 +--- linux-3.1.4/kernel/resource.c 2011-11-11 15:19:27.000000000 -0500
18196 ++++ linux-3.1.4/kernel/resource.c 2011-11-16 18:40:44.000000000 -0500
18197 @@ -141,8 +141,18 @@ static const struct file_operations proc
18198
18199 static int __init ioresources_init(void)
18200 @@ -65502,9 +66423,9 @@ diff -urNp linux-3.1.3/kernel/resource.c linux-3.1.3/kernel/resource.c
18201 return 0;
18202 }
18203 __initcall(ioresources_init);
18204 -diff -urNp linux-3.1.3/kernel/rtmutex-tester.c linux-3.1.3/kernel/rtmutex-tester.c
18205 ---- linux-3.1.3/kernel/rtmutex-tester.c 2011-11-11 15:19:27.000000000 -0500
18206 -+++ linux-3.1.3/kernel/rtmutex-tester.c 2011-11-16 18:39:08.000000000 -0500
18207 +diff -urNp linux-3.1.4/kernel/rtmutex-tester.c linux-3.1.4/kernel/rtmutex-tester.c
18208 +--- linux-3.1.4/kernel/rtmutex-tester.c 2011-11-11 15:19:27.000000000 -0500
18209 ++++ linux-3.1.4/kernel/rtmutex-tester.c 2011-11-16 18:39:08.000000000 -0500
18210 @@ -20,7 +20,7 @@
18211 #define MAX_RT_TEST_MUTEXES 8
18212
18213 @@ -65595,9 +66516,9 @@ diff -urNp linux-3.1.3/kernel/rtmutex-tester.c linux-3.1.3/kernel/rtmutex-tester
18214 return;
18215
18216 default:
18217 -diff -urNp linux-3.1.3/kernel/sched_autogroup.c linux-3.1.3/kernel/sched_autogroup.c
18218 ---- linux-3.1.3/kernel/sched_autogroup.c 2011-11-11 15:19:27.000000000 -0500
18219 -+++ linux-3.1.3/kernel/sched_autogroup.c 2011-11-16 18:39:08.000000000 -0500
18220 +diff -urNp linux-3.1.4/kernel/sched_autogroup.c linux-3.1.4/kernel/sched_autogroup.c
18221 +--- linux-3.1.4/kernel/sched_autogroup.c 2011-11-11 15:19:27.000000000 -0500
18222 ++++ linux-3.1.4/kernel/sched_autogroup.c 2011-11-16 18:39:08.000000000 -0500
18223 @@ -7,7 +7,7 @@
18224
18225 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
18226 @@ -65616,9 +66537,9 @@ diff -urNp linux-3.1.3/kernel/sched_autogroup.c linux-3.1.3/kernel/sched_autogro
18227 ag->tg = tg;
18228 #ifdef CONFIG_RT_GROUP_SCHED
18229 /*
18230 -diff -urNp linux-3.1.3/kernel/sched.c linux-3.1.3/kernel/sched.c
18231 ---- linux-3.1.3/kernel/sched.c 2011-11-11 15:19:27.000000000 -0500
18232 -+++ linux-3.1.3/kernel/sched.c 2011-11-16 18:40:44.000000000 -0500
18233 +diff -urNp linux-3.1.4/kernel/sched.c linux-3.1.4/kernel/sched.c
18234 +--- linux-3.1.4/kernel/sched.c 2011-11-11 15:19:27.000000000 -0500
18235 ++++ linux-3.1.4/kernel/sched.c 2011-11-16 18:40:44.000000000 -0500
18236 @@ -4264,6 +4264,8 @@ static void __sched __schedule(void)
18237 struct rq *rq;
18238 int cpu;
18239 @@ -65655,9 +66576,9 @@ diff -urNp linux-3.1.3/kernel/sched.c linux-3.1.3/kernel/sched.c
18240 /* can't set/change the rt policy */
18241 if (policy != p->policy && !rlim_rtprio)
18242 return -EPERM;
18243 -diff -urNp linux-3.1.3/kernel/sched_fair.c linux-3.1.3/kernel/sched_fair.c
18244 ---- linux-3.1.3/kernel/sched_fair.c 2011-11-11 15:19:27.000000000 -0500
18245 -+++ linux-3.1.3/kernel/sched_fair.c 2011-11-16 18:39:08.000000000 -0500
18246 +diff -urNp linux-3.1.4/kernel/sched_fair.c linux-3.1.4/kernel/sched_fair.c
18247 +--- linux-3.1.4/kernel/sched_fair.c 2011-11-11 15:19:27.000000000 -0500
18248 ++++ linux-3.1.4/kernel/sched_fair.c 2011-11-16 18:39:08.000000000 -0500
18249 @@ -4062,7 +4062,7 @@ static void nohz_idle_balance(int this_c
18250 * run_rebalance_domains is triggered when needed from the scheduler tick.
18251 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
18252 @@ -65667,9 +66588,9 @@ diff -urNp linux-3.1.3/kernel/sched_fair.c linux-3.1.3/kernel/sched_fair.c
18253 {
18254 int this_cpu = smp_processor_id();
18255 struct rq *this_rq = cpu_rq(this_cpu);
18256 -diff -urNp linux-3.1.3/kernel/signal.c linux-3.1.3/kernel/signal.c
18257 ---- linux-3.1.3/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
18258 -+++ linux-3.1.3/kernel/signal.c 2011-11-16 19:30:04.000000000 -0500
18259 +diff -urNp linux-3.1.4/kernel/signal.c linux-3.1.4/kernel/signal.c
18260 +--- linux-3.1.4/kernel/signal.c 2011-11-11 15:19:27.000000000 -0500
18261 ++++ linux-3.1.4/kernel/signal.c 2011-11-16 19:30:04.000000000 -0500
18262 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
18263
18264 int print_fatal_signals __read_mostly;
18265 @@ -65802,9 +66723,9 @@ diff -urNp linux-3.1.3/kernel/signal.c linux-3.1.3/kernel/signal.c
18266 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
18267 error = check_kill_permission(sig, info, p);
18268 /*
18269 -diff -urNp linux-3.1.3/kernel/smp.c linux-3.1.3/kernel/smp.c
18270 ---- linux-3.1.3/kernel/smp.c 2011-11-11 15:19:27.000000000 -0500
18271 -+++ linux-3.1.3/kernel/smp.c 2011-11-16 18:39:08.000000000 -0500
18272 +diff -urNp linux-3.1.4/kernel/smp.c linux-3.1.4/kernel/smp.c
18273 +--- linux-3.1.4/kernel/smp.c 2011-11-11 15:19:27.000000000 -0500
18274 ++++ linux-3.1.4/kernel/smp.c 2011-11-16 18:39:08.000000000 -0500
18275 @@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
18276 }
18277 EXPORT_SYMBOL(smp_call_function);
18278 @@ -65832,9 +66753,9 @@ diff -urNp linux-3.1.3/kernel/smp.c linux-3.1.3/kernel/smp.c
18279 {
18280 raw_spin_unlock_irq(&call_function.lock);
18281 }
18282 -diff -urNp linux-3.1.3/kernel/softirq.c linux-3.1.3/kernel/softirq.c
18283 ---- linux-3.1.3/kernel/softirq.c 2011-11-11 15:19:27.000000000 -0500
18284 -+++ linux-3.1.3/kernel/softirq.c 2011-11-16 18:39:08.000000000 -0500
18285 +diff -urNp linux-3.1.4/kernel/softirq.c linux-3.1.4/kernel/softirq.c
18286 +--- linux-3.1.4/kernel/softirq.c 2011-11-11 15:19:27.000000000 -0500
18287 ++++ linux-3.1.4/kernel/softirq.c 2011-11-16 18:39:08.000000000 -0500
18288 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
18289
18290 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
18291 @@ -65885,9 +66806,9 @@ diff -urNp linux-3.1.3/kernel/softirq.c linux-3.1.3/kernel/softirq.c
18292 {
18293 struct tasklet_struct *list;
18294
18295 -diff -urNp linux-3.1.3/kernel/sys.c linux-3.1.3/kernel/sys.c
18296 ---- linux-3.1.3/kernel/sys.c 2011-11-11 15:19:27.000000000 -0500
18297 -+++ linux-3.1.3/kernel/sys.c 2011-11-16 18:40:44.000000000 -0500
18298 +diff -urNp linux-3.1.4/kernel/sys.c linux-3.1.4/kernel/sys.c
18299 +--- linux-3.1.4/kernel/sys.c 2011-11-11 15:19:27.000000000 -0500
18300 ++++ linux-3.1.4/kernel/sys.c 2011-11-16 18:40:44.000000000 -0500
18301 @@ -157,6 +157,12 @@ static int set_one_prio(struct task_stru
18302 error = -EACCES;
18303 goto out;
18304 @@ -66034,9 +66955,9 @@ diff -urNp linux-3.1.3/kernel/sys.c linux-3.1.3/kernel/sys.c
18305 error = -EINVAL;
18306 break;
18307 }
18308 -diff -urNp linux-3.1.3/kernel/sysctl_binary.c linux-3.1.3/kernel/sysctl_binary.c
18309 ---- linux-3.1.3/kernel/sysctl_binary.c 2011-11-11 15:19:27.000000000 -0500
18310 -+++ linux-3.1.3/kernel/sysctl_binary.c 2011-11-16 18:39:08.000000000 -0500
18311 +diff -urNp linux-3.1.4/kernel/sysctl_binary.c linux-3.1.4/kernel/sysctl_binary.c
18312 +--- linux-3.1.4/kernel/sysctl_binary.c 2011-11-11 15:19:27.000000000 -0500
18313 ++++ linux-3.1.4/kernel/sysctl_binary.c 2011-11-16 18:39:08.000000000 -0500
18314 @@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f
18315 int i;
18316
18317 @@ -66100,9 +67021,9 @@ diff -urNp linux-3.1.3/kernel/sysctl_binary.c linux-3.1.3/kernel/sysctl_binary.c
18318 set_fs(old_fs);
18319 if (result < 0)
18320 goto out;
18321 -diff -urNp linux-3.1.3/kernel/sysctl.c linux-3.1.3/kernel/sysctl.c
18322 ---- linux-3.1.3/kernel/sysctl.c 2011-11-11 15:19:27.000000000 -0500
18323 -+++ linux-3.1.3/kernel/sysctl.c 2011-11-16 18:40:44.000000000 -0500
18324 +diff -urNp linux-3.1.4/kernel/sysctl.c linux-3.1.4/kernel/sysctl.c
18325 +--- linux-3.1.4/kernel/sysctl.c 2011-11-11 15:19:27.000000000 -0500
18326 ++++ linux-3.1.4/kernel/sysctl.c 2011-11-16 18:40:44.000000000 -0500
18327 @@ -85,6 +85,13 @@
18328
18329
18330 @@ -66292,9 +67213,9 @@ diff -urNp linux-3.1.3/kernel/sysctl.c linux-3.1.3/kernel/sysctl.c
18331 EXPORT_SYMBOL(proc_doulongvec_minmax);
18332 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
18333 EXPORT_SYMBOL(register_sysctl_table);
18334 -diff -urNp linux-3.1.3/kernel/sysctl_check.c linux-3.1.3/kernel/sysctl_check.c
18335 ---- linux-3.1.3/kernel/sysctl_check.c 2011-11-11 15:19:27.000000000 -0500
18336 -+++ linux-3.1.3/kernel/sysctl_check.c 2011-11-16 18:40:44.000000000 -0500
18337 +diff -urNp linux-3.1.4/kernel/sysctl_check.c linux-3.1.4/kernel/sysctl_check.c
18338 +--- linux-3.1.4/kernel/sysctl_check.c 2011-11-11 15:19:27.000000000 -0500
18339 ++++ linux-3.1.4/kernel/sysctl_check.c 2011-11-16 18:40:44.000000000 -0500
18340 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
18341 set_fail(&fail, table, "Directory with extra2");
18342 } else {
18343 @@ -66303,9 +67224,9 @@ diff -urNp linux-3.1.3/kernel/sysctl_check.c linux-3.1.3/kernel/sysctl_check.c
18344 (table->proc_handler == proc_dointvec) ||
18345 (table->proc_handler == proc_dointvec_minmax) ||
18346 (table->proc_handler == proc_dointvec_jiffies) ||
18347 -diff -urNp linux-3.1.3/kernel/taskstats.c linux-3.1.3/kernel/taskstats.c
18348 ---- linux-3.1.3/kernel/taskstats.c 2011-11-11 15:19:27.000000000 -0500
18349 -+++ linux-3.1.3/kernel/taskstats.c 2011-11-16 19:35:09.000000000 -0500
18350 +diff -urNp linux-3.1.4/kernel/taskstats.c linux-3.1.4/kernel/taskstats.c
18351 +--- linux-3.1.4/kernel/taskstats.c 2011-11-11 15:19:27.000000000 -0500
18352 ++++ linux-3.1.4/kernel/taskstats.c 2011-11-16 19:35:09.000000000 -0500
18353 @@ -27,9 +27,12 @@
18354 #include <linux/cgroup.h>
18355 #include <linux/fs.h>
18356 @@ -66329,9 +67250,9 @@ diff -urNp linux-3.1.3/kernel/taskstats.c linux-3.1.3/kernel/taskstats.c
18357 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
18358 return cmd_attr_register_cpumask(info);
18359 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
18360 -diff -urNp linux-3.1.3/kernel/time/alarmtimer.c linux-3.1.3/kernel/time/alarmtimer.c
18361 ---- linux-3.1.3/kernel/time/alarmtimer.c 2011-11-11 15:19:27.000000000 -0500
18362 -+++ linux-3.1.3/kernel/time/alarmtimer.c 2011-11-16 18:39:08.000000000 -0500
18363 +diff -urNp linux-3.1.4/kernel/time/alarmtimer.c linux-3.1.4/kernel/time/alarmtimer.c
18364 +--- linux-3.1.4/kernel/time/alarmtimer.c 2011-11-11 15:19:27.000000000 -0500
18365 ++++ linux-3.1.4/kernel/time/alarmtimer.c 2011-11-16 18:39:08.000000000 -0500
18366 @@ -693,7 +693,7 @@ static int __init alarmtimer_init(void)
18367 {
18368 int error = 0;
18369 @@ -66341,9 +67262,9 @@ diff -urNp linux-3.1.3/kernel/time/alarmtimer.c linux-3.1.3/kernel/time/alarmtim
18370 .clock_getres = alarm_clock_getres,
18371 .clock_get = alarm_clock_get,
18372 .timer_create = alarm_timer_create,
18373 -diff -urNp linux-3.1.3/kernel/time/tick-broadcast.c linux-3.1.3/kernel/time/tick-broadcast.c
18374 ---- linux-3.1.3/kernel/time/tick-broadcast.c 2011-11-11 15:19:27.000000000 -0500
18375 -+++ linux-3.1.3/kernel/time/tick-broadcast.c 2011-11-16 18:39:08.000000000 -0500
18376 +diff -urNp linux-3.1.4/kernel/time/tick-broadcast.c linux-3.1.4/kernel/time/tick-broadcast.c
18377 +--- linux-3.1.4/kernel/time/tick-broadcast.c 2011-11-11 15:19:27.000000000 -0500
18378 ++++ linux-3.1.4/kernel/time/tick-broadcast.c 2011-11-16 18:39:08.000000000 -0500
18379 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
18380 * then clear the broadcast bit.
18381 */
18382 @@ -66353,9 +67274,9 @@ diff -urNp linux-3.1.3/kernel/time/tick-broadcast.c linux-3.1.3/kernel/time/tick
18383
18384 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
18385 tick_broadcast_clear_oneshot(cpu);
18386 -diff -urNp linux-3.1.3/kernel/time/timekeeping.c linux-3.1.3/kernel/time/timekeeping.c
18387 ---- linux-3.1.3/kernel/time/timekeeping.c 2011-11-11 15:19:27.000000000 -0500
18388 -+++ linux-3.1.3/kernel/time/timekeeping.c 2011-11-16 18:40:44.000000000 -0500
18389 +diff -urNp linux-3.1.4/kernel/time/timekeeping.c linux-3.1.4/kernel/time/timekeeping.c
18390 +--- linux-3.1.4/kernel/time/timekeeping.c 2011-11-11 15:19:27.000000000 -0500
18391 ++++ linux-3.1.4/kernel/time/timekeeping.c 2011-11-16 18:40:44.000000000 -0500
18392 @@ -14,6 +14,7 @@
18393 #include <linux/init.h>
18394 #include <linux/mm.h>
18395 @@ -66373,9 +67294,9 @@ diff -urNp linux-3.1.3/kernel/time/timekeeping.c linux-3.1.3/kernel/time/timekee
18396 write_seqlock_irqsave(&xtime_lock, flags);
18397
18398 timekeeping_forward_now();
18399 -diff -urNp linux-3.1.3/kernel/time/timer_list.c linux-3.1.3/kernel/time/timer_list.c
18400 ---- linux-3.1.3/kernel/time/timer_list.c 2011-11-11 15:19:27.000000000 -0500
18401 -+++ linux-3.1.3/kernel/time/timer_list.c 2011-11-16 18:40:44.000000000 -0500
18402 +diff -urNp linux-3.1.4/kernel/time/timer_list.c linux-3.1.4/kernel/time/timer_list.c
18403 +--- linux-3.1.4/kernel/time/timer_list.c 2011-11-11 15:19:27.000000000 -0500
18404 ++++ linux-3.1.4/kernel/time/timer_list.c 2011-11-16 18:40:44.000000000 -0500
18405 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
18406
18407 static void print_name_offset(struct seq_file *m, void *sym)
18408 @@ -66417,9 +67338,9 @@ diff -urNp linux-3.1.3/kernel/time/timer_list.c linux-3.1.3/kernel/time/timer_li
18409 if (!pe)
18410 return -ENOMEM;
18411 return 0;
18412 -diff -urNp linux-3.1.3/kernel/time/timer_stats.c linux-3.1.3/kernel/time/timer_stats.c
18413 ---- linux-3.1.3/kernel/time/timer_stats.c 2011-11-11 15:19:27.000000000 -0500
18414 -+++ linux-3.1.3/kernel/time/timer_stats.c 2011-11-16 18:40:44.000000000 -0500
18415 +diff -urNp linux-3.1.4/kernel/time/timer_stats.c linux-3.1.4/kernel/time/timer_stats.c
18416 +--- linux-3.1.4/kernel/time/timer_stats.c 2011-11-11 15:19:27.000000000 -0500
18417 ++++ linux-3.1.4/kernel/time/timer_stats.c 2011-11-16 18:40:44.000000000 -0500
18418 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
18419 static unsigned long nr_entries;
18420 static struct entry entries[MAX_ENTRIES];
18421 @@ -66488,9 +67409,9 @@ diff -urNp linux-3.1.3/kernel/time/timer_stats.c linux-3.1.3/kernel/time/timer_s
18422 if (!pe)
18423 return -ENOMEM;
18424 return 0;
18425 -diff -urNp linux-3.1.3/kernel/time.c linux-3.1.3/kernel/time.c
18426 ---- linux-3.1.3/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
18427 -+++ linux-3.1.3/kernel/time.c 2011-11-16 18:40:44.000000000 -0500
18428 +diff -urNp linux-3.1.4/kernel/time.c linux-3.1.4/kernel/time.c
18429 +--- linux-3.1.4/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
18430 ++++ linux-3.1.4/kernel/time.c 2011-11-16 18:40:44.000000000 -0500
18431 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
18432 return error;
18433
18434 @@ -66503,9 +67424,9 @@ diff -urNp linux-3.1.3/kernel/time.c linux-3.1.3/kernel/time.c
18435 /* SMP safe, global irq locking makes it work. */
18436 sys_tz = *tz;
18437 update_vsyscall_tz();
18438 -diff -urNp linux-3.1.3/kernel/timer.c linux-3.1.3/kernel/timer.c
18439 ---- linux-3.1.3/kernel/timer.c 2011-11-11 15:19:27.000000000 -0500
18440 -+++ linux-3.1.3/kernel/timer.c 2011-11-16 18:39:08.000000000 -0500
18441 +diff -urNp linux-3.1.4/kernel/timer.c linux-3.1.4/kernel/timer.c
18442 +--- linux-3.1.4/kernel/timer.c 2011-11-11 15:19:27.000000000 -0500
18443 ++++ linux-3.1.4/kernel/timer.c 2011-11-16 18:39:08.000000000 -0500
18444 @@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
18445 /*
18446 * This function runs timers and the timer-tq in bottom half context.
18447 @@ -66515,9 +67436,9 @@ diff -urNp linux-3.1.3/kernel/timer.c linux-3.1.3/kernel/timer.c
18448 {
18449 struct tvec_base *base = __this_cpu_read(tvec_bases);
18450
18451 -diff -urNp linux-3.1.3/kernel/trace/blktrace.c linux-3.1.3/kernel/trace/blktrace.c
18452 ---- linux-3.1.3/kernel/trace/blktrace.c 2011-11-11 15:19:27.000000000 -0500
18453 -+++ linux-3.1.3/kernel/trace/blktrace.c 2011-11-16 18:39:08.000000000 -0500
18454 +diff -urNp linux-3.1.4/kernel/trace/blktrace.c linux-3.1.4/kernel/trace/blktrace.c
18455 +--- linux-3.1.4/kernel/trace/blktrace.c 2011-11-11 15:19:27.000000000 -0500
18456 ++++ linux-3.1.4/kernel/trace/blktrace.c 2011-11-16 18:39:08.000000000 -0500
18457 @@ -323,7 +323,7 @@ static ssize_t blk_dropped_read(struct f
18458 struct blk_trace *bt = filp->private_data;
18459 char buf[16];
18460 @@ -66545,9 +67466,9 @@ diff -urNp linux-3.1.3/kernel/trace/blktrace.c linux-3.1.3/kernel/trace/blktrace
18461
18462 ret = -EIO;
18463 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
18464 -diff -urNp linux-3.1.3/kernel/trace/ftrace.c linux-3.1.3/kernel/trace/ftrace.c
18465 ---- linux-3.1.3/kernel/trace/ftrace.c 2011-11-11 15:19:27.000000000 -0500
18466 -+++ linux-3.1.3/kernel/trace/ftrace.c 2011-11-16 18:39:08.000000000 -0500
18467 +diff -urNp linux-3.1.4/kernel/trace/ftrace.c linux-3.1.4/kernel/trace/ftrace.c
18468 +--- linux-3.1.4/kernel/trace/ftrace.c 2011-11-11 15:19:27.000000000 -0500
18469 ++++ linux-3.1.4/kernel/trace/ftrace.c 2011-11-16 18:39:08.000000000 -0500
18470 @@ -1585,12 +1585,17 @@ ftrace_code_disable(struct module *mod,
18471 if (unlikely(ftrace_disabled))
18472 return 0;
18473 @@ -66577,9 +67498,9 @@ diff -urNp linux-3.1.3/kernel/trace/ftrace.c linux-3.1.3/kernel/trace/ftrace.c
18474 {
18475 struct ftrace_func_probe *entry;
18476 struct ftrace_page *pg;
18477 -diff -urNp linux-3.1.3/kernel/trace/trace.c linux-3.1.3/kernel/trace/trace.c
18478 ---- linux-3.1.3/kernel/trace/trace.c 2011-11-11 15:19:27.000000000 -0500
18479 -+++ linux-3.1.3/kernel/trace/trace.c 2011-11-16 18:40:44.000000000 -0500
18480 +diff -urNp linux-3.1.4/kernel/trace/trace.c linux-3.1.4/kernel/trace/trace.c
18481 +--- linux-3.1.4/kernel/trace/trace.c 2011-11-11 15:19:27.000000000 -0500
18482 ++++ linux-3.1.4/kernel/trace/trace.c 2011-11-16 18:40:44.000000000 -0500
18483 @@ -3451,6 +3451,8 @@ static ssize_t tracing_splice_read_pipe(
18484 size_t rem;
18485 unsigned int i;
18486 @@ -66622,9 +67543,9 @@ diff -urNp linux-3.1.3/kernel/trace/trace.c linux-3.1.3/kernel/trace/trace.c
18487 static int once;
18488 struct dentry *d_tracer;
18489
18490 -diff -urNp linux-3.1.3/kernel/trace/trace_events.c linux-3.1.3/kernel/trace/trace_events.c
18491 ---- linux-3.1.3/kernel/trace/trace_events.c 2011-11-11 15:19:27.000000000 -0500
18492 -+++ linux-3.1.3/kernel/trace/trace_events.c 2011-11-16 18:39:08.000000000 -0500
18493 +diff -urNp linux-3.1.4/kernel/trace/trace_events.c linux-3.1.4/kernel/trace/trace_events.c
18494 +--- linux-3.1.4/kernel/trace/trace_events.c 2011-11-11 15:19:27.000000000 -0500
18495 ++++ linux-3.1.4/kernel/trace/trace_events.c 2011-11-16 18:39:08.000000000 -0500
18496 @@ -1300,10 +1300,6 @@ static LIST_HEAD(ftrace_module_file_list
18497 struct ftrace_module_file_ops {
18498 struct list_head list;
18499 @@ -66671,9 +67592,9 @@ diff -urNp linux-3.1.3/kernel/trace/trace_events.c linux-3.1.3/kernel/trace/trac
18500 }
18501 }
18502
18503 -diff -urNp linux-3.1.3/kernel/trace/trace_kprobe.c linux-3.1.3/kernel/trace/trace_kprobe.c
18504 ---- linux-3.1.3/kernel/trace/trace_kprobe.c 2011-11-11 15:19:27.000000000 -0500
18505 -+++ linux-3.1.3/kernel/trace/trace_kprobe.c 2011-11-16 18:39:08.000000000 -0500
18506 +diff -urNp linux-3.1.4/kernel/trace/trace_kprobe.c linux-3.1.4/kernel/trace/trace_kprobe.c
18507 +--- linux-3.1.4/kernel/trace/trace_kprobe.c 2011-11-11 15:19:27.000000000 -0500
18508 ++++ linux-3.1.4/kernel/trace/trace_kprobe.c 2011-11-16 18:39:08.000000000 -0500
18509 @@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me
18510 long ret;
18511 int maxlen = get_rloc_len(*(u32 *)dest);
18512 @@ -66710,9 +67631,9 @@ diff -urNp linux-3.1.3/kernel/trace/trace_kprobe.c linux-3.1.3/kernel/trace/trac
18513 len++;
18514 } while (c && ret == 0 && len < MAX_STRING_SIZE);
18515 pagefault_enable();
18516 -diff -urNp linux-3.1.3/kernel/trace/trace_mmiotrace.c linux-3.1.3/kernel/trace/trace_mmiotrace.c
18517 ---- linux-3.1.3/kernel/trace/trace_mmiotrace.c 2011-11-11 15:19:27.000000000 -0500
18518 -+++ linux-3.1.3/kernel/trace/trace_mmiotrace.c 2011-11-16 18:39:08.000000000 -0500
18519 +diff -urNp linux-3.1.4/kernel/trace/trace_mmiotrace.c linux-3.1.4/kernel/trace/trace_mmiotrace.c
18520 +--- linux-3.1.4/kernel/trace/trace_mmiotrace.c 2011-11-11 15:19:27.000000000 -0500
18521 ++++ linux-3.1.4/kernel/trace/trace_mmiotrace.c 2011-11-16 18:39:08.000000000 -0500
18522 @@ -24,7 +24,7 @@ struct header_iter {
18523 static struct trace_array *mmio_trace_array;
18524 static bool overrun_detected;
18525 @@ -66749,9 +67670,9 @@ diff -urNp linux-3.1.3/kernel/trace/trace_mmiotrace.c linux-3.1.3/kernel/trace/t
18526 return;
18527 }
18528 entry = ring_buffer_event_data(event);
18529 -diff -urNp linux-3.1.3/kernel/trace/trace_output.c linux-3.1.3/kernel/trace/trace_output.c
18530 ---- linux-3.1.3/kernel/trace/trace_output.c 2011-11-11 15:19:27.000000000 -0500
18531 -+++ linux-3.1.3/kernel/trace/trace_output.c 2011-11-16 18:39:08.000000000 -0500
18532 +diff -urNp linux-3.1.4/kernel/trace/trace_output.c linux-3.1.4/kernel/trace/trace_output.c
18533 +--- linux-3.1.4/kernel/trace/trace_output.c 2011-11-11 15:19:27.000000000 -0500
18534 ++++ linux-3.1.4/kernel/trace/trace_output.c 2011-11-16 18:39:08.000000000 -0500
18535 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s,
18536
18537 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
18538 @@ -66761,9 +67682,9 @@ diff -urNp linux-3.1.3/kernel/trace/trace_output.c linux-3.1.3/kernel/trace/trac
18539 if (p) {
18540 s->len = p - s->buffer;
18541 return 1;
18542 -diff -urNp linux-3.1.3/kernel/trace/trace_stack.c linux-3.1.3/kernel/trace/trace_stack.c
18543 ---- linux-3.1.3/kernel/trace/trace_stack.c 2011-11-11 15:19:27.000000000 -0500
18544 -+++ linux-3.1.3/kernel/trace/trace_stack.c 2011-11-16 18:39:08.000000000 -0500
18545 +diff -urNp linux-3.1.4/kernel/trace/trace_stack.c linux-3.1.4/kernel/trace/trace_stack.c
18546 +--- linux-3.1.4/kernel/trace/trace_stack.c 2011-11-11 15:19:27.000000000 -0500
18547 ++++ linux-3.1.4/kernel/trace/trace_stack.c 2011-11-16 18:39:08.000000000 -0500
18548 @@ -50,7 +50,7 @@ static inline void check_stack(void)
18549 return;
18550
18551 @@ -66773,9 +67694,9 @@ diff -urNp linux-3.1.3/kernel/trace/trace_stack.c linux-3.1.3/kernel/trace/trace
18552 return;
18553
18554 local_irq_save(flags);
18555 -diff -urNp linux-3.1.3/kernel/trace/trace_workqueue.c linux-3.1.3/kernel/trace/trace_workqueue.c
18556 ---- linux-3.1.3/kernel/trace/trace_workqueue.c 2011-11-11 15:19:27.000000000 -0500
18557 -+++ linux-3.1.3/kernel/trace/trace_workqueue.c 2011-11-16 18:39:08.000000000 -0500
18558 +diff -urNp linux-3.1.4/kernel/trace/trace_workqueue.c linux-3.1.4/kernel/trace/trace_workqueue.c
18559 +--- linux-3.1.4/kernel/trace/trace_workqueue.c 2011-11-11 15:19:27.000000000 -0500
18560 ++++ linux-3.1.4/kernel/trace/trace_workqueue.c 2011-11-16 18:39:08.000000000 -0500
18561 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
18562 int cpu;
18563 pid_t pid;
18564 @@ -66803,9 +67724,9 @@ diff -urNp linux-3.1.3/kernel/trace/trace_workqueue.c linux-3.1.3/kernel/trace/t
18565 tsk->comm);
18566 put_task_struct(tsk);
18567 }
18568 -diff -urNp linux-3.1.3/lib/bitmap.c linux-3.1.3/lib/bitmap.c
18569 ---- linux-3.1.3/lib/bitmap.c 2011-11-11 15:19:27.000000000 -0500
18570 -+++ linux-3.1.3/lib/bitmap.c 2011-11-16 18:39:08.000000000 -0500
18571 +diff -urNp linux-3.1.4/lib/bitmap.c linux-3.1.4/lib/bitmap.c
18572 +--- linux-3.1.4/lib/bitmap.c 2011-11-11 15:19:27.000000000 -0500
18573 ++++ linux-3.1.4/lib/bitmap.c 2011-11-16 18:39:08.000000000 -0500
18574 @@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsi
18575 {
18576 int c, old_c, totaldigits, ndigits, nchunks, nbits;
18577 @@ -66842,9 +67763,9 @@ diff -urNp linux-3.1.3/lib/bitmap.c linux-3.1.3/lib/bitmap.c
18578 ulen, 1, maskp, nmaskbits);
18579 }
18580 EXPORT_SYMBOL(bitmap_parselist_user);
18581 -diff -urNp linux-3.1.3/lib/bug.c linux-3.1.3/lib/bug.c
18582 ---- linux-3.1.3/lib/bug.c 2011-11-11 15:19:27.000000000 -0500
18583 -+++ linux-3.1.3/lib/bug.c 2011-11-16 18:39:08.000000000 -0500
18584 +diff -urNp linux-3.1.4/lib/bug.c linux-3.1.4/lib/bug.c
18585 +--- linux-3.1.4/lib/bug.c 2011-11-11 15:19:27.000000000 -0500
18586 ++++ linux-3.1.4/lib/bug.c 2011-11-16 18:39:08.000000000 -0500
18587 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
18588 return BUG_TRAP_TYPE_NONE;
18589
18590 @@ -66854,9 +67775,9 @@ diff -urNp linux-3.1.3/lib/bug.c linux-3.1.3/lib/bug.c
18591
18592 file = NULL;
18593 line = 0;
18594 -diff -urNp linux-3.1.3/lib/debugobjects.c linux-3.1.3/lib/debugobjects.c
18595 ---- linux-3.1.3/lib/debugobjects.c 2011-11-11 15:19:27.000000000 -0500
18596 -+++ linux-3.1.3/lib/debugobjects.c 2011-11-16 18:39:08.000000000 -0500
18597 +diff -urNp linux-3.1.4/lib/debugobjects.c linux-3.1.4/lib/debugobjects.c
18598 +--- linux-3.1.4/lib/debugobjects.c 2011-11-11 15:19:27.000000000 -0500
18599 ++++ linux-3.1.4/lib/debugobjects.c 2011-11-16 18:39:08.000000000 -0500
18600 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
18601 if (limit > 4)
18602 return;
18603 @@ -66866,9 +67787,9 @@ diff -urNp linux-3.1.3/lib/debugobjects.c linux-3.1.3/lib/debugobjects.c
18604 if (is_on_stack == onstack)
18605 return;
18606
18607 -diff -urNp linux-3.1.3/lib/devres.c linux-3.1.3/lib/devres.c
18608 ---- linux-3.1.3/lib/devres.c 2011-11-11 15:19:27.000000000 -0500
18609 -+++ linux-3.1.3/lib/devres.c 2011-11-16 18:39:08.000000000 -0500
18610 +diff -urNp linux-3.1.4/lib/devres.c linux-3.1.4/lib/devres.c
18611 +--- linux-3.1.4/lib/devres.c 2011-11-11 15:19:27.000000000 -0500
18612 ++++ linux-3.1.4/lib/devres.c 2011-11-16 18:39:08.000000000 -0500
18613 @@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
18614 void devm_iounmap(struct device *dev, void __iomem *addr)
18615 {
18616 @@ -66887,9 +67808,9 @@ diff -urNp linux-3.1.3/lib/devres.c linux-3.1.3/lib/devres.c
18617 }
18618 EXPORT_SYMBOL(devm_ioport_unmap);
18619
18620 -diff -urNp linux-3.1.3/lib/dma-debug.c linux-3.1.3/lib/dma-debug.c
18621 ---- linux-3.1.3/lib/dma-debug.c 2011-11-11 15:19:27.000000000 -0500
18622 -+++ linux-3.1.3/lib/dma-debug.c 2011-11-16 18:39:08.000000000 -0500
18623 +diff -urNp linux-3.1.4/lib/dma-debug.c linux-3.1.4/lib/dma-debug.c
18624 +--- linux-3.1.4/lib/dma-debug.c 2011-11-11 15:19:27.000000000 -0500
18625 ++++ linux-3.1.4/lib/dma-debug.c 2011-11-16 18:39:08.000000000 -0500
18626 @@ -870,7 +870,7 @@ out:
18627
18628 static void check_for_stack(struct device *dev, void *addr)
18629 @@ -66899,9 +67820,9 @@ diff -urNp linux-3.1.3/lib/dma-debug.c linux-3.1.3/lib/dma-debug.c
18630 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
18631 "stack [addr=%p]\n", addr);
18632 }
18633 -diff -urNp linux-3.1.3/lib/extable.c linux-3.1.3/lib/extable.c
18634 ---- linux-3.1.3/lib/extable.c 2011-11-11 15:19:27.000000000 -0500
18635 -+++ linux-3.1.3/lib/extable.c 2011-11-16 18:39:08.000000000 -0500
18636 +diff -urNp linux-3.1.4/lib/extable.c linux-3.1.4/lib/extable.c
18637 +--- linux-3.1.4/lib/extable.c 2011-11-11 15:19:27.000000000 -0500
18638 ++++ linux-3.1.4/lib/extable.c 2011-11-16 18:39:08.000000000 -0500
18639 @@ -13,6 +13,7 @@
18640 #include <linux/init.h>
18641 #include <linux/sort.h>
18642 @@ -66921,9 +67842,9 @@ diff -urNp linux-3.1.3/lib/extable.c linux-3.1.3/lib/extable.c
18643 }
18644
18645 #ifdef CONFIG_MODULES
18646 -diff -urNp linux-3.1.3/lib/inflate.c linux-3.1.3/lib/inflate.c
18647 ---- linux-3.1.3/lib/inflate.c 2011-11-11 15:19:27.000000000 -0500
18648 -+++ linux-3.1.3/lib/inflate.c 2011-11-16 18:39:08.000000000 -0500
18649 +diff -urNp linux-3.1.4/lib/inflate.c linux-3.1.4/lib/inflate.c
18650 +--- linux-3.1.4/lib/inflate.c 2011-11-11 15:19:27.000000000 -0500
18651 ++++ linux-3.1.4/lib/inflate.c 2011-11-16 18:39:08.000000000 -0500
18652 @@ -269,7 +269,7 @@ static void free(void *where)
18653 malloc_ptr = free_mem_ptr;
18654 }
18655 @@ -66933,9 +67854,9 @@ diff -urNp linux-3.1.3/lib/inflate.c linux-3.1.3/lib/inflate.c
18656 #define free(a) kfree(a)
18657 #endif
18658
18659 -diff -urNp linux-3.1.3/lib/Kconfig.debug linux-3.1.3/lib/Kconfig.debug
18660 ---- linux-3.1.3/lib/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
18661 -+++ linux-3.1.3/lib/Kconfig.debug 2011-11-16 18:40:44.000000000 -0500
18662 +diff -urNp linux-3.1.4/lib/Kconfig.debug linux-3.1.4/lib/Kconfig.debug
18663 +--- linux-3.1.4/lib/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
18664 ++++ linux-3.1.4/lib/Kconfig.debug 2011-11-16 18:40:44.000000000 -0500
18665 @@ -1091,6 +1091,7 @@ config LATENCYTOP
18666 depends on DEBUG_KERNEL
18667 depends on STACKTRACE_SUPPORT
18668 @@ -66944,9 +67865,9 @@ diff -urNp linux-3.1.3/lib/Kconfig.debug linux-3.1.3/lib/Kconfig.debug
18669 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
18670 select KALLSYMS
18671 select KALLSYMS_ALL
18672 -diff -urNp linux-3.1.3/lib/kref.c linux-3.1.3/lib/kref.c
18673 ---- linux-3.1.3/lib/kref.c 2011-11-11 15:19:27.000000000 -0500
18674 -+++ linux-3.1.3/lib/kref.c 2011-11-16 18:39:08.000000000 -0500
18675 +diff -urNp linux-3.1.4/lib/kref.c linux-3.1.4/lib/kref.c
18676 +--- linux-3.1.4/lib/kref.c 2011-11-11 15:19:27.000000000 -0500
18677 ++++ linux-3.1.4/lib/kref.c 2011-11-16 18:39:08.000000000 -0500
18678 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
18679 */
18680 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
18681 @@ -66956,9 +67877,9 @@ diff -urNp linux-3.1.3/lib/kref.c linux-3.1.3/lib/kref.c
18682 WARN_ON(release == (void (*)(struct kref *))kfree);
18683
18684 if (atomic_dec_and_test(&kref->refcount)) {
18685 -diff -urNp linux-3.1.3/lib/radix-tree.c linux-3.1.3/lib/radix-tree.c
18686 ---- linux-3.1.3/lib/radix-tree.c 2011-11-11 15:19:27.000000000 -0500
18687 -+++ linux-3.1.3/lib/radix-tree.c 2011-11-16 18:39:08.000000000 -0500
18688 +diff -urNp linux-3.1.4/lib/radix-tree.c linux-3.1.4/lib/radix-tree.c
18689 +--- linux-3.1.4/lib/radix-tree.c 2011-11-11 15:19:27.000000000 -0500
18690 ++++ linux-3.1.4/lib/radix-tree.c 2011-11-16 18:39:08.000000000 -0500
18691 @@ -80,7 +80,7 @@ struct radix_tree_preload {
18692 int nr;
18693 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
18694 @@ -66968,9 +67889,9 @@ diff -urNp linux-3.1.3/lib/radix-tree.c linux-3.1.3/lib/radix-tree.c
18695
18696 static inline void *ptr_to_indirect(void *ptr)
18697 {
18698 -diff -urNp linux-3.1.3/lib/vsprintf.c linux-3.1.3/lib/vsprintf.c
18699 ---- linux-3.1.3/lib/vsprintf.c 2011-11-11 15:19:27.000000000 -0500
18700 -+++ linux-3.1.3/lib/vsprintf.c 2011-11-16 18:40:44.000000000 -0500
18701 +diff -urNp linux-3.1.4/lib/vsprintf.c linux-3.1.4/lib/vsprintf.c
18702 +--- linux-3.1.4/lib/vsprintf.c 2011-11-11 15:19:27.000000000 -0500
18703 ++++ linux-3.1.4/lib/vsprintf.c 2011-11-16 18:40:44.000000000 -0500
18704 @@ -16,6 +16,9 @@
18705 * - scnprintf and vscnprintf
18706 */
18707 @@ -67064,14 +67985,14 @@ diff -urNp linux-3.1.3/lib/vsprintf.c linux-3.1.3/lib/vsprintf.c
18708 break;
18709 }
18710
18711 -diff -urNp linux-3.1.3/localversion-grsec linux-3.1.3/localversion-grsec
18712 ---- linux-3.1.3/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
18713 -+++ linux-3.1.3/localversion-grsec 2011-11-16 18:40:44.000000000 -0500
18714 +diff -urNp linux-3.1.4/localversion-grsec linux-3.1.4/localversion-grsec
18715 +--- linux-3.1.4/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
18716 ++++ linux-3.1.4/localversion-grsec 2011-11-16 18:40:44.000000000 -0500
18717 @@ -0,0 +1 @@
18718 +-grsec
18719 -diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18720 ---- linux-3.1.3/Makefile 2011-11-26 19:57:29.000000000 -0500
18721 -+++ linux-3.1.3/Makefile 2011-11-26 20:00:43.000000000 -0500
18722 +diff -urNp linux-3.1.4/Makefile linux-3.1.4/Makefile
18723 +--- linux-3.1.4/Makefile 2011-11-29 18:06:31.000000000 -0500
18724 ++++ linux-3.1.4/Makefile 2011-12-02 17:38:47.000000000 -0500
18725 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
18726
18727 HOSTCC = gcc
18728 @@ -67095,7 +68016,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18729 $(Q)$(MAKE) $(build)=scripts/basic
18730 $(Q)rm -f .tmp_quiet_recordmcount
18731
18732 -@@ -564,6 +565,41 @@ else
18733 +@@ -564,6 +565,42 @@ else
18734 KBUILD_CFLAGS += -O2
18735 endif
18736
18737 @@ -67113,6 +68034,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18738 +endif
18739 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
18740 +KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
18741 ++KERNEXEC_PLUGIN += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD)
18742 +endif
18743 +ifdef CONFIG_CHECKER_PLUGIN
18744 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
18745 @@ -67137,7 +68059,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18746 include $(srctree)/arch/$(SRCARCH)/Makefile
18747
18748 ifneq ($(CONFIG_FRAME_WARN),0)
18749 -@@ -708,7 +744,7 @@ export mod_strip_cmd
18750 +@@ -708,7 +745,7 @@ export mod_strip_cmd
18751
18752
18753 ifeq ($(KBUILD_EXTMOD),)
18754 @@ -67146,7 +68068,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18755
18756 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
18757 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
18758 -@@ -932,6 +968,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
18759 +@@ -932,6 +969,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
18760
18761 # The actual objects are generated when descending,
18762 # make sure no implicit rule kicks in
18763 @@ -67154,7 +68076,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18764 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
18765
18766 # Handle descending into subdirectories listed in $(vmlinux-dirs)
18767 -@@ -941,7 +978,7 @@ $(sort $(vmlinux-init) $(vmlinux-main))
18768 +@@ -941,7 +979,7 @@ $(sort $(vmlinux-init) $(vmlinux-main))
18769 # Error messages still appears in the original language
18770
18771 PHONY += $(vmlinux-dirs)
18772 @@ -67163,7 +68085,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18773 $(Q)$(MAKE) $(build)=$@
18774
18775 # Store (new) KERNELRELASE string in include/config/kernel.release
18776 -@@ -986,6 +1023,7 @@ prepare0: archprepare FORCE
18777 +@@ -986,6 +1024,7 @@ prepare0: archprepare FORCE
18778 $(Q)$(MAKE) $(build)=. missing-syscalls
18779
18780 # All the preparing..
18781 @@ -67171,7 +68093,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18782 prepare: prepare0
18783
18784 # Generate some files
18785 -@@ -1087,6 +1125,7 @@ all: modules
18786 +@@ -1087,6 +1126,7 @@ all: modules
18787 # using awk while concatenating to the final file.
18788
18789 PHONY += modules
18790 @@ -67179,7 +68101,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18791 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
18792 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
18793 @$(kecho) ' Building modules, stage 2.';
18794 -@@ -1102,7 +1141,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
18795 +@@ -1102,7 +1142,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
18796
18797 # Target to prepare building external modules
18798 PHONY += modules_prepare
18799 @@ -67188,7 +68110,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18800
18801 # Target to install modules
18802 PHONY += modules_install
18803 -@@ -1198,7 +1237,7 @@ distclean: mrproper
18804 +@@ -1198,7 +1238,7 @@ distclean: mrproper
18805 @find $(srctree) $(RCS_FIND_IGNORE) \
18806 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
18807 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
18808 @@ -67197,7 +68119,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18809 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
18810 -type f -print | xargs rm -f
18811
18812 -@@ -1360,6 +1399,7 @@ PHONY += $(module-dirs) modules
18813 +@@ -1360,6 +1400,7 @@ PHONY += $(module-dirs) modules
18814 $(module-dirs): crmodverdir $(objtree)/Module.symvers
18815 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
18816
18817 @@ -67205,7 +68127,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18818 modules: $(module-dirs)
18819 @$(kecho) ' Building modules, stage 2.';
18820 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
18821 -@@ -1486,17 +1526,19 @@ else
18822 +@@ -1486,17 +1527,19 @@ else
18823 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
18824 endif
18825
18826 @@ -67229,7 +68151,7 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18827 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
18828 %.symtypes: %.c prepare scripts FORCE
18829 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
18830 -@@ -1506,11 +1548,13 @@ endif
18831 +@@ -1506,11 +1549,13 @@ endif
18832 $(cmd_crmodverdir)
18833 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
18834 $(build)=$(build-dir)
18835 @@ -67245,9 +68167,9 @@ diff -urNp linux-3.1.3/Makefile linux-3.1.3/Makefile
18836 $(cmd_crmodverdir)
18837 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
18838 $(build)=$(build-dir) $(@:.ko=.o)
18839 -diff -urNp linux-3.1.3/mm/filemap.c linux-3.1.3/mm/filemap.c
18840 ---- linux-3.1.3/mm/filemap.c 2011-11-11 15:19:27.000000000 -0500
18841 -+++ linux-3.1.3/mm/filemap.c 2011-11-16 18:40:44.000000000 -0500
18842 +diff -urNp linux-3.1.4/mm/filemap.c linux-3.1.4/mm/filemap.c
18843 +--- linux-3.1.4/mm/filemap.c 2011-11-11 15:19:27.000000000 -0500
18844 ++++ linux-3.1.4/mm/filemap.c 2011-11-16 18:40:44.000000000 -0500
18845 @@ -1784,7 +1784,7 @@ int generic_file_mmap(struct file * file
18846 struct address_space *mapping = file->f_mapping;
18847
18848 @@ -67265,9 +68187,9 @@ diff -urNp linux-3.1.3/mm/filemap.c linux-3.1.3/mm/filemap.c
18849 if (*pos >= limit) {
18850 send_sig(SIGXFSZ, current, 0);
18851 return -EFBIG;
18852 -diff -urNp linux-3.1.3/mm/fremap.c linux-3.1.3/mm/fremap.c
18853 ---- linux-3.1.3/mm/fremap.c 2011-11-11 15:19:27.000000000 -0500
18854 -+++ linux-3.1.3/mm/fremap.c 2011-11-16 18:39:08.000000000 -0500
18855 +diff -urNp linux-3.1.4/mm/fremap.c linux-3.1.4/mm/fremap.c
18856 +--- linux-3.1.4/mm/fremap.c 2011-11-11 15:19:27.000000000 -0500
18857 ++++ linux-3.1.4/mm/fremap.c 2011-11-16 18:39:08.000000000 -0500
18858 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
18859 retry:
18860 vma = find_vma(mm, start);
18861 @@ -67280,9 +68202,9 @@ diff -urNp linux-3.1.3/mm/fremap.c linux-3.1.3/mm/fremap.c
18862 /*
18863 * Make sure the vma is shared, that it supports prefaulting,
18864 * and that the remapped range is valid and fully within
18865 -diff -urNp linux-3.1.3/mm/highmem.c linux-3.1.3/mm/highmem.c
18866 ---- linux-3.1.3/mm/highmem.c 2011-11-11 15:19:27.000000000 -0500
18867 -+++ linux-3.1.3/mm/highmem.c 2011-11-16 18:39:08.000000000 -0500
18868 +diff -urNp linux-3.1.4/mm/highmem.c linux-3.1.4/mm/highmem.c
18869 +--- linux-3.1.4/mm/highmem.c 2011-11-11 15:19:27.000000000 -0500
18870 ++++ linux-3.1.4/mm/highmem.c 2011-11-16 18:39:08.000000000 -0500
18871 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
18872 * So no dangers, even with speculative execution.
18873 */
18874 @@ -67308,9 +68230,9 @@ diff -urNp linux-3.1.3/mm/highmem.c linux-3.1.3/mm/highmem.c
18875 pkmap_count[last_pkmap_nr] = 1;
18876 set_page_address(page, (void *)vaddr);
18877
18878 -diff -urNp linux-3.1.3/mm/huge_memory.c linux-3.1.3/mm/huge_memory.c
18879 ---- linux-3.1.3/mm/huge_memory.c 2011-11-11 15:19:27.000000000 -0500
18880 -+++ linux-3.1.3/mm/huge_memory.c 2011-11-16 18:39:08.000000000 -0500
18881 +diff -urNp linux-3.1.4/mm/huge_memory.c linux-3.1.4/mm/huge_memory.c
18882 +--- linux-3.1.4/mm/huge_memory.c 2011-11-11 15:19:27.000000000 -0500
18883 ++++ linux-3.1.4/mm/huge_memory.c 2011-12-02 17:38:47.000000000 -0500
18884 @@ -702,7 +702,7 @@ out:
18885 * run pte_offset_map on the pmd, if an huge pmd could
18886 * materialize from under us from a different thread.
18887 @@ -67320,9 +68242,18 @@ diff -urNp linux-3.1.3/mm/huge_memory.c linux-3.1.3/mm/huge_memory.c
18888 return VM_FAULT_OOM;
18889 /* if an huge pmd materialized from under us just retry later */
18890 if (unlikely(pmd_trans_huge(*pmd)))
18891 -diff -urNp linux-3.1.3/mm/hugetlb.c linux-3.1.3/mm/hugetlb.c
18892 ---- linux-3.1.3/mm/hugetlb.c 2011-11-11 15:19:27.000000000 -0500
18893 -+++ linux-3.1.3/mm/hugetlb.c 2011-11-16 18:39:08.000000000 -0500
18894 +@@ -829,7 +829,7 @@ static int do_huge_pmd_wp_page_fallback(
18895 +
18896 + for (i = 0; i < HPAGE_PMD_NR; i++) {
18897 + copy_user_highpage(pages[i], page + i,
18898 +- haddr + PAGE_SHIFT*i, vma);
18899 ++ haddr + PAGE_SIZE*i, vma);
18900 + __SetPageUptodate(pages[i]);
18901 + cond_resched();
18902 + }
18903 +diff -urNp linux-3.1.4/mm/hugetlb.c linux-3.1.4/mm/hugetlb.c
18904 +--- linux-3.1.4/mm/hugetlb.c 2011-11-11 15:19:27.000000000 -0500
18905 ++++ linux-3.1.4/mm/hugetlb.c 2011-11-16 18:39:08.000000000 -0500
18906 @@ -2346,6 +2346,27 @@ static int unmap_ref_private(struct mm_s
18907 return 1;
18908 }
18909 @@ -67412,9 +68343,9 @@ diff -urNp linux-3.1.3/mm/hugetlb.c linux-3.1.3/mm/hugetlb.c
18910 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
18911 if (!ptep)
18912 return VM_FAULT_OOM;
18913 -diff -urNp linux-3.1.3/mm/internal.h linux-3.1.3/mm/internal.h
18914 ---- linux-3.1.3/mm/internal.h 2011-11-11 15:19:27.000000000 -0500
18915 -+++ linux-3.1.3/mm/internal.h 2011-11-16 18:39:08.000000000 -0500
18916 +diff -urNp linux-3.1.4/mm/internal.h linux-3.1.4/mm/internal.h
18917 +--- linux-3.1.4/mm/internal.h 2011-11-11 15:19:27.000000000 -0500
18918 ++++ linux-3.1.4/mm/internal.h 2011-11-16 18:39:08.000000000 -0500
18919 @@ -95,6 +95,7 @@ extern void putback_lru_page(struct page
18920 * in mm/page_alloc.c
18921 */
18922 @@ -67423,9 +68354,9 @@ diff -urNp linux-3.1.3/mm/internal.h linux-3.1.3/mm/internal.h
18923 extern void prep_compound_page(struct page *page, unsigned long order);
18924 #ifdef CONFIG_MEMORY_FAILURE
18925 extern bool is_free_buddy_page(struct page *page);
18926 -diff -urNp linux-3.1.3/mm/Kconfig linux-3.1.3/mm/Kconfig
18927 ---- linux-3.1.3/mm/Kconfig 2011-11-11 15:19:27.000000000 -0500
18928 -+++ linux-3.1.3/mm/Kconfig 2011-11-17 18:57:00.000000000 -0500
18929 +diff -urNp linux-3.1.4/mm/Kconfig linux-3.1.4/mm/Kconfig
18930 +--- linux-3.1.4/mm/Kconfig 2011-11-11 15:19:27.000000000 -0500
18931 ++++ linux-3.1.4/mm/Kconfig 2011-11-17 18:57:00.000000000 -0500
18932 @@ -238,10 +238,10 @@ config KSM
18933 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
18934
18935 @@ -67440,9 +68371,9 @@ diff -urNp linux-3.1.3/mm/Kconfig linux-3.1.3/mm/Kconfig
18936 This is the portion of low virtual memory which should be protected
18937 from userspace allocation. Keeping a user from writing to low pages
18938 can help reduce the impact of kernel NULL pointer bugs.
18939 -diff -urNp linux-3.1.3/mm/kmemleak.c linux-3.1.3/mm/kmemleak.c
18940 ---- linux-3.1.3/mm/kmemleak.c 2011-11-11 15:19:27.000000000 -0500
18941 -+++ linux-3.1.3/mm/kmemleak.c 2011-11-16 18:40:44.000000000 -0500
18942 +diff -urNp linux-3.1.4/mm/kmemleak.c linux-3.1.4/mm/kmemleak.c
18943 +--- linux-3.1.4/mm/kmemleak.c 2011-11-11 15:19:27.000000000 -0500
18944 ++++ linux-3.1.4/mm/kmemleak.c 2011-11-16 18:40:44.000000000 -0500
18945 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se
18946
18947 for (i = 0; i < object->trace_len; i++) {
18948 @@ -67452,9 +68383,9 @@ diff -urNp linux-3.1.3/mm/kmemleak.c linux-3.1.3/mm/kmemleak.c
18949 }
18950 }
18951
18952 -diff -urNp linux-3.1.3/mm/maccess.c linux-3.1.3/mm/maccess.c
18953 ---- linux-3.1.3/mm/maccess.c 2011-11-11 15:19:27.000000000 -0500
18954 -+++ linux-3.1.3/mm/maccess.c 2011-11-16 18:39:08.000000000 -0500
18955 +diff -urNp linux-3.1.4/mm/maccess.c linux-3.1.4/mm/maccess.c
18956 +--- linux-3.1.4/mm/maccess.c 2011-11-11 15:19:27.000000000 -0500
18957 ++++ linux-3.1.4/mm/maccess.c 2011-11-16 18:39:08.000000000 -0500
18958 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons
18959 set_fs(KERNEL_DS);
18960 pagefault_disable();
18961 @@ -67473,9 +68404,9 @@ diff -urNp linux-3.1.3/mm/maccess.c linux-3.1.3/mm/maccess.c
18962 pagefault_enable();
18963 set_fs(old_fs);
18964
18965 -diff -urNp linux-3.1.3/mm/madvise.c linux-3.1.3/mm/madvise.c
18966 ---- linux-3.1.3/mm/madvise.c 2011-11-11 15:19:27.000000000 -0500
18967 -+++ linux-3.1.3/mm/madvise.c 2011-11-16 18:39:08.000000000 -0500
18968 +diff -urNp linux-3.1.4/mm/madvise.c linux-3.1.4/mm/madvise.c
18969 +--- linux-3.1.4/mm/madvise.c 2011-11-11 15:19:27.000000000 -0500
18970 ++++ linux-3.1.4/mm/madvise.c 2011-11-16 18:39:08.000000000 -0500
18971 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
18972 pgoff_t pgoff;
18973 unsigned long new_flags = vma->vm_flags;
18974 @@ -67552,9 +68483,9 @@ diff -urNp linux-3.1.3/mm/madvise.c linux-3.1.3/mm/madvise.c
18975 error = 0;
18976 if (end == start)
18977 goto out;
18978 -diff -urNp linux-3.1.3/mm/memory.c linux-3.1.3/mm/memory.c
18979 ---- linux-3.1.3/mm/memory.c 2011-11-11 15:19:27.000000000 -0500
18980 -+++ linux-3.1.3/mm/memory.c 2011-11-16 18:39:08.000000000 -0500
18981 +diff -urNp linux-3.1.4/mm/memory.c linux-3.1.4/mm/memory.c
18982 +--- linux-3.1.4/mm/memory.c 2011-11-11 15:19:27.000000000 -0500
18983 ++++ linux-3.1.4/mm/memory.c 2011-11-16 18:39:08.000000000 -0500
18984 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
18985 return;
18986
18987 @@ -68118,9 +69049,9 @@ diff -urNp linux-3.1.3/mm/memory.c linux-3.1.3/mm/memory.c
18988 /*
18989 * Make sure the vDSO gets into every core dump.
18990 * Dumping its contents makes post-mortem fully interpretable later
18991 -diff -urNp linux-3.1.3/mm/memory-failure.c linux-3.1.3/mm/memory-failure.c
18992 ---- linux-3.1.3/mm/memory-failure.c 2011-11-11 15:19:27.000000000 -0500
18993 -+++ linux-3.1.3/mm/memory-failure.c 2011-11-16 18:39:08.000000000 -0500
18994 +diff -urNp linux-3.1.4/mm/memory-failure.c linux-3.1.4/mm/memory-failure.c
18995 +--- linux-3.1.4/mm/memory-failure.c 2011-11-11 15:19:27.000000000 -0500
18996 ++++ linux-3.1.4/mm/memory-failure.c 2011-11-16 18:39:08.000000000 -0500
18997 @@ -60,7 +60,7 @@ int sysctl_memory_failure_early_kill __r
18998
18999 int sysctl_memory_failure_recovery __read_mostly = 1;
19000 @@ -68202,9 +69133,9 @@ diff -urNp linux-3.1.3/mm/memory-failure.c linux-3.1.3/mm/memory-failure.c
19001 SetPageHWPoison(page);
19002 /* keep elevated page count for bad page */
19003 return ret;
19004 -diff -urNp linux-3.1.3/mm/mempolicy.c linux-3.1.3/mm/mempolicy.c
19005 ---- linux-3.1.3/mm/mempolicy.c 2011-11-11 15:19:27.000000000 -0500
19006 -+++ linux-3.1.3/mm/mempolicy.c 2011-11-16 18:40:44.000000000 -0500
19007 +diff -urNp linux-3.1.4/mm/mempolicy.c linux-3.1.4/mm/mempolicy.c
19008 +--- linux-3.1.4/mm/mempolicy.c 2011-11-11 15:19:27.000000000 -0500
19009 ++++ linux-3.1.4/mm/mempolicy.c 2011-11-16 18:40:44.000000000 -0500
19010 @@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct
19011 unsigned long vmstart;
19012 unsigned long vmend;
19013 @@ -68276,9 +69207,9 @@ diff -urNp linux-3.1.3/mm/mempolicy.c linux-3.1.3/mm/mempolicy.c
19014 rcu_read_unlock();
19015 err = -EPERM;
19016 goto out;
19017 -diff -urNp linux-3.1.3/mm/migrate.c linux-3.1.3/mm/migrate.c
19018 ---- linux-3.1.3/mm/migrate.c 2011-11-11 15:19:27.000000000 -0500
19019 -+++ linux-3.1.3/mm/migrate.c 2011-11-16 18:40:44.000000000 -0500
19020 +diff -urNp linux-3.1.4/mm/migrate.c linux-3.1.4/mm/migrate.c
19021 +--- linux-3.1.4/mm/migrate.c 2011-11-11 15:19:27.000000000 -0500
19022 ++++ linux-3.1.4/mm/migrate.c 2011-11-16 18:40:44.000000000 -0500
19023 @@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
19024 unsigned long chunk_start;
19025 int err;
19026 @@ -68313,9 +69244,9 @@ diff -urNp linux-3.1.3/mm/migrate.c linux-3.1.3/mm/migrate.c
19027 rcu_read_unlock();
19028 err = -EPERM;
19029 goto out;
19030 -diff -urNp linux-3.1.3/mm/mlock.c linux-3.1.3/mm/mlock.c
19031 ---- linux-3.1.3/mm/mlock.c 2011-11-11 15:19:27.000000000 -0500
19032 -+++ linux-3.1.3/mm/mlock.c 2011-11-16 18:40:44.000000000 -0500
19033 +diff -urNp linux-3.1.4/mm/mlock.c linux-3.1.4/mm/mlock.c
19034 +--- linux-3.1.4/mm/mlock.c 2011-11-11 15:19:27.000000000 -0500
19035 ++++ linux-3.1.4/mm/mlock.c 2011-11-16 18:40:44.000000000 -0500
19036 @@ -13,6 +13,7 @@
19037 #include <linux/pagemap.h>
19038 #include <linux/mempolicy.h>
19039 @@ -68389,9 +69320,9 @@ diff -urNp linux-3.1.3/mm/mlock.c linux-3.1.3/mm/mlock.c
19040 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
19041 capable(CAP_IPC_LOCK))
19042 ret = do_mlockall(flags);
19043 -diff -urNp linux-3.1.3/mm/mmap.c linux-3.1.3/mm/mmap.c
19044 ---- linux-3.1.3/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
19045 -+++ linux-3.1.3/mm/mmap.c 2011-11-16 18:40:44.000000000 -0500
19046 +diff -urNp linux-3.1.4/mm/mmap.c linux-3.1.4/mm/mmap.c
19047 +--- linux-3.1.4/mm/mmap.c 2011-11-11 15:19:27.000000000 -0500
19048 ++++ linux-3.1.4/mm/mmap.c 2011-11-16 18:40:44.000000000 -0500
19049 @@ -46,6 +46,16 @@
19050 #define arch_rebalance_pgtables(addr, len) (addr)
19051 #endif
19052 @@ -69650,9 +70581,9 @@ diff -urNp linux-3.1.3/mm/mmap.c linux-3.1.3/mm/mmap.c
19053 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
19054 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
19055
19056 -diff -urNp linux-3.1.3/mm/mprotect.c linux-3.1.3/mm/mprotect.c
19057 ---- linux-3.1.3/mm/mprotect.c 2011-11-11 15:19:27.000000000 -0500
19058 -+++ linux-3.1.3/mm/mprotect.c 2011-11-16 18:40:44.000000000 -0500
19059 +diff -urNp linux-3.1.4/mm/mprotect.c linux-3.1.4/mm/mprotect.c
19060 +--- linux-3.1.4/mm/mprotect.c 2011-11-11 15:19:27.000000000 -0500
19061 ++++ linux-3.1.4/mm/mprotect.c 2011-11-16 18:40:44.000000000 -0500
19062 @@ -23,10 +23,16 @@
19063 #include <linux/mmu_notifier.h>
19064 #include <linux/migrate.h>
19065 @@ -69879,9 +70810,9 @@ diff -urNp linux-3.1.3/mm/mprotect.c linux-3.1.3/mm/mprotect.c
19066 nstart = tmp;
19067
19068 if (nstart < prev->vm_end)
19069 -diff -urNp linux-3.1.3/mm/mremap.c linux-3.1.3/mm/mremap.c
19070 ---- linux-3.1.3/mm/mremap.c 2011-11-11 15:19:27.000000000 -0500
19071 -+++ linux-3.1.3/mm/mremap.c 2011-11-16 18:39:08.000000000 -0500
19072 +diff -urNp linux-3.1.4/mm/mremap.c linux-3.1.4/mm/mremap.c
19073 +--- linux-3.1.4/mm/mremap.c 2011-11-11 15:19:27.000000000 -0500
19074 ++++ linux-3.1.4/mm/mremap.c 2011-11-16 18:39:08.000000000 -0500
19075 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
19076 continue;
19077 pte = ptep_clear_flush(vma, old_addr, old_pte);
19078 @@ -69986,9 +70917,9 @@ diff -urNp linux-3.1.3/mm/mremap.c linux-3.1.3/mm/mremap.c
19079 }
19080 out:
19081 if (ret & ~PAGE_MASK)
19082 -diff -urNp linux-3.1.3/mm/nobootmem.c linux-3.1.3/mm/nobootmem.c
19083 ---- linux-3.1.3/mm/nobootmem.c 2011-11-11 15:19:27.000000000 -0500
19084 -+++ linux-3.1.3/mm/nobootmem.c 2011-11-16 18:39:08.000000000 -0500
19085 +diff -urNp linux-3.1.4/mm/nobootmem.c linux-3.1.4/mm/nobootmem.c
19086 +--- linux-3.1.4/mm/nobootmem.c 2011-11-11 15:19:27.000000000 -0500
19087 ++++ linux-3.1.4/mm/nobootmem.c 2011-11-16 18:39:08.000000000 -0500
19088 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
19089 unsigned long __init free_all_memory_core_early(int nodeid)
19090 {
19091 @@ -70022,9 +70953,9 @@ diff -urNp linux-3.1.3/mm/nobootmem.c linux-3.1.3/mm/nobootmem.c
19092
19093 return count;
19094 }
19095 -diff -urNp linux-3.1.3/mm/nommu.c linux-3.1.3/mm/nommu.c
19096 ---- linux-3.1.3/mm/nommu.c 2011-11-11 15:19:27.000000000 -0500
19097 -+++ linux-3.1.3/mm/nommu.c 2011-11-16 18:39:08.000000000 -0500
19098 +diff -urNp linux-3.1.4/mm/nommu.c linux-3.1.4/mm/nommu.c
19099 +--- linux-3.1.4/mm/nommu.c 2011-11-11 15:19:27.000000000 -0500
19100 ++++ linux-3.1.4/mm/nommu.c 2011-11-16 18:39:08.000000000 -0500
19101 @@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMI
19102 int sysctl_overcommit_ratio = 50; /* default is 50% */
19103 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
19104 @@ -70057,9 +70988,9 @@ diff -urNp linux-3.1.3/mm/nommu.c linux-3.1.3/mm/nommu.c
19105 *region = *vma->vm_region;
19106 new->vm_region = region;
19107
19108 -diff -urNp linux-3.1.3/mm/oom_kill.c linux-3.1.3/mm/oom_kill.c
19109 ---- linux-3.1.3/mm/oom_kill.c 2011-11-11 15:19:27.000000000 -0500
19110 -+++ linux-3.1.3/mm/oom_kill.c 2011-11-18 18:44:21.000000000 -0500
19111 +diff -urNp linux-3.1.4/mm/oom_kill.c linux-3.1.4/mm/oom_kill.c
19112 +--- linux-3.1.4/mm/oom_kill.c 2011-11-11 15:19:27.000000000 -0500
19113 ++++ linux-3.1.4/mm/oom_kill.c 2011-11-18 18:44:21.000000000 -0500
19114 @@ -162,7 +162,7 @@ static bool oom_unkillable_task(struct t
19115 unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
19116 const nodemask_t *nodemask, unsigned long totalpages)
19117 @@ -70069,9 +71000,9 @@ diff -urNp linux-3.1.3/mm/oom_kill.c linux-3.1.3/mm/oom_kill.c
19118
19119 if (oom_unkillable_task(p, mem, nodemask))
19120 return 0;
19121 -diff -urNp linux-3.1.3/mm/page_alloc.c linux-3.1.3/mm/page_alloc.c
19122 ---- linux-3.1.3/mm/page_alloc.c 2011-11-11 15:19:27.000000000 -0500
19123 -+++ linux-3.1.3/mm/page_alloc.c 2011-11-16 18:40:44.000000000 -0500
19124 +diff -urNp linux-3.1.4/mm/page_alloc.c linux-3.1.4/mm/page_alloc.c
19125 +--- linux-3.1.4/mm/page_alloc.c 2011-11-11 15:19:27.000000000 -0500
19126 ++++ linux-3.1.4/mm/page_alloc.c 2011-11-16 18:40:44.000000000 -0500
19127 @@ -340,7 +340,7 @@ out:
19128 * This usage means that zero-order pages may not be compound.
19129 */
19130 @@ -70139,9 +71070,9 @@ diff -urNp linux-3.1.3/mm/page_alloc.c linux-3.1.3/mm/page_alloc.c
19131 return 1;
19132 }
19133 return 0;
19134 -diff -urNp linux-3.1.3/mm/percpu.c linux-3.1.3/mm/percpu.c
19135 ---- linux-3.1.3/mm/percpu.c 2011-11-11 15:19:27.000000000 -0500
19136 -+++ linux-3.1.3/mm/percpu.c 2011-11-16 18:39:08.000000000 -0500
19137 +diff -urNp linux-3.1.4/mm/percpu.c linux-3.1.4/mm/percpu.c
19138 +--- linux-3.1.4/mm/percpu.c 2011-11-11 15:19:27.000000000 -0500
19139 ++++ linux-3.1.4/mm/percpu.c 2011-11-16 18:39:08.000000000 -0500
19140 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu
19141 static unsigned int pcpu_last_unit_cpu __read_mostly;
19142
19143 @@ -70151,9 +71082,9 @@ diff -urNp linux-3.1.3/mm/percpu.c linux-3.1.3/mm/percpu.c
19144 EXPORT_SYMBOL_GPL(pcpu_base_addr);
19145
19146 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
19147 -diff -urNp linux-3.1.3/mm/rmap.c linux-3.1.3/mm/rmap.c
19148 ---- linux-3.1.3/mm/rmap.c 2011-11-11 15:19:27.000000000 -0500
19149 -+++ linux-3.1.3/mm/rmap.c 2011-11-16 18:39:08.000000000 -0500
19150 +diff -urNp linux-3.1.4/mm/rmap.c linux-3.1.4/mm/rmap.c
19151 +--- linux-3.1.4/mm/rmap.c 2011-11-11 15:19:27.000000000 -0500
19152 ++++ linux-3.1.4/mm/rmap.c 2011-11-16 18:39:08.000000000 -0500
19153 @@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_stru
19154 struct anon_vma *anon_vma = vma->anon_vma;
19155 struct anon_vma_chain *avc;
19156 @@ -70243,9 +71174,9 @@ diff -urNp linux-3.1.3/mm/rmap.c linux-3.1.3/mm/rmap.c
19157 {
19158 struct anon_vma_chain *avc;
19159 struct anon_vma *anon_vma;
19160 -diff -urNp linux-3.1.3/mm/shmem.c linux-3.1.3/mm/shmem.c
19161 ---- linux-3.1.3/mm/shmem.c 2011-11-11 15:19:27.000000000 -0500
19162 -+++ linux-3.1.3/mm/shmem.c 2011-11-16 19:28:28.000000000 -0500
19163 +diff -urNp linux-3.1.4/mm/shmem.c linux-3.1.4/mm/shmem.c
19164 +--- linux-3.1.4/mm/shmem.c 2011-11-11 15:19:27.000000000 -0500
19165 ++++ linux-3.1.4/mm/shmem.c 2011-11-16 19:28:28.000000000 -0500
19166 @@ -31,7 +31,7 @@
19167 #include <linux/module.h>
19168 #include <linux/swap.h>
19169 @@ -70283,9 +71214,9 @@ diff -urNp linux-3.1.3/mm/shmem.c linux-3.1.3/mm/shmem.c
19170 if (!sbinfo)
19171 return -ENOMEM;
19172
19173 -diff -urNp linux-3.1.3/mm/slab.c linux-3.1.3/mm/slab.c
19174 ---- linux-3.1.3/mm/slab.c 2011-11-11 15:19:27.000000000 -0500
19175 -+++ linux-3.1.3/mm/slab.c 2011-11-16 18:40:44.000000000 -0500
19176 +diff -urNp linux-3.1.4/mm/slab.c linux-3.1.4/mm/slab.c
19177 +--- linux-3.1.4/mm/slab.c 2011-11-11 15:19:27.000000000 -0500
19178 ++++ linux-3.1.4/mm/slab.c 2011-11-16 18:40:44.000000000 -0500
19179 @@ -151,7 +151,7 @@
19180
19181 /* Legal flag mask for kmem_cache_create(). */
19182 @@ -70461,9 +71392,9 @@ diff -urNp linux-3.1.3/mm/slab.c linux-3.1.3/mm/slab.c
19183 /**
19184 * ksize - get the actual amount of memory allocated for a given object
19185 * @objp: Pointer to the object
19186 -diff -urNp linux-3.1.3/mm/slob.c linux-3.1.3/mm/slob.c
19187 ---- linux-3.1.3/mm/slob.c 2011-11-11 15:19:27.000000000 -0500
19188 -+++ linux-3.1.3/mm/slob.c 2011-11-16 18:39:08.000000000 -0500
19189 +diff -urNp linux-3.1.4/mm/slob.c linux-3.1.4/mm/slob.c
19190 +--- linux-3.1.4/mm/slob.c 2011-11-11 15:19:27.000000000 -0500
19191 ++++ linux-3.1.4/mm/slob.c 2011-11-16 18:39:08.000000000 -0500
19192 @@ -29,7 +29,7 @@
19193 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
19194 * alloc_pages() directly, allocating compound pages so the page order
19195 @@ -70816,9 +71747,9 @@ diff -urNp linux-3.1.3/mm/slob.c linux-3.1.3/mm/slob.c
19196 }
19197 EXPORT_SYMBOL(kmem_cache_free);
19198
19199 -diff -urNp linux-3.1.3/mm/slub.c linux-3.1.3/mm/slub.c
19200 ---- linux-3.1.3/mm/slub.c 2011-11-11 15:19:27.000000000 -0500
19201 -+++ linux-3.1.3/mm/slub.c 2011-11-16 19:27:25.000000000 -0500
19202 +diff -urNp linux-3.1.4/mm/slub.c linux-3.1.4/mm/slub.c
19203 +--- linux-3.1.4/mm/slub.c 2011-11-11 15:19:27.000000000 -0500
19204 ++++ linux-3.1.4/mm/slub.c 2011-11-16 19:27:25.000000000 -0500
19205 @@ -208,7 +208,7 @@ struct track {
19206
19207 enum track_item { TRACK_ALLOC, TRACK_FREE };
19208 @@ -71062,9 +71993,9 @@ diff -urNp linux-3.1.3/mm/slub.c linux-3.1.3/mm/slub.c
19209 return 0;
19210 }
19211 module_init(slab_proc_init);
19212 -diff -urNp linux-3.1.3/mm/swap.c linux-3.1.3/mm/swap.c
19213 ---- linux-3.1.3/mm/swap.c 2011-11-11 15:19:27.000000000 -0500
19214 -+++ linux-3.1.3/mm/swap.c 2011-11-16 18:39:08.000000000 -0500
19215 +diff -urNp linux-3.1.4/mm/swap.c linux-3.1.4/mm/swap.c
19216 +--- linux-3.1.4/mm/swap.c 2011-11-11 15:19:27.000000000 -0500
19217 ++++ linux-3.1.4/mm/swap.c 2011-11-16 18:39:08.000000000 -0500
19218 @@ -31,6 +31,7 @@
19219 #include <linux/backing-dev.h>
19220 #include <linux/memcontrol.h>
19221 @@ -71082,9 +72013,9 @@ diff -urNp linux-3.1.3/mm/swap.c linux-3.1.3/mm/swap.c
19222 (*dtor)(page);
19223 }
19224
19225 -diff -urNp linux-3.1.3/mm/swapfile.c linux-3.1.3/mm/swapfile.c
19226 ---- linux-3.1.3/mm/swapfile.c 2011-11-11 15:19:27.000000000 -0500
19227 -+++ linux-3.1.3/mm/swapfile.c 2011-11-16 18:39:08.000000000 -0500
19228 +diff -urNp linux-3.1.4/mm/swapfile.c linux-3.1.4/mm/swapfile.c
19229 +--- linux-3.1.4/mm/swapfile.c 2011-11-11 15:19:27.000000000 -0500
19230 ++++ linux-3.1.4/mm/swapfile.c 2011-11-16 18:39:08.000000000 -0500
19231 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
19232
19233 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
19234 @@ -71132,9 +72063,9 @@ diff -urNp linux-3.1.3/mm/swapfile.c linux-3.1.3/mm/swapfile.c
19235 wake_up_interruptible(&proc_poll_wait);
19236
19237 if (S_ISREG(inode->i_mode))
19238 -diff -urNp linux-3.1.3/mm/util.c linux-3.1.3/mm/util.c
19239 ---- linux-3.1.3/mm/util.c 2011-11-11 15:19:27.000000000 -0500
19240 -+++ linux-3.1.3/mm/util.c 2011-11-16 18:39:08.000000000 -0500
19241 +diff -urNp linux-3.1.4/mm/util.c linux-3.1.4/mm/util.c
19242 +--- linux-3.1.4/mm/util.c 2011-11-11 15:19:27.000000000 -0500
19243 ++++ linux-3.1.4/mm/util.c 2011-11-16 18:39:08.000000000 -0500
19244 @@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
19245 * allocated buffer. Use this if you don't want to free the buffer immediately
19246 * like, for example, with RCU.
19247 @@ -71164,9 +72095,9 @@ diff -urNp linux-3.1.3/mm/util.c linux-3.1.3/mm/util.c
19248 mm->get_unmapped_area = arch_get_unmapped_area;
19249 mm->unmap_area = arch_unmap_area;
19250 }
19251 -diff -urNp linux-3.1.3/mm/vmalloc.c linux-3.1.3/mm/vmalloc.c
19252 ---- linux-3.1.3/mm/vmalloc.c 2011-11-11 15:19:27.000000000 -0500
19253 -+++ linux-3.1.3/mm/vmalloc.c 2011-11-16 18:40:44.000000000 -0500
19254 +diff -urNp linux-3.1.4/mm/vmalloc.c linux-3.1.4/mm/vmalloc.c
19255 +--- linux-3.1.4/mm/vmalloc.c 2011-11-11 15:19:27.000000000 -0500
19256 ++++ linux-3.1.4/mm/vmalloc.c 2011-11-16 18:40:44.000000000 -0500
19257 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
19258
19259 pte = pte_offset_kernel(pmd, addr);
19260 @@ -71399,9 +72330,9 @@ diff -urNp linux-3.1.3/mm/vmalloc.c linux-3.1.3/mm/vmalloc.c
19261 if ((PAGE_SIZE-1) & (unsigned long)addr)
19262 return -EINVAL;
19263
19264 -diff -urNp linux-3.1.3/mm/vmstat.c linux-3.1.3/mm/vmstat.c
19265 ---- linux-3.1.3/mm/vmstat.c 2011-11-11 15:19:27.000000000 -0500
19266 -+++ linux-3.1.3/mm/vmstat.c 2011-11-16 18:40:44.000000000 -0500
19267 +diff -urNp linux-3.1.4/mm/vmstat.c linux-3.1.4/mm/vmstat.c
19268 +--- linux-3.1.4/mm/vmstat.c 2011-11-11 15:19:27.000000000 -0500
19269 ++++ linux-3.1.4/mm/vmstat.c 2011-11-16 18:40:44.000000000 -0500
19270 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
19271 *
19272 * vm_stat contains the global counters
19273 @@ -71454,9 +72385,9 @@ diff -urNp linux-3.1.3/mm/vmstat.c linux-3.1.3/mm/vmstat.c
19274 #endif
19275 return 0;
19276 }
19277 -diff -urNp linux-3.1.3/net/8021q/vlan.c linux-3.1.3/net/8021q/vlan.c
19278 ---- linux-3.1.3/net/8021q/vlan.c 2011-11-11 15:19:27.000000000 -0500
19279 -+++ linux-3.1.3/net/8021q/vlan.c 2011-11-16 18:39:08.000000000 -0500
19280 +diff -urNp linux-3.1.4/net/8021q/vlan.c linux-3.1.4/net/8021q/vlan.c
19281 +--- linux-3.1.4/net/8021q/vlan.c 2011-11-11 15:19:27.000000000 -0500
19282 ++++ linux-3.1.4/net/8021q/vlan.c 2011-11-16 18:39:08.000000000 -0500
19283 @@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net
19284 err = -EPERM;
19285 if (!capable(CAP_NET_ADMIN))
19286 @@ -71467,9 +72398,9 @@ diff -urNp linux-3.1.3/net/8021q/vlan.c linux-3.1.3/net/8021q/vlan.c
19287 struct vlan_net *vn;
19288
19289 vn = net_generic(net, vlan_net_id);
19290 -diff -urNp linux-3.1.3/net/9p/trans_fd.c linux-3.1.3/net/9p/trans_fd.c
19291 ---- linux-3.1.3/net/9p/trans_fd.c 2011-11-11 15:19:27.000000000 -0500
19292 -+++ linux-3.1.3/net/9p/trans_fd.c 2011-11-16 18:39:08.000000000 -0500
19293 +diff -urNp linux-3.1.4/net/9p/trans_fd.c linux-3.1.4/net/9p/trans_fd.c
19294 +--- linux-3.1.4/net/9p/trans_fd.c 2011-11-11 15:19:27.000000000 -0500
19295 ++++ linux-3.1.4/net/9p/trans_fd.c 2011-11-16 18:39:08.000000000 -0500
19296 @@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client
19297 oldfs = get_fs();
19298 set_fs(get_ds());
19299 @@ -71479,9 +72410,9 @@ diff -urNp linux-3.1.3/net/9p/trans_fd.c linux-3.1.3/net/9p/trans_fd.c
19300 set_fs(oldfs);
19301
19302 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
19303 -diff -urNp linux-3.1.3/net/9p/trans_virtio.c linux-3.1.3/net/9p/trans_virtio.c
19304 ---- linux-3.1.3/net/9p/trans_virtio.c 2011-11-11 15:19:27.000000000 -0500
19305 -+++ linux-3.1.3/net/9p/trans_virtio.c 2011-11-16 18:39:08.000000000 -0500
19306 +diff -urNp linux-3.1.4/net/9p/trans_virtio.c linux-3.1.4/net/9p/trans_virtio.c
19307 +--- linux-3.1.4/net/9p/trans_virtio.c 2011-11-11 15:19:27.000000000 -0500
19308 ++++ linux-3.1.4/net/9p/trans_virtio.c 2011-11-16 18:39:08.000000000 -0500
19309 @@ -327,7 +327,7 @@ req_retry_pinned:
19310 } else {
19311 char *pbuf;
19312 @@ -71500,9 +72431,9 @@ diff -urNp linux-3.1.3/net/9p/trans_virtio.c linux-3.1.3/net/9p/trans_virtio.c
19313 else
19314 pbuf = req->tc->pkbuf;
19315
19316 -diff -urNp linux-3.1.3/net/atm/atm_misc.c linux-3.1.3/net/atm/atm_misc.c
19317 ---- linux-3.1.3/net/atm/atm_misc.c 2011-11-11 15:19:27.000000000 -0500
19318 -+++ linux-3.1.3/net/atm/atm_misc.c 2011-11-16 18:39:08.000000000 -0500
19319 +diff -urNp linux-3.1.4/net/atm/atm_misc.c linux-3.1.4/net/atm/atm_misc.c
19320 +--- linux-3.1.4/net/atm/atm_misc.c 2011-11-11 15:19:27.000000000 -0500
19321 ++++ linux-3.1.4/net/atm/atm_misc.c 2011-11-16 18:39:08.000000000 -0500
19322 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int
19323 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
19324 return 1;
19325 @@ -71539,9 +72470,9 @@ diff -urNp linux-3.1.3/net/atm/atm_misc.c linux-3.1.3/net/atm/atm_misc.c
19326 __SONET_ITEMS
19327 #undef __HANDLE_ITEM
19328 }
19329 -diff -urNp linux-3.1.3/net/atm/lec.h linux-3.1.3/net/atm/lec.h
19330 ---- linux-3.1.3/net/atm/lec.h 2011-11-11 15:19:27.000000000 -0500
19331 -+++ linux-3.1.3/net/atm/lec.h 2011-11-16 18:39:08.000000000 -0500
19332 +diff -urNp linux-3.1.4/net/atm/lec.h linux-3.1.4/net/atm/lec.h
19333 +--- linux-3.1.4/net/atm/lec.h 2011-11-11 15:19:27.000000000 -0500
19334 ++++ linux-3.1.4/net/atm/lec.h 2011-11-16 18:39:08.000000000 -0500
19335 @@ -48,7 +48,7 @@ struct lane2_ops {
19336 const u8 *tlvs, u32 sizeoftlvs);
19337 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
19338 @@ -71551,9 +72482,9 @@ diff -urNp linux-3.1.3/net/atm/lec.h linux-3.1.3/net/atm/lec.h
19339
19340 /*
19341 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
19342 -diff -urNp linux-3.1.3/net/atm/mpc.h linux-3.1.3/net/atm/mpc.h
19343 ---- linux-3.1.3/net/atm/mpc.h 2011-11-11 15:19:27.000000000 -0500
19344 -+++ linux-3.1.3/net/atm/mpc.h 2011-11-16 18:39:08.000000000 -0500
19345 +diff -urNp linux-3.1.4/net/atm/mpc.h linux-3.1.4/net/atm/mpc.h
19346 +--- linux-3.1.4/net/atm/mpc.h 2011-11-11 15:19:27.000000000 -0500
19347 ++++ linux-3.1.4/net/atm/mpc.h 2011-11-16 18:39:08.000000000 -0500
19348 @@ -33,7 +33,7 @@ struct mpoa_client {
19349 struct mpc_parameters parameters; /* parameters for this client */
19350
19351 @@ -71563,9 +72494,9 @@ diff -urNp linux-3.1.3/net/atm/mpc.h linux-3.1.3/net/atm/mpc.h
19352 };
19353
19354
19355 -diff -urNp linux-3.1.3/net/atm/mpoa_caches.c linux-3.1.3/net/atm/mpoa_caches.c
19356 ---- linux-3.1.3/net/atm/mpoa_caches.c 2011-11-11 15:19:27.000000000 -0500
19357 -+++ linux-3.1.3/net/atm/mpoa_caches.c 2011-11-16 18:40:44.000000000 -0500
19358 +diff -urNp linux-3.1.4/net/atm/mpoa_caches.c linux-3.1.4/net/atm/mpoa_caches.c
19359 +--- linux-3.1.4/net/atm/mpoa_caches.c 2011-11-11 15:19:27.000000000 -0500
19360 ++++ linux-3.1.4/net/atm/mpoa_caches.c 2011-11-16 18:40:44.000000000 -0500
19361 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru
19362 struct timeval now;
19363 struct k_message msg;
19364 @@ -71575,9 +72506,9 @@ diff -urNp linux-3.1.3/net/atm/mpoa_caches.c linux-3.1.3/net/atm/mpoa_caches.c
19365 do_gettimeofday(&now);
19366
19367 read_lock_bh(&client->ingress_lock);
19368 -diff -urNp linux-3.1.3/net/atm/proc.c linux-3.1.3/net/atm/proc.c
19369 ---- linux-3.1.3/net/atm/proc.c 2011-11-11 15:19:27.000000000 -0500
19370 -+++ linux-3.1.3/net/atm/proc.c 2011-11-16 18:39:08.000000000 -0500
19371 +diff -urNp linux-3.1.4/net/atm/proc.c linux-3.1.4/net/atm/proc.c
19372 +--- linux-3.1.4/net/atm/proc.c 2011-11-11 15:19:27.000000000 -0500
19373 ++++ linux-3.1.4/net/atm/proc.c 2011-11-16 18:39:08.000000000 -0500
19374 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
19375 const struct k_atm_aal_stats *stats)
19376 {
19377 @@ -71591,9 +72522,9 @@ diff -urNp linux-3.1.3/net/atm/proc.c linux-3.1.3/net/atm/proc.c
19378 }
19379
19380 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
19381 -diff -urNp linux-3.1.3/net/atm/resources.c linux-3.1.3/net/atm/resources.c
19382 ---- linux-3.1.3/net/atm/resources.c 2011-11-11 15:19:27.000000000 -0500
19383 -+++ linux-3.1.3/net/atm/resources.c 2011-11-16 18:39:08.000000000 -0500
19384 +diff -urNp linux-3.1.4/net/atm/resources.c linux-3.1.4/net/atm/resources.c
19385 +--- linux-3.1.4/net/atm/resources.c 2011-11-11 15:19:27.000000000 -0500
19386 ++++ linux-3.1.4/net/atm/resources.c 2011-11-16 18:39:08.000000000 -0500
19387 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
19388 static void copy_aal_stats(struct k_atm_aal_stats *from,
19389 struct atm_aal_stats *to)
19390 @@ -71612,9 +72543,9 @@ diff -urNp linux-3.1.3/net/atm/resources.c linux-3.1.3/net/atm/resources.c
19391 __AAL_STAT_ITEMS
19392 #undef __HANDLE_ITEM
19393 }
19394 -diff -urNp linux-3.1.3/net/batman-adv/hard-interface.c linux-3.1.3/net/batman-adv/hard-interface.c
19395 ---- linux-3.1.3/net/batman-adv/hard-interface.c 2011-11-11 15:19:27.000000000 -0500
19396 -+++ linux-3.1.3/net/batman-adv/hard-interface.c 2011-11-16 18:39:08.000000000 -0500
19397 +diff -urNp linux-3.1.4/net/batman-adv/hard-interface.c linux-3.1.4/net/batman-adv/hard-interface.c
19398 +--- linux-3.1.4/net/batman-adv/hard-interface.c 2011-11-11 15:19:27.000000000 -0500
19399 ++++ linux-3.1.4/net/batman-adv/hard-interface.c 2011-11-16 18:39:08.000000000 -0500
19400 @@ -347,8 +347,8 @@ int hardif_enable_interface(struct hard_
19401 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
19402 dev_add_pack(&hard_iface->batman_adv_ptype);
19403 @@ -71626,9 +72557,9 @@ diff -urNp linux-3.1.3/net/batman-adv/hard-interface.c linux-3.1.3/net/batman-ad
19404 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
19405 hard_iface->net_dev->name);
19406
19407 -diff -urNp linux-3.1.3/net/batman-adv/routing.c linux-3.1.3/net/batman-adv/routing.c
19408 ---- linux-3.1.3/net/batman-adv/routing.c 2011-11-11 15:19:27.000000000 -0500
19409 -+++ linux-3.1.3/net/batman-adv/routing.c 2011-11-16 18:39:08.000000000 -0500
19410 +diff -urNp linux-3.1.4/net/batman-adv/routing.c linux-3.1.4/net/batman-adv/routing.c
19411 +--- linux-3.1.4/net/batman-adv/routing.c 2011-11-11 15:19:27.000000000 -0500
19412 ++++ linux-3.1.4/net/batman-adv/routing.c 2011-11-16 18:39:08.000000000 -0500
19413 @@ -656,7 +656,7 @@ void receive_bat_packet(const struct eth
19414 return;
19415
19416 @@ -71638,9 +72569,9 @@ diff -urNp linux-3.1.3/net/batman-adv/routing.c linux-3.1.3/net/batman-adv/routi
19417
19418 has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
19419
19420 -diff -urNp linux-3.1.3/net/batman-adv/send.c linux-3.1.3/net/batman-adv/send.c
19421 ---- linux-3.1.3/net/batman-adv/send.c 2011-11-11 15:19:27.000000000 -0500
19422 -+++ linux-3.1.3/net/batman-adv/send.c 2011-11-16 18:39:08.000000000 -0500
19423 +diff -urNp linux-3.1.4/net/batman-adv/send.c linux-3.1.4/net/batman-adv/send.c
19424 +--- linux-3.1.4/net/batman-adv/send.c 2011-11-11 15:19:27.000000000 -0500
19425 ++++ linux-3.1.4/net/batman-adv/send.c 2011-11-16 18:39:08.000000000 -0500
19426 @@ -326,7 +326,7 @@ void schedule_own_packet(struct hard_ifa
19427
19428 /* change sequence number to network order */
19429 @@ -71659,9 +72590,9 @@ diff -urNp linux-3.1.3/net/batman-adv/send.c linux-3.1.3/net/batman-adv/send.c
19430
19431 slide_own_bcast_window(hard_iface);
19432 send_time = own_send_time(bat_priv);
19433 -diff -urNp linux-3.1.3/net/batman-adv/soft-interface.c linux-3.1.3/net/batman-adv/soft-interface.c
19434 ---- linux-3.1.3/net/batman-adv/soft-interface.c 2011-11-11 15:19:27.000000000 -0500
19435 -+++ linux-3.1.3/net/batman-adv/soft-interface.c 2011-11-16 18:39:08.000000000 -0500
19436 +diff -urNp linux-3.1.4/net/batman-adv/soft-interface.c linux-3.1.4/net/batman-adv/soft-interface.c
19437 +--- linux-3.1.4/net/batman-adv/soft-interface.c 2011-11-11 15:19:27.000000000 -0500
19438 ++++ linux-3.1.4/net/batman-adv/soft-interface.c 2011-11-16 18:39:08.000000000 -0500
19439 @@ -632,7 +632,7 @@ static int interface_tx(struct sk_buff *
19440
19441 /* set broadcast sequence number */
19442 @@ -71680,9 +72611,9 @@ diff -urNp linux-3.1.3/net/batman-adv/soft-interface.c linux-3.1.3/net/batman-ad
19443 atomic_set(&bat_priv->ttvn, 0);
19444 atomic_set(&bat_priv->tt_local_changes, 0);
19445 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
19446 -diff -urNp linux-3.1.3/net/batman-adv/types.h linux-3.1.3/net/batman-adv/types.h
19447 ---- linux-3.1.3/net/batman-adv/types.h 2011-11-26 19:57:29.000000000 -0500
19448 -+++ linux-3.1.3/net/batman-adv/types.h 2011-11-26 20:00:43.000000000 -0500
19449 +diff -urNp linux-3.1.4/net/batman-adv/types.h linux-3.1.4/net/batman-adv/types.h
19450 +--- linux-3.1.4/net/batman-adv/types.h 2011-11-26 19:57:29.000000000 -0500
19451 ++++ linux-3.1.4/net/batman-adv/types.h 2011-11-26 20:00:43.000000000 -0500
19452 @@ -38,8 +38,8 @@ struct hard_iface {
19453 int16_t if_num;
19454 char if_status;
19455 @@ -71703,9 +72634,9 @@ diff -urNp linux-3.1.3/net/batman-adv/types.h linux-3.1.3/net/batman-adv/types.h
19456 atomic_t bcast_queue_left;
19457 atomic_t batman_queue_left;
19458 atomic_t ttvn; /* tranlation table version number */
19459 -diff -urNp linux-3.1.3/net/batman-adv/unicast.c linux-3.1.3/net/batman-adv/unicast.c
19460 ---- linux-3.1.3/net/batman-adv/unicast.c 2011-11-11 15:19:27.000000000 -0500
19461 -+++ linux-3.1.3/net/batman-adv/unicast.c 2011-11-16 18:39:08.000000000 -0500
19462 +diff -urNp linux-3.1.4/net/batman-adv/unicast.c linux-3.1.4/net/batman-adv/unicast.c
19463 +--- linux-3.1.4/net/batman-adv/unicast.c 2011-11-11 15:19:27.000000000 -0500
19464 ++++ linux-3.1.4/net/batman-adv/unicast.c 2011-11-16 18:39:08.000000000 -0500
19465 @@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, s
19466 frag1->flags = UNI_FRAG_HEAD | large_tail;
19467 frag2->flags = large_tail;
19468 @@ -71715,9 +72646,9 @@ diff -urNp linux-3.1.3/net/batman-adv/unicast.c linux-3.1.3/net/batman-adv/unica
19469 frag1->seqno = htons(seqno - 1);
19470 frag2->seqno = htons(seqno);
19471
19472 -diff -urNp linux-3.1.3/net/bluetooth/hci_conn.c linux-3.1.3/net/bluetooth/hci_conn.c
19473 ---- linux-3.1.3/net/bluetooth/hci_conn.c 2011-11-11 15:19:27.000000000 -0500
19474 -+++ linux-3.1.3/net/bluetooth/hci_conn.c 2011-11-16 18:39:08.000000000 -0500
19475 +diff -urNp linux-3.1.4/net/bluetooth/hci_conn.c linux-3.1.4/net/bluetooth/hci_conn.c
19476 +--- linux-3.1.4/net/bluetooth/hci_conn.c 2011-11-11 15:19:27.000000000 -0500
19477 ++++ linux-3.1.4/net/bluetooth/hci_conn.c 2011-11-16 18:39:08.000000000 -0500
19478 @@ -218,7 +218,7 @@ void hci_le_start_enc(struct hci_conn *c
19479 cp.handle = cpu_to_le16(conn->handle);
19480 memcpy(cp.ltk, ltk, sizeof(cp.ltk));
19481 @@ -71736,9 +72667,9 @@ diff -urNp linux-3.1.3/net/bluetooth/hci_conn.c linux-3.1.3/net/bluetooth/hci_co
19482
19483 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
19484 }
19485 -diff -urNp linux-3.1.3/net/bridge/br_multicast.c linux-3.1.3/net/bridge/br_multicast.c
19486 ---- linux-3.1.3/net/bridge/br_multicast.c 2011-11-11 15:19:27.000000000 -0500
19487 -+++ linux-3.1.3/net/bridge/br_multicast.c 2011-11-16 18:39:08.000000000 -0500
19488 +diff -urNp linux-3.1.4/net/bridge/br_multicast.c linux-3.1.4/net/bridge/br_multicast.c
19489 +--- linux-3.1.4/net/bridge/br_multicast.c 2011-11-11 15:19:27.000000000 -0500
19490 ++++ linux-3.1.4/net/bridge/br_multicast.c 2011-11-16 18:39:08.000000000 -0500
19491 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct
19492 nexthdr = ip6h->nexthdr;
19493 offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
19494 @@ -71748,9 +72679,9 @@ diff -urNp linux-3.1.3/net/bridge/br_multicast.c linux-3.1.3/net/bridge/br_multi
19495 return 0;
19496
19497 /* Okay, we found ICMPv6 header */
19498 -diff -urNp linux-3.1.3/net/bridge/netfilter/ebtables.c linux-3.1.3/net/bridge/netfilter/ebtables.c
19499 ---- linux-3.1.3/net/bridge/netfilter/ebtables.c 2011-11-11 15:19:27.000000000 -0500
19500 -+++ linux-3.1.3/net/bridge/netfilter/ebtables.c 2011-11-16 18:40:44.000000000 -0500
19501 +diff -urNp linux-3.1.4/net/bridge/netfilter/ebtables.c linux-3.1.4/net/bridge/netfilter/ebtables.c
19502 +--- linux-3.1.4/net/bridge/netfilter/ebtables.c 2011-11-11 15:19:27.000000000 -0500
19503 ++++ linux-3.1.4/net/bridge/netfilter/ebtables.c 2011-11-16 18:40:44.000000000 -0500
19504 @@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *s
19505 tmp.valid_hooks = t->table->valid_hooks;
19506 }
19507 @@ -71769,9 +72700,9 @@ diff -urNp linux-3.1.3/net/bridge/netfilter/ebtables.c linux-3.1.3/net/bridge/ne
19508 memset(&tinfo, 0, sizeof(tinfo));
19509
19510 if (cmd == EBT_SO_GET_ENTRIES) {
19511 -diff -urNp linux-3.1.3/net/caif/caif_socket.c linux-3.1.3/net/caif/caif_socket.c
19512 ---- linux-3.1.3/net/caif/caif_socket.c 2011-11-11 15:19:27.000000000 -0500
19513 -+++ linux-3.1.3/net/caif/caif_socket.c 2011-11-16 18:39:08.000000000 -0500
19514 +diff -urNp linux-3.1.4/net/caif/caif_socket.c linux-3.1.4/net/caif/caif_socket.c
19515 +--- linux-3.1.4/net/caif/caif_socket.c 2011-11-11 15:19:27.000000000 -0500
19516 ++++ linux-3.1.4/net/caif/caif_socket.c 2011-11-16 18:39:08.000000000 -0500
19517 @@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
19518 #ifdef CONFIG_DEBUG_FS
19519 struct debug_fs_counter {
19520 @@ -71901,9 +72832,9 @@ diff -urNp linux-3.1.3/net/caif/caif_socket.c linux-3.1.3/net/caif/caif_socket.c
19521 #ifdef CONFIG_DEBUG_FS
19522 if (!IS_ERR(debugfsdir)) {
19523
19524 -diff -urNp linux-3.1.3/net/caif/cfctrl.c linux-3.1.3/net/caif/cfctrl.c
19525 ---- linux-3.1.3/net/caif/cfctrl.c 2011-11-11 15:19:27.000000000 -0500
19526 -+++ linux-3.1.3/net/caif/cfctrl.c 2011-11-16 18:40:44.000000000 -0500
19527 +diff -urNp linux-3.1.4/net/caif/cfctrl.c linux-3.1.4/net/caif/cfctrl.c
19528 +--- linux-3.1.4/net/caif/cfctrl.c 2011-11-11 15:19:27.000000000 -0500
19529 ++++ linux-3.1.4/net/caif/cfctrl.c 2011-11-16 18:40:44.000000000 -0500
19530 @@ -9,6 +9,7 @@
19531 #include <linux/stddef.h>
19532 #include <linux/spinlock.h>
19533 @@ -71951,9 +72882,9 @@ diff -urNp linux-3.1.3/net/caif/cfctrl.c linux-3.1.3/net/caif/cfctrl.c
19534
19535 cfpkt_extr_head(pkt, &cmdrsp, 1);
19536 cmd = cmdrsp & CFCTRL_CMD_MASK;
19537 -diff -urNp linux-3.1.3/net/compat.c linux-3.1.3/net/compat.c
19538 ---- linux-3.1.3/net/compat.c 2011-11-11 15:19:27.000000000 -0500
19539 -+++ linux-3.1.3/net/compat.c 2011-11-16 18:39:08.000000000 -0500
19540 +diff -urNp linux-3.1.4/net/compat.c linux-3.1.4/net/compat.c
19541 +--- linux-3.1.4/net/compat.c 2011-11-11 15:19:27.000000000 -0500
19542 ++++ linux-3.1.4/net/compat.c 2011-11-16 18:39:08.000000000 -0500
19543 @@ -70,9 +70,9 @@ int get_compat_msghdr(struct msghdr *kms
19544 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
19545 __get_user(kmsg->msg_flags, &umsg->msg_flags))
19546 @@ -72081,9 +73012,9 @@ diff -urNp linux-3.1.3/net/compat.c linux-3.1.3/net/compat.c
19547 struct group_filter __user *kgf;
19548 int __user *koptlen;
19549 u32 interface, fmode, numsrc;
19550 -diff -urNp linux-3.1.3/net/core/datagram.c linux-3.1.3/net/core/datagram.c
19551 ---- linux-3.1.3/net/core/datagram.c 2011-11-11 15:19:27.000000000 -0500
19552 -+++ linux-3.1.3/net/core/datagram.c 2011-11-16 18:39:08.000000000 -0500
19553 +diff -urNp linux-3.1.4/net/core/datagram.c linux-3.1.4/net/core/datagram.c
19554 +--- linux-3.1.4/net/core/datagram.c 2011-11-11 15:19:27.000000000 -0500
19555 ++++ linux-3.1.4/net/core/datagram.c 2011-11-16 18:39:08.000000000 -0500
19556 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
19557 }
19558
19559 @@ -72093,9 +73024,9 @@ diff -urNp linux-3.1.3/net/core/datagram.c linux-3.1.3/net/core/datagram.c
19560 sk_mem_reclaim_partial(sk);
19561
19562 return err;
19563 -diff -urNp linux-3.1.3/net/core/dev.c linux-3.1.3/net/core/dev.c
19564 ---- linux-3.1.3/net/core/dev.c 2011-11-11 15:19:27.000000000 -0500
19565 -+++ linux-3.1.3/net/core/dev.c 2011-11-16 18:40:44.000000000 -0500
19566 +diff -urNp linux-3.1.4/net/core/dev.c linux-3.1.4/net/core/dev.c
19567 +--- linux-3.1.4/net/core/dev.c 2011-11-11 15:19:27.000000000 -0500
19568 ++++ linux-3.1.4/net/core/dev.c 2011-11-16 18:40:44.000000000 -0500
19569 @@ -1135,10 +1135,14 @@ void dev_load(struct net *net, const cha
19570 if (no_module && capable(CAP_NET_ADMIN))
19571 no_module = request_module("netdev-%s", name);
19572 @@ -72138,9 +73069,9 @@ diff -urNp linux-3.1.3/net/core/dev.c linux-3.1.3/net/core/dev.c
19573 {
19574 struct softnet_data *sd = &__get_cpu_var(softnet_data);
19575 unsigned long time_limit = jiffies + 2;
19576 -diff -urNp linux-3.1.3/net/core/flow.c linux-3.1.3/net/core/flow.c
19577 ---- linux-3.1.3/net/core/flow.c 2011-11-11 15:19:27.000000000 -0500
19578 -+++ linux-3.1.3/net/core/flow.c 2011-11-16 18:39:08.000000000 -0500
19579 +diff -urNp linux-3.1.4/net/core/flow.c linux-3.1.4/net/core/flow.c
19580 +--- linux-3.1.4/net/core/flow.c 2011-11-11 15:19:27.000000000 -0500
19581 ++++ linux-3.1.4/net/core/flow.c 2011-11-16 18:39:08.000000000 -0500
19582 @@ -61,7 +61,7 @@ struct flow_cache {
19583 struct timer_list rnd_timer;
19584 };
19585 @@ -72177,9 +73108,9 @@ diff -urNp linux-3.1.3/net/core/flow.c linux-3.1.3/net/core/flow.c
19586 if (!IS_ERR(flo))
19587 fle->object = flo;
19588 else
19589 -diff -urNp linux-3.1.3/net/core/iovec.c linux-3.1.3/net/core/iovec.c
19590 ---- linux-3.1.3/net/core/iovec.c 2011-11-11 15:19:27.000000000 -0500
19591 -+++ linux-3.1.3/net/core/iovec.c 2011-11-16 18:39:08.000000000 -0500
19592 +diff -urNp linux-3.1.4/net/core/iovec.c linux-3.1.4/net/core/iovec.c
19593 +--- linux-3.1.4/net/core/iovec.c 2011-11-11 15:19:27.000000000 -0500
19594 ++++ linux-3.1.4/net/core/iovec.c 2011-11-16 18:39:08.000000000 -0500
19595 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc
19596 if (m->msg_namelen) {
19597 if (mode == VERIFY_READ) {
19598 @@ -72198,9 +73129,9 @@ diff -urNp linux-3.1.3/net/core/iovec.c linux-3.1.3/net/core/iovec.c
19599 return -EFAULT;
19600
19601 m->msg_iov = iov;
19602 -diff -urNp linux-3.1.3/net/core/rtnetlink.c linux-3.1.3/net/core/rtnetlink.c
19603 ---- linux-3.1.3/net/core/rtnetlink.c 2011-11-11 15:19:27.000000000 -0500
19604 -+++ linux-3.1.3/net/core/rtnetlink.c 2011-11-16 18:39:08.000000000 -0500
19605 +diff -urNp linux-3.1.4/net/core/rtnetlink.c linux-3.1.4/net/core/rtnetlink.c
19606 +--- linux-3.1.4/net/core/rtnetlink.c 2011-11-11 15:19:27.000000000 -0500
19607 ++++ linux-3.1.4/net/core/rtnetlink.c 2011-11-16 18:39:08.000000000 -0500
19608 @@ -57,7 +57,7 @@ struct rtnl_link {
19609 rtnl_doit_func doit;
19610 rtnl_dumpit_func dumpit;
19611 @@ -72210,9 +73141,9 @@ diff -urNp linux-3.1.3/net/core/rtnetlink.c linux-3.1.3/net/core/rtnetlink.c
19612
19613 static DEFINE_MUTEX(rtnl_mutex);
19614 static u16 min_ifinfo_dump_size;
19615 -diff -urNp linux-3.1.3/net/core/scm.c linux-3.1.3/net/core/scm.c
19616 ---- linux-3.1.3/net/core/scm.c 2011-11-11 15:19:27.000000000 -0500
19617 -+++ linux-3.1.3/net/core/scm.c 2011-11-16 18:39:08.000000000 -0500
19618 +diff -urNp linux-3.1.4/net/core/scm.c linux-3.1.4/net/core/scm.c
19619 +--- linux-3.1.4/net/core/scm.c 2011-11-11 15:19:27.000000000 -0500
19620 ++++ linux-3.1.4/net/core/scm.c 2011-11-16 18:39:08.000000000 -0500
19621 @@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send);
19622 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
19623 {
19624 @@ -72249,9 +73180,9 @@ diff -urNp linux-3.1.3/net/core/scm.c linux-3.1.3/net/core/scm.c
19625 i++, cmfptr++)
19626 {
19627 int new_fd;
19628 -diff -urNp linux-3.1.3/net/core/skbuff.c linux-3.1.3/net/core/skbuff.c
19629 ---- linux-3.1.3/net/core/skbuff.c 2011-11-11 15:19:27.000000000 -0500
19630 -+++ linux-3.1.3/net/core/skbuff.c 2011-11-16 18:40:44.000000000 -0500
19631 +diff -urNp linux-3.1.4/net/core/skbuff.c linux-3.1.4/net/core/skbuff.c
19632 +--- linux-3.1.4/net/core/skbuff.c 2011-11-11 15:19:27.000000000 -0500
19633 ++++ linux-3.1.4/net/core/skbuff.c 2011-11-16 18:40:44.000000000 -0500
19634 @@ -1650,6 +1650,8 @@ int skb_splice_bits(struct sk_buff *skb,
19635 struct sock *sk = skb->sk;
19636 int ret = 0;
19637 @@ -72261,9 +73192,9 @@ diff -urNp linux-3.1.3/net/core/skbuff.c linux-3.1.3/net/core/skbuff.c
19638 if (splice_grow_spd(pipe, &spd))
19639 return -ENOMEM;
19640
19641 -diff -urNp linux-3.1.3/net/core/sock.c linux-3.1.3/net/core/sock.c
19642 ---- linux-3.1.3/net/core/sock.c 2011-11-11 15:19:27.000000000 -0500
19643 -+++ linux-3.1.3/net/core/sock.c 2011-11-16 18:40:44.000000000 -0500
19644 +diff -urNp linux-3.1.4/net/core/sock.c linux-3.1.4/net/core/sock.c
19645 +--- linux-3.1.4/net/core/sock.c 2011-11-11 15:19:27.000000000 -0500
19646 ++++ linux-3.1.4/net/core/sock.c 2011-11-16 18:40:44.000000000 -0500
19647 @@ -293,7 +293,7 @@ int sock_queue_rcv_skb(struct sock *sk,
19648 */
19649 if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
19650 @@ -72345,9 +73276,9 @@ diff -urNp linux-3.1.3/net/core/sock.c linux-3.1.3/net/core/sock.c
19651 }
19652 EXPORT_SYMBOL(sock_init_data);
19653
19654 -diff -urNp linux-3.1.3/net/decnet/sysctl_net_decnet.c linux-3.1.3/net/decnet/sysctl_net_decnet.c
19655 ---- linux-3.1.3/net/decnet/sysctl_net_decnet.c 2011-11-11 15:19:27.000000000 -0500
19656 -+++ linux-3.1.3/net/decnet/sysctl_net_decnet.c 2011-11-16 18:39:08.000000000 -0500
19657 +diff -urNp linux-3.1.4/net/decnet/sysctl_net_decnet.c linux-3.1.4/net/decnet/sysctl_net_decnet.c
19658 +--- linux-3.1.4/net/decnet/sysctl_net_decnet.c 2011-11-11 15:19:27.000000000 -0500
19659 ++++ linux-3.1.4/net/decnet/sysctl_net_decnet.c 2011-11-16 18:39:08.000000000 -0500
19660 @@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_t
19661
19662 if (len > *lenp) len = *lenp;
19663 @@ -72366,9 +73297,9 @@ diff -urNp linux-3.1.3/net/decnet/sysctl_net_decnet.c linux-3.1.3/net/decnet/sys
19664 return -EFAULT;
19665
19666 *lenp = len;
19667 -diff -urNp linux-3.1.3/net/econet/Kconfig linux-3.1.3/net/econet/Kconfig
19668 ---- linux-3.1.3/net/econet/Kconfig 2011-11-11 15:19:27.000000000 -0500
19669 -+++ linux-3.1.3/net/econet/Kconfig 2011-11-16 18:40:44.000000000 -0500
19670 +diff -urNp linux-3.1.4/net/econet/Kconfig linux-3.1.4/net/econet/Kconfig
19671 +--- linux-3.1.4/net/econet/Kconfig 2011-11-11 15:19:27.000000000 -0500
19672 ++++ linux-3.1.4/net/econet/Kconfig 2011-11-16 18:40:44.000000000 -0500
19673 @@ -4,7 +4,7 @@
19674
19675 config ECONET
19676 @@ -72378,9 +73309,9 @@ diff -urNp linux-3.1.3/net/econet/Kconfig linux-3.1.3/net/econet/Kconfig
19677 ---help---
19678 Econet is a fairly old and slow networking protocol mainly used by
19679 Acorn computers to access file and print servers. It uses native
19680 -diff -urNp linux-3.1.3/net/ipv4/fib_frontend.c linux-3.1.3/net/ipv4/fib_frontend.c
19681 ---- linux-3.1.3/net/ipv4/fib_frontend.c 2011-11-11 15:19:27.000000000 -0500
19682 -+++ linux-3.1.3/net/ipv4/fib_frontend.c 2011-11-16 18:39:08.000000000 -0500
19683 +diff -urNp linux-3.1.4/net/ipv4/fib_frontend.c linux-3.1.4/net/ipv4/fib_frontend.c
19684 +--- linux-3.1.4/net/ipv4/fib_frontend.c 2011-11-11 15:19:27.000000000 -0500
19685 ++++ linux-3.1.4/net/ipv4/fib_frontend.c 2011-11-16 18:39:08.000000000 -0500
19686 @@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
19687 #ifdef CONFIG_IP_ROUTE_MULTIPATH
19688 fib_sync_up(dev);
19689 @@ -72405,9 +73336,9 @@ diff -urNp linux-3.1.3/net/ipv4/fib_frontend.c linux-3.1.3/net/ipv4/fib_frontend
19690 rt_cache_flush(dev_net(dev), -1);
19691 break;
19692 case NETDEV_DOWN:
19693 -diff -urNp linux-3.1.3/net/ipv4/fib_semantics.c linux-3.1.3/net/ipv4/fib_semantics.c
19694 ---- linux-3.1.3/net/ipv4/fib_semantics.c 2011-11-11 15:19:27.000000000 -0500
19695 -+++ linux-3.1.3/net/ipv4/fib_semantics.c 2011-11-16 18:39:08.000000000 -0500
19696 +diff -urNp linux-3.1.4/net/ipv4/fib_semantics.c linux-3.1.4/net/ipv4/fib_semantics.c
19697 +--- linux-3.1.4/net/ipv4/fib_semantics.c 2011-11-11 15:19:27.000000000 -0500
19698 ++++ linux-3.1.4/net/ipv4/fib_semantics.c 2011-11-16 18:39:08.000000000 -0500
19699 @@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct n
19700 nh->nh_saddr = inet_select_addr(nh->nh_dev,
19701 nh->nh_gw,
19702 @@ -72417,9 +73348,9 @@ diff -urNp linux-3.1.3/net/ipv4/fib_semantics.c linux-3.1.3/net/ipv4/fib_semanti
19703
19704 return nh->nh_saddr;
19705 }
19706 -diff -urNp linux-3.1.3/net/ipv4/inet_diag.c linux-3.1.3/net/ipv4/inet_diag.c
19707 ---- linux-3.1.3/net/ipv4/inet_diag.c 2011-11-11 15:19:27.000000000 -0500
19708 -+++ linux-3.1.3/net/ipv4/inet_diag.c 2011-11-16 18:40:44.000000000 -0500
19709 +diff -urNp linux-3.1.4/net/ipv4/inet_diag.c linux-3.1.4/net/ipv4/inet_diag.c
19710 +--- linux-3.1.4/net/ipv4/inet_diag.c 2011-11-11 15:19:27.000000000 -0500
19711 ++++ linux-3.1.4/net/ipv4/inet_diag.c 2011-11-16 18:40:44.000000000 -0500
19712 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
19713 r->idiag_retrans = 0;
19714
19715 @@ -72481,9 +73412,9 @@ diff -urNp linux-3.1.3/net/ipv4/inet_diag.c linux-3.1.3/net/ipv4/inet_diag.c
19716
19717 tmo = req->expires - jiffies;
19718 if (tmo < 0)
19719 -diff -urNp linux-3.1.3/net/ipv4/inet_hashtables.c linux-3.1.3/net/ipv4/inet_hashtables.c
19720 ---- linux-3.1.3/net/ipv4/inet_hashtables.c 2011-11-11 15:19:27.000000000 -0500
19721 -+++ linux-3.1.3/net/ipv4/inet_hashtables.c 2011-11-16 18:40:44.000000000 -0500
19722 +diff -urNp linux-3.1.4/net/ipv4/inet_hashtables.c linux-3.1.4/net/ipv4/inet_hashtables.c
19723 +--- linux-3.1.4/net/ipv4/inet_hashtables.c 2011-11-11 15:19:27.000000000 -0500
19724 ++++ linux-3.1.4/net/ipv4/inet_hashtables.c 2011-11-16 18:40:44.000000000 -0500
19725 @@ -18,12 +18,15 @@
19726 #include <linux/sched.h>
19727 #include <linux/slab.h>
19728 @@ -72509,9 +73440,9 @@ diff -urNp linux-3.1.3/net/ipv4/inet_hashtables.c linux-3.1.3/net/ipv4/inet_hash
19729 if (tw) {
19730 inet_twsk_deschedule(tw, death_row);
19731 while (twrefcnt) {
19732 -diff -urNp linux-3.1.3/net/ipv4/inetpeer.c linux-3.1.3/net/ipv4/inetpeer.c
19733 ---- linux-3.1.3/net/ipv4/inetpeer.c 2011-11-11 15:19:27.000000000 -0500
19734 -+++ linux-3.1.3/net/ipv4/inetpeer.c 2011-11-16 19:18:22.000000000 -0500
19735 +diff -urNp linux-3.1.4/net/ipv4/inetpeer.c linux-3.1.4/net/ipv4/inetpeer.c
19736 +--- linux-3.1.4/net/ipv4/inetpeer.c 2011-11-11 15:19:27.000000000 -0500
19737 ++++ linux-3.1.4/net/ipv4/inetpeer.c 2011-11-16 19:18:22.000000000 -0500
19738 @@ -400,6 +400,8 @@ struct inet_peer *inet_getpeer(const str
19739 unsigned int sequence;
19740 int invalidated, gccnt = 0;
19741 @@ -72532,9 +73463,9 @@ diff -urNp linux-3.1.3/net/ipv4/inetpeer.c linux-3.1.3/net/ipv4/inetpeer.c
19742 (daddr->family == AF_INET) ?
19743 secure_ip_id(daddr->addr.a4) :
19744 secure_ipv6_id(daddr->addr.a6));
19745 -diff -urNp linux-3.1.3/net/ipv4/ipconfig.c linux-3.1.3/net/ipv4/ipconfig.c
19746 ---- linux-3.1.3/net/ipv4/ipconfig.c 2011-11-11 15:19:27.000000000 -0500
19747 -+++ linux-3.1.3/net/ipv4/ipconfig.c 2011-11-16 18:39:08.000000000 -0500
19748 +diff -urNp linux-3.1.4/net/ipv4/ipconfig.c linux-3.1.4/net/ipv4/ipconfig.c
19749 +--- linux-3.1.4/net/ipv4/ipconfig.c 2011-11-11 15:19:27.000000000 -0500
19750 ++++ linux-3.1.4/net/ipv4/ipconfig.c 2011-11-16 18:39:08.000000000 -0500
19751 @@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig
19752
19753 mm_segment_t oldfs = get_fs();
19754 @@ -72562,9 +73493,9 @@ diff -urNp linux-3.1.3/net/ipv4/ipconfig.c linux-3.1.3/net/ipv4/ipconfig.c
19755 set_fs(oldfs);
19756 return res;
19757 }
19758 -diff -urNp linux-3.1.3/net/ipv4/ip_fragment.c linux-3.1.3/net/ipv4/ip_fragment.c
19759 ---- linux-3.1.3/net/ipv4/ip_fragment.c 2011-11-11 15:19:27.000000000 -0500
19760 -+++ linux-3.1.3/net/ipv4/ip_fragment.c 2011-11-16 18:39:08.000000000 -0500
19761 +diff -urNp linux-3.1.4/net/ipv4/ip_fragment.c linux-3.1.4/net/ipv4/ip_fragment.c
19762 +--- linux-3.1.4/net/ipv4/ip_fragment.c 2011-11-11 15:19:27.000000000 -0500
19763 ++++ linux-3.1.4/net/ipv4/ip_fragment.c 2011-11-16 18:39:08.000000000 -0500
19764 @@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct
19765 return 0;
19766
19767 @@ -72574,9 +73505,9 @@ diff -urNp linux-3.1.3/net/ipv4/ip_fragment.c linux-3.1.3/net/ipv4/ip_fragment.c
19768 qp->rid = end;
19769
19770 rc = qp->q.fragments && (end - start) > max;
19771 -diff -urNp linux-3.1.3/net/ipv4/ip_sockglue.c linux-3.1.3/net/ipv4/ip_sockglue.c
19772 ---- linux-3.1.3/net/ipv4/ip_sockglue.c 2011-11-11 15:19:27.000000000 -0500
19773 -+++ linux-3.1.3/net/ipv4/ip_sockglue.c 2011-11-16 18:40:44.000000000 -0500
19774 +diff -urNp linux-3.1.4/net/ipv4/ip_sockglue.c linux-3.1.4/net/ipv4/ip_sockglue.c
19775 +--- linux-3.1.4/net/ipv4/ip_sockglue.c 2011-11-11 15:19:27.000000000 -0500
19776 ++++ linux-3.1.4/net/ipv4/ip_sockglue.c 2011-11-16 18:40:44.000000000 -0500
19777 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock
19778 int val;
19779 int len;
19780 @@ -72605,9 +73536,9 @@ diff -urNp linux-3.1.3/net/ipv4/ip_sockglue.c linux-3.1.3/net/ipv4/ip_sockglue.c
19781 msg.msg_controllen = len;
19782 msg.msg_flags = flags;
19783
19784 -diff -urNp linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c
19785 ---- linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-11 15:19:27.000000000 -0500
19786 -+++ linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-16 18:39:08.000000000 -0500
19787 +diff -urNp linux-3.1.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.1.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
19788 +--- linux-3.1.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-11 15:19:27.000000000 -0500
19789 ++++ linux-3.1.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-16 18:39:08.000000000 -0500
19790 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
19791
19792 *len = 0;
19793 @@ -72617,9 +73548,9 @@ diff -urNp linux-3.1.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.1.3/net/ip
19794 if (*octets == NULL) {
19795 if (net_ratelimit())
19796 pr_notice("OOM in bsalg (%d)\n", __LINE__);
19797 -diff -urNp linux-3.1.3/net/ipv4/ping.c linux-3.1.3/net/ipv4/ping.c
19798 ---- linux-3.1.3/net/ipv4/ping.c 2011-11-11 15:19:27.000000000 -0500
19799 -+++ linux-3.1.3/net/ipv4/ping.c 2011-11-16 18:39:08.000000000 -0500
19800 +diff -urNp linux-3.1.4/net/ipv4/ping.c linux-3.1.4/net/ipv4/ping.c
19801 +--- linux-3.1.4/net/ipv4/ping.c 2011-11-11 15:19:27.000000000 -0500
19802 ++++ linux-3.1.4/net/ipv4/ping.c 2011-11-16 18:39:08.000000000 -0500
19803 @@ -837,7 +837,7 @@ static void ping_format_sock(struct sock
19804 sk_rmem_alloc_get(sp),
19805 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
19806 @@ -72629,9 +73560,9 @@ diff -urNp linux-3.1.3/net/ipv4/ping.c linux-3.1.3/net/ipv4/ping.c
19807 }
19808
19809 static int ping_seq_show(struct seq_file *seq, void *v)
19810 -diff -urNp linux-3.1.3/net/ipv4/raw.c linux-3.1.3/net/ipv4/raw.c
19811 ---- linux-3.1.3/net/ipv4/raw.c 2011-11-11 15:19:27.000000000 -0500
19812 -+++ linux-3.1.3/net/ipv4/raw.c 2011-11-17 18:58:40.000000000 -0500
19813 +diff -urNp linux-3.1.4/net/ipv4/raw.c linux-3.1.4/net/ipv4/raw.c
19814 +--- linux-3.1.4/net/ipv4/raw.c 2011-11-11 15:19:27.000000000 -0500
19815 ++++ linux-3.1.4/net/ipv4/raw.c 2011-11-17 18:58:40.000000000 -0500
19816 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
19817 int raw_rcv(struct sock *sk, struct sk_buff *skb)
19818 {
19819 @@ -72689,9 +73620,9 @@ diff -urNp linux-3.1.3/net/ipv4/raw.c linux-3.1.3/net/ipv4/raw.c
19820 }
19821
19822 static int raw_seq_show(struct seq_file *seq, void *v)
19823 -diff -urNp linux-3.1.3/net/ipv4/route.c linux-3.1.3/net/ipv4/route.c
19824 ---- linux-3.1.3/net/ipv4/route.c 2011-11-11 15:19:27.000000000 -0500
19825 -+++ linux-3.1.3/net/ipv4/route.c 2011-11-16 18:39:08.000000000 -0500
19826 +diff -urNp linux-3.1.4/net/ipv4/route.c linux-3.1.4/net/ipv4/route.c
19827 +--- linux-3.1.4/net/ipv4/route.c 2011-11-11 15:19:27.000000000 -0500
19828 ++++ linux-3.1.4/net/ipv4/route.c 2011-11-16 18:39:08.000000000 -0500
19829 @@ -308,7 +308,7 @@ static inline unsigned int rt_hash(__be3
19830
19831 static inline int rt_genid(struct net *net)
19832 @@ -72719,9 +73650,9 @@ diff -urNp linux-3.1.3/net/ipv4/route.c linux-3.1.3/net/ipv4/route.c
19833 if (peer->tcp_ts_stamp) {
19834 ts = peer->tcp_ts;
19835 tsage = get_seconds() - peer->tcp_ts_stamp;
19836 -diff -urNp linux-3.1.3/net/ipv4/tcp.c linux-3.1.3/net/ipv4/tcp.c
19837 ---- linux-3.1.3/net/ipv4/tcp.c 2011-11-11 15:19:27.000000000 -0500
19838 -+++ linux-3.1.3/net/ipv4/tcp.c 2011-11-16 18:40:44.000000000 -0500
19839 +diff -urNp linux-3.1.4/net/ipv4/tcp.c linux-3.1.4/net/ipv4/tcp.c
19840 +--- linux-3.1.4/net/ipv4/tcp.c 2011-11-11 15:19:27.000000000 -0500
19841 ++++ linux-3.1.4/net/ipv4/tcp.c 2011-11-16 18:40:44.000000000 -0500
19842 @@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
19843 int val;
19844 int err = 0;
19845 @@ -72740,9 +73671,9 @@ diff -urNp linux-3.1.3/net/ipv4/tcp.c linux-3.1.3/net/ipv4/tcp.c
19846 if (get_user(len, optlen))
19847 return -EFAULT;
19848
19849 -diff -urNp linux-3.1.3/net/ipv4/tcp_ipv4.c linux-3.1.3/net/ipv4/tcp_ipv4.c
19850 ---- linux-3.1.3/net/ipv4/tcp_ipv4.c 2011-11-11 15:19:27.000000000 -0500
19851 -+++ linux-3.1.3/net/ipv4/tcp_ipv4.c 2011-11-16 18:40:44.000000000 -0500
19852 +diff -urNp linux-3.1.4/net/ipv4/tcp_ipv4.c linux-3.1.4/net/ipv4/tcp_ipv4.c
19853 +--- linux-3.1.4/net/ipv4/tcp_ipv4.c 2011-11-11 15:19:27.000000000 -0500
19854 ++++ linux-3.1.4/net/ipv4/tcp_ipv4.c 2011-11-16 18:40:44.000000000 -0500
19855 @@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
19856 int sysctl_tcp_low_latency __read_mostly;
19857 EXPORT_SYMBOL(sysctl_tcp_low_latency);
19858 @@ -72838,9 +73769,9 @@ diff -urNp linux-3.1.3/net/ipv4/tcp_ipv4.c linux-3.1.3/net/ipv4/tcp_ipv4.c
19859 }
19860
19861 #define TMPSZ 150
19862 -diff -urNp linux-3.1.3/net/ipv4/tcp_minisocks.c linux-3.1.3/net/ipv4/tcp_minisocks.c
19863 ---- linux-3.1.3/net/ipv4/tcp_minisocks.c 2011-11-11 15:19:27.000000000 -0500
19864 -+++ linux-3.1.3/net/ipv4/tcp_minisocks.c 2011-11-16 18:40:44.000000000 -0500
19865 +diff -urNp linux-3.1.4/net/ipv4/tcp_minisocks.c linux-3.1.4/net/ipv4/tcp_minisocks.c
19866 +--- linux-3.1.4/net/ipv4/tcp_minisocks.c 2011-11-11 15:19:27.000000000 -0500
19867 ++++ linux-3.1.4/net/ipv4/tcp_minisocks.c 2011-11-16 18:40:44.000000000 -0500
19868 @@ -27,6 +27,10 @@
19869 #include <net/inet_common.h>
19870 #include <net/xfrm.h>
19871 @@ -72863,9 +73794,9 @@ diff -urNp linux-3.1.3/net/ipv4/tcp_minisocks.c linux-3.1.3/net/ipv4/tcp_minisoc
19872 if (!(flg & TCP_FLAG_RST))
19873 req->rsk_ops->send_reset(sk, skb);
19874
19875 -diff -urNp linux-3.1.3/net/ipv4/tcp_output.c linux-3.1.3/net/ipv4/tcp_output.c
19876 ---- linux-3.1.3/net/ipv4/tcp_output.c 2011-11-11 15:19:27.000000000 -0500
19877 -+++ linux-3.1.3/net/ipv4/tcp_output.c 2011-11-16 18:40:44.000000000 -0500
19878 +diff -urNp linux-3.1.4/net/ipv4/tcp_output.c linux-3.1.4/net/ipv4/tcp_output.c
19879 +--- linux-3.1.4/net/ipv4/tcp_output.c 2011-11-11 15:19:27.000000000 -0500
19880 ++++ linux-3.1.4/net/ipv4/tcp_output.c 2011-11-16 18:40:44.000000000 -0500
19881 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
19882 int mss;
19883 int s_data_desired = 0;
19884 @@ -72875,9 +73806,9 @@ diff -urNp linux-3.1.3/net/ipv4/tcp_output.c linux-3.1.3/net/ipv4/tcp_output.c
19885 if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)
19886 s_data_desired = cvp->s_data_desired;
19887 skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
19888 -diff -urNp linux-3.1.3/net/ipv4/tcp_probe.c linux-3.1.3/net/ipv4/tcp_probe.c
19889 ---- linux-3.1.3/net/ipv4/tcp_probe.c 2011-11-11 15:19:27.000000000 -0500
19890 -+++ linux-3.1.3/net/ipv4/tcp_probe.c 2011-11-16 18:39:08.000000000 -0500
19891 +diff -urNp linux-3.1.4/net/ipv4/tcp_probe.c linux-3.1.4/net/ipv4/tcp_probe.c
19892 +--- linux-3.1.4/net/ipv4/tcp_probe.c 2011-11-11 15:19:27.000000000 -0500
19893 ++++ linux-3.1.4/net/ipv4/tcp_probe.c 2011-11-16 18:39:08.000000000 -0500
19894 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
19895 if (cnt + width >= len)
19896 break;
19897 @@ -72887,9 +73818,9 @@ diff -urNp linux-3.1.3/net/ipv4/tcp_probe.c linux-3.1.3/net/ipv4/tcp_probe.c
19898 return -EFAULT;
19899 cnt += width;
19900 }
19901 -diff -urNp linux-3.1.3/net/ipv4/tcp_timer.c linux-3.1.3/net/ipv4/tcp_timer.c
19902 ---- linux-3.1.3/net/ipv4/tcp_timer.c 2011-11-11 15:19:27.000000000 -0500
19903 -+++ linux-3.1.3/net/ipv4/tcp_timer.c 2011-11-16 18:40:44.000000000 -0500
19904 +diff -urNp linux-3.1.4/net/ipv4/tcp_timer.c linux-3.1.4/net/ipv4/tcp_timer.c
19905 +--- linux-3.1.4/net/ipv4/tcp_timer.c 2011-11-11 15:19:27.000000000 -0500
19906 ++++ linux-3.1.4/net/ipv4/tcp_timer.c 2011-11-16 18:40:44.000000000 -0500
19907 @@ -22,6 +22,10 @@
19908 #include <linux/gfp.h>
19909 #include <net/tcp.h>
19910 @@ -72915,9 +73846,9 @@ diff -urNp linux-3.1.3/net/ipv4/tcp_timer.c linux-3.1.3/net/ipv4/tcp_timer.c
19911 if (retransmits_timed_out(sk, retry_until,
19912 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
19913 /* Has it gone just too far? */
19914 -diff -urNp linux-3.1.3/net/ipv4/udp.c linux-3.1.3/net/ipv4/udp.c
19915 ---- linux-3.1.3/net/ipv4/udp.c 2011-11-11 15:19:27.000000000 -0500
19916 -+++ linux-3.1.3/net/ipv4/udp.c 2011-11-16 19:17:54.000000000 -0500
19917 +diff -urNp linux-3.1.4/net/ipv4/udp.c linux-3.1.4/net/ipv4/udp.c
19918 +--- linux-3.1.4/net/ipv4/udp.c 2011-11-11 15:19:27.000000000 -0500
19919 ++++ linux-3.1.4/net/ipv4/udp.c 2011-11-16 19:17:54.000000000 -0500
19920 @@ -86,6 +86,7 @@
19921 #include <linux/types.h>
19922 #include <linux/fcntl.h>
19923 @@ -73030,9 +73961,9 @@ diff -urNp linux-3.1.3/net/ipv4/udp.c linux-3.1.3/net/ipv4/udp.c
19924 }
19925
19926 int udp4_seq_show(struct seq_file *seq, void *v)
19927 -diff -urNp linux-3.1.3/net/ipv6/addrconf.c linux-3.1.3/net/ipv6/addrconf.c
19928 ---- linux-3.1.3/net/ipv6/addrconf.c 2011-11-11 15:19:27.000000000 -0500
19929 -+++ linux-3.1.3/net/ipv6/addrconf.c 2011-11-16 18:39:08.000000000 -0500
19930 +diff -urNp linux-3.1.4/net/ipv6/addrconf.c linux-3.1.4/net/ipv6/addrconf.c
19931 +--- linux-3.1.4/net/ipv6/addrconf.c 2011-11-11 15:19:27.000000000 -0500
19932 ++++ linux-3.1.4/net/ipv6/addrconf.c 2011-11-16 18:39:08.000000000 -0500
19933 @@ -2083,7 +2083,7 @@ int addrconf_set_dstaddr(struct net *net
19934 p.iph.ihl = 5;
19935 p.iph.protocol = IPPROTO_IPV6;
19936 @@ -73042,9 +73973,9 @@ diff -urNp linux-3.1.3/net/ipv6/addrconf.c linux-3.1.3/net/ipv6/addrconf.c
19937
19938 if (ops->ndo_do_ioctl) {
19939 mm_segment_t oldfs = get_fs();
19940 -diff -urNp linux-3.1.3/net/ipv6/inet6_connection_sock.c linux-3.1.3/net/ipv6/inet6_connection_sock.c
19941 ---- linux-3.1.3/net/ipv6/inet6_connection_sock.c 2011-11-11 15:19:27.000000000 -0500
19942 -+++ linux-3.1.3/net/ipv6/inet6_connection_sock.c 2011-11-16 18:39:08.000000000 -0500
19943 +diff -urNp linux-3.1.4/net/ipv6/inet6_connection_sock.c linux-3.1.4/net/ipv6/inet6_connection_sock.c
19944 +--- linux-3.1.4/net/ipv6/inet6_connection_sock.c 2011-11-11 15:19:27.000000000 -0500
19945 ++++ linux-3.1.4/net/ipv6/inet6_connection_sock.c 2011-11-16 18:39:08.000000000 -0500
19946 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
19947 #ifdef CONFIG_XFRM
19948 {
19949 @@ -73063,9 +73994,9 @@ diff -urNp linux-3.1.3/net/ipv6/inet6_connection_sock.c linux-3.1.3/net/ipv6/ine
19950 __sk_dst_reset(sk);
19951 dst = NULL;
19952 }
19953 -diff -urNp linux-3.1.3/net/ipv6/ipv6_sockglue.c linux-3.1.3/net/ipv6/ipv6_sockglue.c
19954 ---- linux-3.1.3/net/ipv6/ipv6_sockglue.c 2011-11-11 15:19:27.000000000 -0500
19955 -+++ linux-3.1.3/net/ipv6/ipv6_sockglue.c 2011-11-16 18:40:44.000000000 -0500
19956 +diff -urNp linux-3.1.4/net/ipv6/ipv6_sockglue.c linux-3.1.4/net/ipv6/ipv6_sockglue.c
19957 +--- linux-3.1.4/net/ipv6/ipv6_sockglue.c 2011-11-11 15:19:27.000000000 -0500
19958 ++++ linux-3.1.4/net/ipv6/ipv6_sockglue.c 2011-11-16 18:40:44.000000000 -0500
19959 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
19960 int val, valbool;
19961 int retv = -ENOPROTOOPT;
19962 @@ -73093,9 +74024,9 @@ diff -urNp linux-3.1.3/net/ipv6/ipv6_sockglue.c linux-3.1.3/net/ipv6/ipv6_sockgl
19963 msg.msg_controllen = len;
19964 msg.msg_flags = flags;
19965
19966 -diff -urNp linux-3.1.3/net/ipv6/raw.c linux-3.1.3/net/ipv6/raw.c
19967 ---- linux-3.1.3/net/ipv6/raw.c 2011-11-11 15:19:27.000000000 -0500
19968 -+++ linux-3.1.3/net/ipv6/raw.c 2011-11-16 18:40:44.000000000 -0500
19969 +diff -urNp linux-3.1.4/net/ipv6/raw.c linux-3.1.4/net/ipv6/raw.c
19970 +--- linux-3.1.4/net/ipv6/raw.c 2011-11-11 15:19:27.000000000 -0500
19971 ++++ linux-3.1.4/net/ipv6/raw.c 2011-11-16 18:40:44.000000000 -0500
19972 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
19973 {
19974 if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
19975 @@ -73191,9 +74122,9 @@ diff -urNp linux-3.1.3/net/ipv6/raw.c linux-3.1.3/net/ipv6/raw.c
19976 }
19977
19978 static int raw6_seq_show(struct seq_file *seq, void *v)
19979 -diff -urNp linux-3.1.3/net/ipv6/tcp_ipv6.c linux-3.1.3/net/ipv6/tcp_ipv6.c
19980 ---- linux-3.1.3/net/ipv6/tcp_ipv6.c 2011-11-11 15:19:27.000000000 -0500
19981 -+++ linux-3.1.3/net/ipv6/tcp_ipv6.c 2011-11-16 18:40:44.000000000 -0500
19982 +diff -urNp linux-3.1.4/net/ipv6/tcp_ipv6.c linux-3.1.4/net/ipv6/tcp_ipv6.c
19983 +--- linux-3.1.4/net/ipv6/tcp_ipv6.c 2011-11-11 15:19:27.000000000 -0500
19984 ++++ linux-3.1.4/net/ipv6/tcp_ipv6.c 2011-11-16 18:40:44.000000000 -0500
19985 @@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
19986 }
19987 #endif
19988 @@ -73293,9 +74224,9 @@ diff -urNp linux-3.1.3/net/ipv6/tcp_ipv6.c linux-3.1.3/net/ipv6/tcp_ipv6.c
19989 }
19990
19991 static int tcp6_seq_show(struct seq_file *seq, void *v)
19992 -diff -urNp linux-3.1.3/net/ipv6/udp.c linux-3.1.3/net/ipv6/udp.c
19993 ---- linux-3.1.3/net/ipv6/udp.c 2011-11-11 15:19:27.000000000 -0500
19994 -+++ linux-3.1.3/net/ipv6/udp.c 2011-11-16 18:40:44.000000000 -0500
19995 +diff -urNp linux-3.1.4/net/ipv6/udp.c linux-3.1.4/net/ipv6/udp.c
19996 +--- linux-3.1.4/net/ipv6/udp.c 2011-11-11 15:19:27.000000000 -0500
19997 ++++ linux-3.1.4/net/ipv6/udp.c 2011-11-16 18:40:44.000000000 -0500
19998 @@ -50,6 +50,10 @@
19999 #include <linux/seq_file.h>
20000 #include "udp_impl.h"
20001 @@ -73360,9 +74291,9 @@ diff -urNp linux-3.1.3/net/ipv6/udp.c linux-3.1.3/net/ipv6/udp.c
20002 }
20003
20004 int udp6_seq_show(struct seq_file *seq, void *v)
20005 -diff -urNp linux-3.1.3/net/irda/ircomm/ircomm_tty.c linux-3.1.3/net/irda/ircomm/ircomm_tty.c
20006 ---- linux-3.1.3/net/irda/ircomm/ircomm_tty.c 2011-11-11 15:19:27.000000000 -0500
20007 -+++ linux-3.1.3/net/irda/ircomm/ircomm_tty.c 2011-11-16 18:39:08.000000000 -0500
20008 +diff -urNp linux-3.1.4/net/irda/ircomm/ircomm_tty.c linux-3.1.4/net/irda/ircomm/ircomm_tty.c
20009 +--- linux-3.1.4/net/irda/ircomm/ircomm_tty.c 2011-11-11 15:19:27.000000000 -0500
20010 ++++ linux-3.1.4/net/irda/ircomm/ircomm_tty.c 2011-11-16 18:39:08.000000000 -0500
20011 @@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
20012 add_wait_queue(&self->open_wait, &wait);
20013
20014 @@ -73485,9 +74416,9 @@ diff -urNp linux-3.1.3/net/irda/ircomm/ircomm_tty.c linux-3.1.3/net/irda/ircomm/
20015 seq_printf(m, "Max data size: %d\n", self->max_data_size);
20016 seq_printf(m, "Max header size: %d\n", self->max_header_size);
20017
20018 -diff -urNp linux-3.1.3/net/iucv/af_iucv.c linux-3.1.3/net/iucv/af_iucv.c
20019 ---- linux-3.1.3/net/iucv/af_iucv.c 2011-11-11 15:19:27.000000000 -0500
20020 -+++ linux-3.1.3/net/iucv/af_iucv.c 2011-11-16 18:39:08.000000000 -0500
20021 +diff -urNp linux-3.1.4/net/iucv/af_iucv.c linux-3.1.4/net/iucv/af_iucv.c
20022 +--- linux-3.1.4/net/iucv/af_iucv.c 2011-11-11 15:19:27.000000000 -0500
20023 ++++ linux-3.1.4/net/iucv/af_iucv.c 2011-11-16 18:39:08.000000000 -0500
20024 @@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
20025
20026 write_lock_bh(&iucv_sk_list.lock);
20027 @@ -73501,9 +74432,9 @@ diff -urNp linux-3.1.3/net/iucv/af_iucv.c linux-3.1.3/net/iucv/af_iucv.c
20028 }
20029
20030 write_unlock_bh(&iucv_sk_list.lock);
20031 -diff -urNp linux-3.1.3/net/key/af_key.c linux-3.1.3/net/key/af_key.c
20032 ---- linux-3.1.3/net/key/af_key.c 2011-11-11 15:19:27.000000000 -0500
20033 -+++ linux-3.1.3/net/key/af_key.c 2011-11-16 18:40:44.000000000 -0500
20034 +diff -urNp linux-3.1.4/net/key/af_key.c linux-3.1.4/net/key/af_key.c
20035 +--- linux-3.1.4/net/key/af_key.c 2011-11-11 15:19:27.000000000 -0500
20036 ++++ linux-3.1.4/net/key/af_key.c 2011-11-16 18:40:44.000000000 -0500
20037 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
20038 struct xfrm_migrate m[XFRM_MAX_DEPTH];
20039 struct xfrm_kmaddress k;
20040 @@ -73526,9 +74457,9 @@ diff -urNp linux-3.1.3/net/key/af_key.c linux-3.1.3/net/key/af_key.c
20041 } while (!res);
20042 return res;
20043 }
20044 -diff -urNp linux-3.1.3/net/lapb/lapb_iface.c linux-3.1.3/net/lapb/lapb_iface.c
20045 ---- linux-3.1.3/net/lapb/lapb_iface.c 2011-11-11 15:19:27.000000000 -0500
20046 -+++ linux-3.1.3/net/lapb/lapb_iface.c 2011-11-16 18:39:08.000000000 -0500
20047 +diff -urNp linux-3.1.4/net/lapb/lapb_iface.c linux-3.1.4/net/lapb/lapb_iface.c
20048 +--- linux-3.1.4/net/lapb/lapb_iface.c 2011-11-11 15:19:27.000000000 -0500
20049 ++++ linux-3.1.4/net/lapb/lapb_iface.c 2011-11-16 18:39:08.000000000 -0500
20050 @@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
20051 goto out;
20052
20053 @@ -73592,9 +74523,9 @@ diff -urNp linux-3.1.3/net/lapb/lapb_iface.c linux-3.1.3/net/lapb/lapb_iface.c
20054 used = 1;
20055 }
20056
20057 -diff -urNp linux-3.1.3/net/mac80211/debugfs_sta.c linux-3.1.3/net/mac80211/debugfs_sta.c
20058 ---- linux-3.1.3/net/mac80211/debugfs_sta.c 2011-11-11 15:19:27.000000000 -0500
20059 -+++ linux-3.1.3/net/mac80211/debugfs_sta.c 2011-11-16 18:40:44.000000000 -0500
20060 +diff -urNp linux-3.1.4/net/mac80211/debugfs_sta.c linux-3.1.4/net/mac80211/debugfs_sta.c
20061 +--- linux-3.1.4/net/mac80211/debugfs_sta.c 2011-11-11 15:19:27.000000000 -0500
20062 ++++ linux-3.1.4/net/mac80211/debugfs_sta.c 2011-11-16 18:40:44.000000000 -0500
20063 @@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
20064 struct tid_ampdu_rx *tid_rx;
20065 struct tid_ampdu_tx *tid_tx;
20066 @@ -73613,9 +74544,9 @@ diff -urNp linux-3.1.3/net/mac80211/debugfs_sta.c linux-3.1.3/net/mac80211/debug
20067 p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
20068 htc->ht_supported ? "" : "not ");
20069 if (htc->ht_supported) {
20070 -diff -urNp linux-3.1.3/net/mac80211/ieee80211_i.h linux-3.1.3/net/mac80211/ieee80211_i.h
20071 ---- linux-3.1.3/net/mac80211/ieee80211_i.h 2011-11-11 15:19:27.000000000 -0500
20072 -+++ linux-3.1.3/net/mac80211/ieee80211_i.h 2011-11-16 18:39:08.000000000 -0500
20073 +diff -urNp linux-3.1.4/net/mac80211/ieee80211_i.h linux-3.1.4/net/mac80211/ieee80211_i.h
20074 +--- linux-3.1.4/net/mac80211/ieee80211_i.h 2011-11-11 15:19:27.000000000 -0500
20075 ++++ linux-3.1.4/net/mac80211/ieee80211_i.h 2011-11-16 18:39:08.000000000 -0500
20076 @@ -27,6 +27,7 @@
20077 #include <net/ieee80211_radiotap.h>
20078 #include <net/cfg80211.h>
20079 @@ -73633,9 +74564,9 @@ diff -urNp linux-3.1.3/net/mac80211/ieee80211_i.h linux-3.1.3/net/mac80211/ieee8
20080 int monitors, cooked_mntrs;
20081 /* number of interfaces with corresponding FIF_ flags */
20082 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
20083 -diff -urNp linux-3.1.3/net/mac80211/iface.c linux-3.1.3/net/mac80211/iface.c
20084 ---- linux-3.1.3/net/mac80211/iface.c 2011-11-11 15:19:27.000000000 -0500
20085 -+++ linux-3.1.3/net/mac80211/iface.c 2011-11-16 18:39:08.000000000 -0500
20086 +diff -urNp linux-3.1.4/net/mac80211/iface.c linux-3.1.4/net/mac80211/iface.c
20087 +--- linux-3.1.4/net/mac80211/iface.c 2011-11-11 15:19:27.000000000 -0500
20088 ++++ linux-3.1.4/net/mac80211/iface.c 2011-11-16 18:39:08.000000000 -0500
20089 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
20090 break;
20091 }
20092 @@ -73690,9 +74621,9 @@ diff -urNp linux-3.1.3/net/mac80211/iface.c linux-3.1.3/net/mac80211/iface.c
20093 if (local->ops->napi_poll)
20094 napi_disable(&local->napi);
20095 ieee80211_clear_tx_pending(local);
20096 -diff -urNp linux-3.1.3/net/mac80211/main.c linux-3.1.3/net/mac80211/main.c
20097 ---- linux-3.1.3/net/mac80211/main.c 2011-11-11 15:19:27.000000000 -0500
20098 -+++ linux-3.1.3/net/mac80211/main.c 2011-11-16 18:39:08.000000000 -0500
20099 +diff -urNp linux-3.1.4/net/mac80211/main.c linux-3.1.4/net/mac80211/main.c
20100 +--- linux-3.1.4/net/mac80211/main.c 2011-11-11 15:19:27.000000000 -0500
20101 ++++ linux-3.1.4/net/mac80211/main.c 2011-11-16 18:39:08.000000000 -0500
20102 @@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
20103 local->hw.conf.power_level = power;
20104 }
20105 @@ -73702,9 +74633,9 @@ diff -urNp linux-3.1.3/net/mac80211/main.c linux-3.1.3/net/mac80211/main.c
20106 ret = drv_config(local, changed);
20107 /*
20108 * Goal:
20109 -diff -urNp linux-3.1.3/net/mac80211/mlme.c linux-3.1.3/net/mac80211/mlme.c
20110 ---- linux-3.1.3/net/mac80211/mlme.c 2011-11-11 15:19:27.000000000 -0500
20111 -+++ linux-3.1.3/net/mac80211/mlme.c 2011-11-16 18:40:44.000000000 -0500
20112 +diff -urNp linux-3.1.4/net/mac80211/mlme.c linux-3.1.4/net/mac80211/mlme.c
20113 +--- linux-3.1.4/net/mac80211/mlme.c 2011-11-11 15:19:27.000000000 -0500
20114 ++++ linux-3.1.4/net/mac80211/mlme.c 2011-11-16 18:40:44.000000000 -0500
20115 @@ -1464,6 +1464,8 @@ static bool ieee80211_assoc_success(stru
20116 bool have_higher_than_11mbit = false;
20117 u16 ap_ht_cap_flags;
20118 @@ -73714,9 +74645,9 @@ diff -urNp linux-3.1.3/net/mac80211/mlme.c linux-3.1.3/net/mac80211/mlme.c
20119 /* AssocResp and ReassocResp have identical structure */
20120
20121 aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
20122 -diff -urNp linux-3.1.3/net/mac80211/pm.c linux-3.1.3/net/mac80211/pm.c
20123 ---- linux-3.1.3/net/mac80211/pm.c 2011-11-11 15:19:27.000000000 -0500
20124 -+++ linux-3.1.3/net/mac80211/pm.c 2011-11-16 18:39:08.000000000 -0500
20125 +diff -urNp linux-3.1.4/net/mac80211/pm.c linux-3.1.4/net/mac80211/pm.c
20126 +--- linux-3.1.4/net/mac80211/pm.c 2011-11-11 15:19:27.000000000 -0500
20127 ++++ linux-3.1.4/net/mac80211/pm.c 2011-11-16 18:39:08.000000000 -0500
20128 @@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211
20129 struct ieee80211_sub_if_data *sdata;
20130 struct sta_info *sta;
20131 @@ -73744,9 +74675,9 @@ diff -urNp linux-3.1.3/net/mac80211/pm.c linux-3.1.3/net/mac80211/pm.c
20132 ieee80211_stop_device(local);
20133
20134 suspend:
20135 -diff -urNp linux-3.1.3/net/mac80211/rate.c linux-3.1.3/net/mac80211/rate.c
20136 ---- linux-3.1.3/net/mac80211/rate.c 2011-11-11 15:19:27.000000000 -0500
20137 -+++ linux-3.1.3/net/mac80211/rate.c 2011-11-16 18:39:08.000000000 -0500
20138 +diff -urNp linux-3.1.4/net/mac80211/rate.c linux-3.1.4/net/mac80211/rate.c
20139 +--- linux-3.1.4/net/mac80211/rate.c 2011-11-11 15:19:27.000000000 -0500
20140 ++++ linux-3.1.4/net/mac80211/rate.c 2011-11-16 18:39:08.000000000 -0500
20141 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct
20142
20143 ASSERT_RTNL();
20144 @@ -73756,9 +74687,9 @@ diff -urNp linux-3.1.3/net/mac80211/rate.c linux-3.1.3/net/mac80211/rate.c
20145 return -EBUSY;
20146
20147 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
20148 -diff -urNp linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c
20149 ---- linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c 2011-11-11 15:19:27.000000000 -0500
20150 -+++ linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c 2011-11-16 18:39:08.000000000 -0500
20151 +diff -urNp linux-3.1.4/net/mac80211/rc80211_pid_debugfs.c linux-3.1.4/net/mac80211/rc80211_pid_debugfs.c
20152 +--- linux-3.1.4/net/mac80211/rc80211_pid_debugfs.c 2011-11-11 15:19:27.000000000 -0500
20153 ++++ linux-3.1.4/net/mac80211/rc80211_pid_debugfs.c 2011-11-16 18:39:08.000000000 -0500
20154 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
20155
20156 spin_unlock_irqrestore(&events->lock, status);
20157 @@ -73768,9 +74699,9 @@ diff -urNp linux-3.1.3/net/mac80211/rc80211_pid_debugfs.c linux-3.1.3/net/mac802
20158 return -EFAULT;
20159
20160 return p;
20161 -diff -urNp linux-3.1.3/net/mac80211/util.c linux-3.1.3/net/mac80211/util.c
20162 ---- linux-3.1.3/net/mac80211/util.c 2011-11-26 19:57:29.000000000 -0500
20163 -+++ linux-3.1.3/net/mac80211/util.c 2011-11-26 20:00:43.000000000 -0500
20164 +diff -urNp linux-3.1.4/net/mac80211/util.c linux-3.1.4/net/mac80211/util.c
20165 +--- linux-3.1.4/net/mac80211/util.c 2011-11-26 19:57:29.000000000 -0500
20166 ++++ linux-3.1.4/net/mac80211/util.c 2011-11-26 20:00:43.000000000 -0500
20167 @@ -1170,7 +1170,7 @@ int ieee80211_reconfig(struct ieee80211_
20168 drv_set_coverage_class(local, hw->wiphy->coverage_class);
20169
20170 @@ -73780,9 +74711,9 @@ diff -urNp linux-3.1.3/net/mac80211/util.c linux-3.1.3/net/mac80211/util.c
20171 goto wake_up;
20172
20173 /*
20174 -diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c
20175 ---- linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c 2011-11-11 15:19:27.000000000 -0500
20176 -+++ linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c 2011-11-16 18:39:08.000000000 -0500
20177 +diff -urNp linux-3.1.4/net/netfilter/ipvs/ip_vs_conn.c linux-3.1.4/net/netfilter/ipvs/ip_vs_conn.c
20178 +--- linux-3.1.4/net/netfilter/ipvs/ip_vs_conn.c 2011-11-11 15:19:27.000000000 -0500
20179 ++++ linux-3.1.4/net/netfilter/ipvs/ip_vs_conn.c 2011-11-16 18:39:08.000000000 -0500
20180 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
20181 /* Increase the refcnt counter of the dest */
20182 atomic_inc(&dest->refcnt);
20183 @@ -73810,9 +74741,9 @@ diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.1.3/net/netfilter
20184 if (i > 8 || i < 0) return 0;
20185
20186 if (!todrop_rate[i]) return 0;
20187 -diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c
20188 ---- linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c 2011-11-11 15:19:27.000000000 -0500
20189 -+++ linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c 2011-11-16 18:39:08.000000000 -0500
20190 +diff -urNp linux-3.1.4/net/netfilter/ipvs/ip_vs_core.c linux-3.1.4/net/netfilter/ipvs/ip_vs_core.c
20191 +--- linux-3.1.4/net/netfilter/ipvs/ip_vs_core.c 2011-11-11 15:19:27.000000000 -0500
20192 ++++ linux-3.1.4/net/netfilter/ipvs/ip_vs_core.c 2011-11-16 18:39:08.000000000 -0500
20193 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
20194 ret = cp->packet_xmit(skb, cp, pd->pp);
20195 /* do not touch skb anymore */
20196 @@ -73831,9 +74762,9 @@ diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_core.c linux-3.1.3/net/netfilter
20197
20198 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
20199 cp->protocol == IPPROTO_SCTP) {
20200 -diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c
20201 ---- linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-11 15:19:27.000000000 -0500
20202 -+++ linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-16 19:13:12.000000000 -0500
20203 +diff -urNp linux-3.1.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.1.4/net/netfilter/ipvs/ip_vs_ctl.c
20204 +--- linux-3.1.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-11 15:19:27.000000000 -0500
20205 ++++ linux-3.1.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-16 19:13:12.000000000 -0500
20206 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
20207 ip_vs_rs_hash(ipvs, dest);
20208 write_unlock_bh(&ipvs->rs_lock);
20209 @@ -73888,9 +74819,9 @@ diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.1.3/net/netfilter/
20210 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
20211 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
20212 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
20213 -diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c
20214 ---- linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c 2011-11-11 15:19:27.000000000 -0500
20215 -+++ linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c 2011-11-16 18:39:08.000000000 -0500
20216 +diff -urNp linux-3.1.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.1.4/net/netfilter/ipvs/ip_vs_sync.c
20217 +--- linux-3.1.4/net/netfilter/ipvs/ip_vs_sync.c 2011-11-11 15:19:27.000000000 -0500
20218 ++++ linux-3.1.4/net/netfilter/ipvs/ip_vs_sync.c 2011-11-16 18:39:08.000000000 -0500
20219 @@ -649,7 +649,7 @@ control:
20220 * i.e only increment in_pkts for Templates.
20221 */
20222 @@ -73909,9 +74840,9 @@ diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.1.3/net/netfilter
20223 cp->state = state;
20224 cp->old_state = cp->state;
20225 /*
20226 -diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c
20227 ---- linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-11 15:19:27.000000000 -0500
20228 -+++ linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-16 18:39:08.000000000 -0500
20229 +diff -urNp linux-3.1.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.4/net/netfilter/ipvs/ip_vs_xmit.c
20230 +--- linux-3.1.4/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-11 15:19:27.000000000 -0500
20231 ++++ linux-3.1.4/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-16 18:39:08.000000000 -0500
20232 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
20233 else
20234 rc = NF_ACCEPT;
20235 @@ -73930,9 +74861,9 @@ diff -urNp linux-3.1.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.3/net/netfilter
20236 goto out;
20237 }
20238
20239 -diff -urNp linux-3.1.3/net/netfilter/Kconfig linux-3.1.3/net/netfilter/Kconfig
20240 ---- linux-3.1.3/net/netfilter/Kconfig 2011-11-11 15:19:27.000000000 -0500
20241 -+++ linux-3.1.3/net/netfilter/Kconfig 2011-11-16 18:40:44.000000000 -0500
20242 +diff -urNp linux-3.1.4/net/netfilter/Kconfig linux-3.1.4/net/netfilter/Kconfig
20243 +--- linux-3.1.4/net/netfilter/Kconfig 2011-11-11 15:19:27.000000000 -0500
20244 ++++ linux-3.1.4/net/netfilter/Kconfig 2011-11-16 18:40:44.000000000 -0500
20245 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
20246
20247 To compile it as a module, choose M here. If unsure, say N.
20248 @@ -73950,9 +74881,9 @@ diff -urNp linux-3.1.3/net/netfilter/Kconfig linux-3.1.3/net/netfilter/Kconfig
20249 config NETFILTER_XT_MATCH_HASHLIMIT
20250 tristate '"hashlimit" match support'
20251 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
20252 -diff -urNp linux-3.1.3/net/netfilter/Makefile linux-3.1.3/net/netfilter/Makefile
20253 ---- linux-3.1.3/net/netfilter/Makefile 2011-11-11 15:19:27.000000000 -0500
20254 -+++ linux-3.1.3/net/netfilter/Makefile 2011-11-16 18:40:44.000000000 -0500
20255 +diff -urNp linux-3.1.4/net/netfilter/Makefile linux-3.1.4/net/netfilter/Makefile
20256 +--- linux-3.1.4/net/netfilter/Makefile 2011-11-11 15:19:27.000000000 -0500
20257 ++++ linux-3.1.4/net/netfilter/Makefile 2011-11-16 18:40:44.000000000 -0500
20258 @@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
20259 obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
20260 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
20261 @@ -73961,9 +74892,9 @@ diff -urNp linux-3.1.3/net/netfilter/Makefile linux-3.1.3/net/netfilter/Makefile
20262 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
20263 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
20264 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
20265 -diff -urNp linux-3.1.3/net/netfilter/nfnetlink_log.c linux-3.1.3/net/netfilter/nfnetlink_log.c
20266 ---- linux-3.1.3/net/netfilter/nfnetlink_log.c 2011-11-11 15:19:27.000000000 -0500
20267 -+++ linux-3.1.3/net/netfilter/nfnetlink_log.c 2011-11-16 18:39:08.000000000 -0500
20268 +diff -urNp linux-3.1.4/net/netfilter/nfnetlink_log.c linux-3.1.4/net/netfilter/nfnetlink_log.c
20269 +--- linux-3.1.4/net/netfilter/nfnetlink_log.c 2011-11-11 15:19:27.000000000 -0500
20270 ++++ linux-3.1.4/net/netfilter/nfnetlink_log.c 2011-11-16 18:39:08.000000000 -0500
20271 @@ -70,7 +70,7 @@ struct nfulnl_instance {
20272 };
20273
20274 @@ -73982,9 +74913,9 @@ diff -urNp linux-3.1.3/net/netfilter/nfnetlink_log.c linux-3.1.3/net/netfilter/n
20275
20276 if (data_len) {
20277 struct nlattr *nla;
20278 -diff -urNp linux-3.1.3/net/netfilter/xt_gradm.c linux-3.1.3/net/netfilter/xt_gradm.c
20279 ---- linux-3.1.3/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
20280 -+++ linux-3.1.3/net/netfilter/xt_gradm.c 2011-11-16 18:40:44.000000000 -0500
20281 +diff -urNp linux-3.1.4/net/netfilter/xt_gradm.c linux-3.1.4/net/netfilter/xt_gradm.c
20282 +--- linux-3.1.4/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
20283 ++++ linux-3.1.4/net/netfilter/xt_gradm.c 2011-11-16 18:40:44.000000000 -0500
20284 @@ -0,0 +1,51 @@
20285 +/*
20286 + * gradm match for netfilter
20287 @@ -74037,9 +74968,9 @@ diff -urNp linux-3.1.3/net/netfilter/xt_gradm.c linux-3.1.3/net/netfilter/xt_gra
20288 +MODULE_LICENSE("GPL");
20289 +MODULE_ALIAS("ipt_gradm");
20290 +MODULE_ALIAS("ip6t_gradm");
20291 -diff -urNp linux-3.1.3/net/netfilter/xt_statistic.c linux-3.1.3/net/netfilter/xt_statistic.c
20292 ---- linux-3.1.3/net/netfilter/xt_statistic.c 2011-11-11 15:19:27.000000000 -0500
20293 -+++ linux-3.1.3/net/netfilter/xt_statistic.c 2011-11-16 18:39:08.000000000 -0500
20294 +diff -urNp linux-3.1.4/net/netfilter/xt_statistic.c linux-3.1.4/net/netfilter/xt_statistic.c
20295 +--- linux-3.1.4/net/netfilter/xt_statistic.c 2011-11-11 15:19:27.000000000 -0500
20296 ++++ linux-3.1.4/net/netfilter/xt_statistic.c 2011-11-16 18:39:08.000000000 -0500
20297 @@ -18,7 +18,7 @@
20298 #include <linux/netfilter/x_tables.h>
20299
20300 @@ -74070,9 +75001,9 @@ diff -urNp linux-3.1.3/net/netfilter/xt_statistic.c linux-3.1.3/net/netfilter/xt
20301
20302 return 0;
20303 }
20304 -diff -urNp linux-3.1.3/net/netlink/af_netlink.c linux-3.1.3/net/netlink/af_netlink.c
20305 ---- linux-3.1.3/net/netlink/af_netlink.c 2011-11-11 15:19:27.000000000 -0500
20306 -+++ linux-3.1.3/net/netlink/af_netlink.c 2011-11-16 18:39:08.000000000 -0500
20307 +diff -urNp linux-3.1.4/net/netlink/af_netlink.c linux-3.1.4/net/netlink/af_netlink.c
20308 +--- linux-3.1.4/net/netlink/af_netlink.c 2011-11-11 15:19:27.000000000 -0500
20309 ++++ linux-3.1.4/net/netlink/af_netlink.c 2011-11-16 18:39:08.000000000 -0500
20310 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock
20311 sk->sk_error_report(sk);
20312 }
20313 @@ -74091,9 +75022,9 @@ diff -urNp linux-3.1.3/net/netlink/af_netlink.c linux-3.1.3/net/netlink/af_netli
20314 sock_i_ino(s)
20315 );
20316
20317 -diff -urNp linux-3.1.3/net/netrom/af_netrom.c linux-3.1.3/net/netrom/af_netrom.c
20318 ---- linux-3.1.3/net/netrom/af_netrom.c 2011-11-11 15:19:27.000000000 -0500
20319 -+++ linux-3.1.3/net/netrom/af_netrom.c 2011-11-16 18:40:44.000000000 -0500
20320 +diff -urNp linux-3.1.4/net/netrom/af_netrom.c linux-3.1.4/net/netrom/af_netrom.c
20321 +--- linux-3.1.4/net/netrom/af_netrom.c 2011-11-11 15:19:27.000000000 -0500
20322 ++++ linux-3.1.4/net/netrom/af_netrom.c 2011-11-16 18:40:44.000000000 -0500
20323 @@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
20324 struct sock *sk = sock->sk;
20325 struct nr_sock *nr = nr_sk(sk);
20326 @@ -74110,9 +75041,9 @@ diff -urNp linux-3.1.3/net/netrom/af_netrom.c linux-3.1.3/net/netrom/af_netrom.c
20327 sax->fsa_ax25.sax25_call = nr->source_addr;
20328 *uaddr_len = sizeof(struct sockaddr_ax25);
20329 }
20330 -diff -urNp linux-3.1.3/net/packet/af_packet.c linux-3.1.3/net/packet/af_packet.c
20331 ---- linux-3.1.3/net/packet/af_packet.c 2011-11-11 15:19:27.000000000 -0500
20332 -+++ linux-3.1.3/net/packet/af_packet.c 2011-11-16 18:39:08.000000000 -0500
20333 +diff -urNp linux-3.1.4/net/packet/af_packet.c linux-3.1.4/net/packet/af_packet.c
20334 +--- linux-3.1.4/net/packet/af_packet.c 2011-11-11 15:19:27.000000000 -0500
20335 ++++ linux-3.1.4/net/packet/af_packet.c 2011-11-16 18:39:08.000000000 -0500
20336 @@ -954,7 +954,7 @@ static int packet_rcv(struct sk_buff *sk
20337
20338 spin_lock(&sk->sk_receive_queue.lock);
20339 @@ -74149,9 +75080,9 @@ diff -urNp linux-3.1.3/net/packet/af_packet.c linux-3.1.3/net/packet/af_packet.c
20340 return -EFAULT;
20341 return 0;
20342 }
20343 -diff -urNp linux-3.1.3/net/phonet/af_phonet.c linux-3.1.3/net/phonet/af_phonet.c
20344 ---- linux-3.1.3/net/phonet/af_phonet.c 2011-11-11 15:19:27.000000000 -0500
20345 -+++ linux-3.1.3/net/phonet/af_phonet.c 2011-11-16 18:40:44.000000000 -0500
20346 +diff -urNp linux-3.1.4/net/phonet/af_phonet.c linux-3.1.4/net/phonet/af_phonet.c
20347 +--- linux-3.1.4/net/phonet/af_phonet.c 2011-11-11 15:19:27.000000000 -0500
20348 ++++ linux-3.1.4/net/phonet/af_phonet.c 2011-11-16 18:40:44.000000000 -0500
20349 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
20350 {
20351 struct phonet_protocol *pp;
20352 @@ -74170,9 +75101,9 @@ diff -urNp linux-3.1.3/net/phonet/af_phonet.c linux-3.1.3/net/phonet/af_phonet.c
20353 return -EINVAL;
20354
20355 err = proto_register(pp->prot, 1);
20356 -diff -urNp linux-3.1.3/net/phonet/pep.c linux-3.1.3/net/phonet/pep.c
20357 ---- linux-3.1.3/net/phonet/pep.c 2011-11-11 15:19:27.000000000 -0500
20358 -+++ linux-3.1.3/net/phonet/pep.c 2011-11-16 18:39:08.000000000 -0500
20359 +diff -urNp linux-3.1.4/net/phonet/pep.c linux-3.1.4/net/phonet/pep.c
20360 +--- linux-3.1.4/net/phonet/pep.c 2011-11-11 15:19:27.000000000 -0500
20361 ++++ linux-3.1.4/net/phonet/pep.c 2011-11-16 18:39:08.000000000 -0500
20362 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk,
20363
20364 case PNS_PEP_CTRL_REQ:
20365 @@ -74200,9 +75131,9 @@ diff -urNp linux-3.1.3/net/phonet/pep.c linux-3.1.3/net/phonet/pep.c
20366 err = NET_RX_DROP;
20367 break;
20368 }
20369 -diff -urNp linux-3.1.3/net/phonet/socket.c linux-3.1.3/net/phonet/socket.c
20370 ---- linux-3.1.3/net/phonet/socket.c 2011-11-11 15:19:27.000000000 -0500
20371 -+++ linux-3.1.3/net/phonet/socket.c 2011-11-16 18:40:44.000000000 -0500
20372 +diff -urNp linux-3.1.4/net/phonet/socket.c linux-3.1.4/net/phonet/socket.c
20373 +--- linux-3.1.4/net/phonet/socket.c 2011-11-11 15:19:27.000000000 -0500
20374 ++++ linux-3.1.4/net/phonet/socket.c 2011-11-16 18:40:44.000000000 -0500
20375 @@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f
20376 pn->resource, sk->sk_state,
20377 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
20378 @@ -74219,9 +75150,9 @@ diff -urNp linux-3.1.3/net/phonet/socket.c linux-3.1.3/net/phonet/socket.c
20379 }
20380 seq_printf(seq, "%*s\n", 127 - len, "");
20381 return 0;
20382 -diff -urNp linux-3.1.3/net/rds/cong.c linux-3.1.3/net/rds/cong.c
20383 ---- linux-3.1.3/net/rds/cong.c 2011-11-11 15:19:27.000000000 -0500
20384 -+++ linux-3.1.3/net/rds/cong.c 2011-11-16 18:39:08.000000000 -0500
20385 +diff -urNp linux-3.1.4/net/rds/cong.c linux-3.1.4/net/rds/cong.c
20386 +--- linux-3.1.4/net/rds/cong.c 2011-11-11 15:19:27.000000000 -0500
20387 ++++ linux-3.1.4/net/rds/cong.c 2011-11-16 18:39:08.000000000 -0500
20388 @@ -77,7 +77,7 @@
20389 * finds that the saved generation number is smaller than the global generation
20390 * number, it wakes up the process.
20391 @@ -74249,9 +75180,9 @@ diff -urNp linux-3.1.3/net/rds/cong.c linux-3.1.3/net/rds/cong.c
20392
20393 if (likely(*recent == gen))
20394 return 0;
20395 -diff -urNp linux-3.1.3/net/rds/ib_cm.c linux-3.1.3/net/rds/ib_cm.c
20396 ---- linux-3.1.3/net/rds/ib_cm.c 2011-11-11 15:19:27.000000000 -0500
20397 -+++ linux-3.1.3/net/rds/ib_cm.c 2011-11-16 18:39:08.000000000 -0500
20398 +diff -urNp linux-3.1.4/net/rds/ib_cm.c linux-3.1.4/net/rds/ib_cm.c
20399 +--- linux-3.1.4/net/rds/ib_cm.c 2011-11-11 15:19:27.000000000 -0500
20400 ++++ linux-3.1.4/net/rds/ib_cm.c 2011-11-16 18:39:08.000000000 -0500
20401 @@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con
20402 /* Clear the ACK state */
20403 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
20404 @@ -74261,9 +75192,9 @@ diff -urNp linux-3.1.3/net/rds/ib_cm.c linux-3.1.3/net/rds/ib_cm.c
20405 #else
20406 ic->i_ack_next = 0;
20407 #endif
20408 -diff -urNp linux-3.1.3/net/rds/ib.h linux-3.1.3/net/rds/ib.h
20409 ---- linux-3.1.3/net/rds/ib.h 2011-11-11 15:19:27.000000000 -0500
20410 -+++ linux-3.1.3/net/rds/ib.h 2011-11-16 18:39:08.000000000 -0500
20411 +diff -urNp linux-3.1.4/net/rds/ib.h linux-3.1.4/net/rds/ib.h
20412 +--- linux-3.1.4/net/rds/ib.h 2011-11-11 15:19:27.000000000 -0500
20413 ++++ linux-3.1.4/net/rds/ib.h 2011-11-16 18:39:08.000000000 -0500
20414 @@ -128,7 +128,7 @@ struct rds_ib_connection {
20415 /* sending acks */
20416 unsigned long i_ack_flags;
20417 @@ -74273,9 +75204,9 @@ diff -urNp linux-3.1.3/net/rds/ib.h linux-3.1.3/net/rds/ib.h
20418 #else
20419 spinlock_t i_ack_lock; /* protect i_ack_next */
20420 u64 i_ack_next; /* next ACK to send */
20421 -diff -urNp linux-3.1.3/net/rds/ib_recv.c linux-3.1.3/net/rds/ib_recv.c
20422 ---- linux-3.1.3/net/rds/ib_recv.c 2011-11-11 15:19:27.000000000 -0500
20423 -+++ linux-3.1.3/net/rds/ib_recv.c 2011-11-16 18:39:08.000000000 -0500
20424 +diff -urNp linux-3.1.4/net/rds/ib_recv.c linux-3.1.4/net/rds/ib_recv.c
20425 +--- linux-3.1.4/net/rds/ib_recv.c 2011-11-11 15:19:27.000000000 -0500
20426 ++++ linux-3.1.4/net/rds/ib_recv.c 2011-11-16 18:39:08.000000000 -0500
20427 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
20428 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
20429 int ack_required)
20430 @@ -74294,9 +75225,9 @@ diff -urNp linux-3.1.3/net/rds/ib_recv.c linux-3.1.3/net/rds/ib_recv.c
20431 }
20432 #endif
20433
20434 -diff -urNp linux-3.1.3/net/rds/iw_cm.c linux-3.1.3/net/rds/iw_cm.c
20435 ---- linux-3.1.3/net/rds/iw_cm.c 2011-11-11 15:19:27.000000000 -0500
20436 -+++ linux-3.1.3/net/rds/iw_cm.c 2011-11-16 18:39:08.000000000 -0500
20437 +diff -urNp linux-3.1.4/net/rds/iw_cm.c linux-3.1.4/net/rds/iw_cm.c
20438 +--- linux-3.1.4/net/rds/iw_cm.c 2011-11-11 15:19:27.000000000 -0500
20439 ++++ linux-3.1.4/net/rds/iw_cm.c 2011-11-16 18:39:08.000000000 -0500
20440 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_con
20441 /* Clear the ACK state */
20442 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
20443 @@ -74306,9 +75237,9 @@ diff -urNp linux-3.1.3/net/rds/iw_cm.c linux-3.1.3/net/rds/iw_cm.c
20444 #else
20445 ic->i_ack_next = 0;
20446 #endif
20447 -diff -urNp linux-3.1.3/net/rds/iw.h linux-3.1.3/net/rds/iw.h
20448 ---- linux-3.1.3/net/rds/iw.h 2011-11-11 15:19:27.000000000 -0500
20449 -+++ linux-3.1.3/net/rds/iw.h 2011-11-16 18:39:08.000000000 -0500
20450 +diff -urNp linux-3.1.4/net/rds/iw.h linux-3.1.4/net/rds/iw.h
20451 +--- linux-3.1.4/net/rds/iw.h 2011-11-11 15:19:27.000000000 -0500
20452 ++++ linux-3.1.4/net/rds/iw.h 2011-11-16 18:39:08.000000000 -0500
20453 @@ -134,7 +134,7 @@ struct rds_iw_connection {
20454 /* sending acks */
20455 unsigned long i_ack_flags;
20456 @@ -74318,9 +75249,9 @@ diff -urNp linux-3.1.3/net/rds/iw.h linux-3.1.3/net/rds/iw.h
20457 #else
20458 spinlock_t i_ack_lock; /* protect i_ack_next */
20459 u64 i_ack_next; /* next ACK to send */
20460 -diff -urNp linux-3.1.3/net/rds/iw_rdma.c linux-3.1.3/net/rds/iw_rdma.c
20461 ---- linux-3.1.3/net/rds/iw_rdma.c 2011-11-11 15:19:27.000000000 -0500
20462 -+++ linux-3.1.3/net/rds/iw_rdma.c 2011-11-16 18:40:44.000000000 -0500
20463 +diff -urNp linux-3.1.4/net/rds/iw_rdma.c linux-3.1.4/net/rds/iw_rdma.c
20464 +--- linux-3.1.4/net/rds/iw_rdma.c 2011-11-11 15:19:27.000000000 -0500
20465 ++++ linux-3.1.4/net/rds/iw_rdma.c 2011-11-16 18:40:44.000000000 -0500
20466 @@ -184,6 +184,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
20467 struct rdma_cm_id *pcm_id;
20468 int rc;
20469 @@ -74330,9 +75261,9 @@ diff -urNp linux-3.1.3/net/rds/iw_rdma.c linux-3.1.3/net/rds/iw_rdma.c
20470 src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
20471 dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
20472
20473 -diff -urNp linux-3.1.3/net/rds/iw_recv.c linux-3.1.3/net/rds/iw_recv.c
20474 ---- linux-3.1.3/net/rds/iw_recv.c 2011-11-11 15:19:27.000000000 -0500
20475 -+++ linux-3.1.3/net/rds/iw_recv.c 2011-11-16 18:39:08.000000000 -0500
20476 +diff -urNp linux-3.1.4/net/rds/iw_recv.c linux-3.1.4/net/rds/iw_recv.c
20477 +--- linux-3.1.4/net/rds/iw_recv.c 2011-11-11 15:19:27.000000000 -0500
20478 ++++ linux-3.1.4/net/rds/iw_recv.c 2011-11-16 18:39:08.000000000 -0500
20479 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
20480 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
20481 int ack_required)
20482 @@ -74351,9 +75282,9 @@ diff -urNp linux-3.1.3/net/rds/iw_recv.c linux-3.1.3/net/rds/iw_recv.c
20483 }
20484 #endif
20485
20486 -diff -urNp linux-3.1.3/net/rds/tcp.c linux-3.1.3/net/rds/tcp.c
20487 ---- linux-3.1.3/net/rds/tcp.c 2011-11-11 15:19:27.000000000 -0500
20488 -+++ linux-3.1.3/net/rds/tcp.c 2011-11-16 18:39:08.000000000 -0500
20489 +diff -urNp linux-3.1.4/net/rds/tcp.c linux-3.1.4/net/rds/tcp.c
20490 +--- linux-3.1.4/net/rds/tcp.c 2011-11-11 15:19:27.000000000 -0500
20491 ++++ linux-3.1.4/net/rds/tcp.c 2011-11-16 18:39:08.000000000 -0500
20492 @@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock
20493 int val = 1;
20494
20495 @@ -74363,9 +75294,9 @@ diff -urNp linux-3.1.3/net/rds/tcp.c linux-3.1.3/net/rds/tcp.c
20496 sizeof(val));
20497 set_fs(oldfs);
20498 }
20499 -diff -urNp linux-3.1.3/net/rds/tcp_send.c linux-3.1.3/net/rds/tcp_send.c
20500 ---- linux-3.1.3/net/rds/tcp_send.c 2011-11-11 15:19:27.000000000 -0500
20501 -+++ linux-3.1.3/net/rds/tcp_send.c 2011-11-16 18:39:08.000000000 -0500
20502 +diff -urNp linux-3.1.4/net/rds/tcp_send.c linux-3.1.4/net/rds/tcp_send.c
20503 +--- linux-3.1.4/net/rds/tcp_send.c 2011-11-11 15:19:27.000000000 -0500
20504 ++++ linux-3.1.4/net/rds/tcp_send.c 2011-11-16 18:39:08.000000000 -0500
20505 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *
20506
20507 oldfs = get_fs();
20508 @@ -74375,9 +75306,9 @@ diff -urNp linux-3.1.3/net/rds/tcp_send.c linux-3.1.3/net/rds/tcp_send.c
20509 sizeof(val));
20510 set_fs(oldfs);
20511 }
20512 -diff -urNp linux-3.1.3/net/rxrpc/af_rxrpc.c linux-3.1.3/net/rxrpc/af_rxrpc.c
20513 ---- linux-3.1.3/net/rxrpc/af_rxrpc.c 2011-11-11 15:19:27.000000000 -0500
20514 -+++ linux-3.1.3/net/rxrpc/af_rxrpc.c 2011-11-16 18:39:08.000000000 -0500
20515 +diff -urNp linux-3.1.4/net/rxrpc/af_rxrpc.c linux-3.1.4/net/rxrpc/af_rxrpc.c
20516 +--- linux-3.1.4/net/rxrpc/af_rxrpc.c 2011-11-11 15:19:27.000000000 -0500
20517 ++++ linux-3.1.4/net/rxrpc/af_rxrpc.c 2011-11-16 18:39:08.000000000 -0500
20518 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
20519 __be32 rxrpc_epoch;
20520
20521 @@ -74387,9 +75318,9 @@ diff -urNp linux-3.1.3/net/rxrpc/af_rxrpc.c linux-3.1.3/net/rxrpc/af_rxrpc.c
20522
20523 /* count of skbs currently in use */
20524 atomic_t rxrpc_n_skbs;
20525 -diff -urNp linux-3.1.3/net/rxrpc/ar-ack.c linux-3.1.3/net/rxrpc/ar-ack.c
20526 ---- linux-3.1.3/net/rxrpc/ar-ack.c 2011-11-11 15:19:27.000000000 -0500
20527 -+++ linux-3.1.3/net/rxrpc/ar-ack.c 2011-11-16 18:40:44.000000000 -0500
20528 +diff -urNp linux-3.1.4/net/rxrpc/ar-ack.c linux-3.1.4/net/rxrpc/ar-ack.c
20529 +--- linux-3.1.4/net/rxrpc/ar-ack.c 2011-11-11 15:19:27.000000000 -0500
20530 ++++ linux-3.1.4/net/rxrpc/ar-ack.c 2011-11-16 18:40:44.000000000 -0500
20531 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
20532
20533 _enter("{%d,%d,%d,%d},",
20534 @@ -74462,9 +75393,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-ack.c linux-3.1.3/net/rxrpc/ar-ack.c
20535 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
20536 send_message_2:
20537
20538 -diff -urNp linux-3.1.3/net/rxrpc/ar-call.c linux-3.1.3/net/rxrpc/ar-call.c
20539 ---- linux-3.1.3/net/rxrpc/ar-call.c 2011-11-11 15:19:27.000000000 -0500
20540 -+++ linux-3.1.3/net/rxrpc/ar-call.c 2011-11-16 18:39:08.000000000 -0500
20541 +diff -urNp linux-3.1.4/net/rxrpc/ar-call.c linux-3.1.4/net/rxrpc/ar-call.c
20542 +--- linux-3.1.4/net/rxrpc/ar-call.c 2011-11-11 15:19:27.000000000 -0500
20543 ++++ linux-3.1.4/net/rxrpc/ar-call.c 2011-11-16 18:39:08.000000000 -0500
20544 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
20545 spin_lock_init(&call->lock);
20546 rwlock_init(&call->state_lock);
20547 @@ -74474,9 +75405,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-call.c linux-3.1.3/net/rxrpc/ar-call.c
20548 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
20549
20550 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
20551 -diff -urNp linux-3.1.3/net/rxrpc/ar-connection.c linux-3.1.3/net/rxrpc/ar-connection.c
20552 ---- linux-3.1.3/net/rxrpc/ar-connection.c 2011-11-11 15:19:27.000000000 -0500
20553 -+++ linux-3.1.3/net/rxrpc/ar-connection.c 2011-11-16 18:39:08.000000000 -0500
20554 +diff -urNp linux-3.1.4/net/rxrpc/ar-connection.c linux-3.1.4/net/rxrpc/ar-connection.c
20555 +--- linux-3.1.4/net/rxrpc/ar-connection.c 2011-11-11 15:19:27.000000000 -0500
20556 ++++ linux-3.1.4/net/rxrpc/ar-connection.c 2011-11-16 18:39:08.000000000 -0500
20557 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
20558 rwlock_init(&conn->lock);
20559 spin_lock_init(&conn->state_lock);
20560 @@ -74486,9 +75417,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-connection.c linux-3.1.3/net/rxrpc/ar-connec
20561 conn->avail_calls = RXRPC_MAXCALLS;
20562 conn->size_align = 4;
20563 conn->header_size = sizeof(struct rxrpc_header);
20564 -diff -urNp linux-3.1.3/net/rxrpc/ar-connevent.c linux-3.1.3/net/rxrpc/ar-connevent.c
20565 ---- linux-3.1.3/net/rxrpc/ar-connevent.c 2011-11-11 15:19:27.000000000 -0500
20566 -+++ linux-3.1.3/net/rxrpc/ar-connevent.c 2011-11-16 18:39:08.000000000 -0500
20567 +diff -urNp linux-3.1.4/net/rxrpc/ar-connevent.c linux-3.1.4/net/rxrpc/ar-connevent.c
20568 +--- linux-3.1.4/net/rxrpc/ar-connevent.c 2011-11-11 15:19:27.000000000 -0500
20569 ++++ linux-3.1.4/net/rxrpc/ar-connevent.c 2011-11-16 18:39:08.000000000 -0500
20570 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
20571
20572 len = iov[0].iov_len + iov[1].iov_len;
20573 @@ -74498,9 +75429,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-connevent.c linux-3.1.3/net/rxrpc/ar-conneve
20574 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
20575
20576 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
20577 -diff -urNp linux-3.1.3/net/rxrpc/ar-input.c linux-3.1.3/net/rxrpc/ar-input.c
20578 ---- linux-3.1.3/net/rxrpc/ar-input.c 2011-11-11 15:19:27.000000000 -0500
20579 -+++ linux-3.1.3/net/rxrpc/ar-input.c 2011-11-16 18:39:08.000000000 -0500
20580 +diff -urNp linux-3.1.4/net/rxrpc/ar-input.c linux-3.1.4/net/rxrpc/ar-input.c
20581 +--- linux-3.1.4/net/rxrpc/ar-input.c 2011-11-11 15:19:27.000000000 -0500
20582 ++++ linux-3.1.4/net/rxrpc/ar-input.c 2011-11-16 18:39:08.000000000 -0500
20583 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
20584 /* track the latest serial number on this connection for ACK packet
20585 * information */
20586 @@ -74513,9 +75444,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-input.c linux-3.1.3/net/rxrpc/ar-input.c
20587 serial);
20588
20589 /* request ACK generation for any ACK or DATA packet that requests
20590 -diff -urNp linux-3.1.3/net/rxrpc/ar-internal.h linux-3.1.3/net/rxrpc/ar-internal.h
20591 ---- linux-3.1.3/net/rxrpc/ar-internal.h 2011-11-11 15:19:27.000000000 -0500
20592 -+++ linux-3.1.3/net/rxrpc/ar-internal.h 2011-11-16 18:39:08.000000000 -0500
20593 +diff -urNp linux-3.1.4/net/rxrpc/ar-internal.h linux-3.1.4/net/rxrpc/ar-internal.h
20594 +--- linux-3.1.4/net/rxrpc/ar-internal.h 2011-11-11 15:19:27.000000000 -0500
20595 ++++ linux-3.1.4/net/rxrpc/ar-internal.h 2011-11-16 18:39:08.000000000 -0500
20596 @@ -272,8 +272,8 @@ struct rxrpc_connection {
20597 int error; /* error code for local abort */
20598 int debug_id; /* debug ID for printks */
20599 @@ -74545,9 +75476,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-internal.h linux-3.1.3/net/rxrpc/ar-internal
20600 extern struct workqueue_struct *rxrpc_workqueue;
20601
20602 /*
20603 -diff -urNp linux-3.1.3/net/rxrpc/ar-local.c linux-3.1.3/net/rxrpc/ar-local.c
20604 ---- linux-3.1.3/net/rxrpc/ar-local.c 2011-11-11 15:19:27.000000000 -0500
20605 -+++ linux-3.1.3/net/rxrpc/ar-local.c 2011-11-16 18:39:08.000000000 -0500
20606 +diff -urNp linux-3.1.4/net/rxrpc/ar-local.c linux-3.1.4/net/rxrpc/ar-local.c
20607 +--- linux-3.1.4/net/rxrpc/ar-local.c 2011-11-11 15:19:27.000000000 -0500
20608 ++++ linux-3.1.4/net/rxrpc/ar-local.c 2011-11-16 18:39:08.000000000 -0500
20609 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
20610 spin_lock_init(&local->lock);
20611 rwlock_init(&local->services_lock);
20612 @@ -74557,9 +75488,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-local.c linux-3.1.3/net/rxrpc/ar-local.c
20613 memcpy(&local->srx, srx, sizeof(*srx));
20614 }
20615
20616 -diff -urNp linux-3.1.3/net/rxrpc/ar-output.c linux-3.1.3/net/rxrpc/ar-output.c
20617 ---- linux-3.1.3/net/rxrpc/ar-output.c 2011-11-11 15:19:27.000000000 -0500
20618 -+++ linux-3.1.3/net/rxrpc/ar-output.c 2011-11-16 18:39:08.000000000 -0500
20619 +diff -urNp linux-3.1.4/net/rxrpc/ar-output.c linux-3.1.4/net/rxrpc/ar-output.c
20620 +--- linux-3.1.4/net/rxrpc/ar-output.c 2011-11-11 15:19:27.000000000 -0500
20621 ++++ linux-3.1.4/net/rxrpc/ar-output.c 2011-11-16 18:39:08.000000000 -0500
20622 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb
20623 sp->hdr.cid = call->cid;
20624 sp->hdr.callNumber = call->call_id;
20625 @@ -74572,9 +75503,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-output.c linux-3.1.3/net/rxrpc/ar-output.c
20626 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
20627 sp->hdr.userStatus = 0;
20628 sp->hdr.securityIndex = conn->security_ix;
20629 -diff -urNp linux-3.1.3/net/rxrpc/ar-peer.c linux-3.1.3/net/rxrpc/ar-peer.c
20630 ---- linux-3.1.3/net/rxrpc/ar-peer.c 2011-11-11 15:19:27.000000000 -0500
20631 -+++ linux-3.1.3/net/rxrpc/ar-peer.c 2011-11-16 18:39:08.000000000 -0500
20632 +diff -urNp linux-3.1.4/net/rxrpc/ar-peer.c linux-3.1.4/net/rxrpc/ar-peer.c
20633 +--- linux-3.1.4/net/rxrpc/ar-peer.c 2011-11-11 15:19:27.000000000 -0500
20634 ++++ linux-3.1.4/net/rxrpc/ar-peer.c 2011-11-16 18:39:08.000000000 -0500
20635 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
20636 INIT_LIST_HEAD(&peer->error_targets);
20637 spin_lock_init(&peer->lock);
20638 @@ -74584,9 +75515,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-peer.c linux-3.1.3/net/rxrpc/ar-peer.c
20639 memcpy(&peer->srx, srx, sizeof(*srx));
20640
20641 rxrpc_assess_MTU_size(peer);
20642 -diff -urNp linux-3.1.3/net/rxrpc/ar-proc.c linux-3.1.3/net/rxrpc/ar-proc.c
20643 ---- linux-3.1.3/net/rxrpc/ar-proc.c 2011-11-11 15:19:27.000000000 -0500
20644 -+++ linux-3.1.3/net/rxrpc/ar-proc.c 2011-11-16 18:39:08.000000000 -0500
20645 +diff -urNp linux-3.1.4/net/rxrpc/ar-proc.c linux-3.1.4/net/rxrpc/ar-proc.c
20646 +--- linux-3.1.4/net/rxrpc/ar-proc.c 2011-11-11 15:19:27.000000000 -0500
20647 ++++ linux-3.1.4/net/rxrpc/ar-proc.c 2011-11-16 18:39:08.000000000 -0500
20648 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
20649 atomic_read(&conn->usage),
20650 rxrpc_conn_states[conn->state],
20651 @@ -74598,9 +75529,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-proc.c linux-3.1.3/net/rxrpc/ar-proc.c
20652
20653 return 0;
20654 }
20655 -diff -urNp linux-3.1.3/net/rxrpc/ar-transport.c linux-3.1.3/net/rxrpc/ar-transport.c
20656 ---- linux-3.1.3/net/rxrpc/ar-transport.c 2011-11-11 15:19:27.000000000 -0500
20657 -+++ linux-3.1.3/net/rxrpc/ar-transport.c 2011-11-16 18:39:08.000000000 -0500
20658 +diff -urNp linux-3.1.4/net/rxrpc/ar-transport.c linux-3.1.4/net/rxrpc/ar-transport.c
20659 +--- linux-3.1.4/net/rxrpc/ar-transport.c 2011-11-11 15:19:27.000000000 -0500
20660 ++++ linux-3.1.4/net/rxrpc/ar-transport.c 2011-11-16 18:39:08.000000000 -0500
20661 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
20662 spin_lock_init(&trans->client_lock);
20663 rwlock_init(&trans->conn_lock);
20664 @@ -74610,9 +75541,9 @@ diff -urNp linux-3.1.3/net/rxrpc/ar-transport.c linux-3.1.3/net/rxrpc/ar-transpo
20665
20666 if (peer->srx.transport.family == AF_INET) {
20667 switch (peer->srx.transport_type) {
20668 -diff -urNp linux-3.1.3/net/rxrpc/rxkad.c linux-3.1.3/net/rxrpc/rxkad.c
20669 ---- linux-3.1.3/net/rxrpc/rxkad.c 2011-11-11 15:19:27.000000000 -0500
20670 -+++ linux-3.1.3/net/rxrpc/rxkad.c 2011-11-16 18:40:44.000000000 -0500
20671 +diff -urNp linux-3.1.4/net/rxrpc/rxkad.c linux-3.1.4/net/rxrpc/rxkad.c
20672 +--- linux-3.1.4/net/rxrpc/rxkad.c 2011-11-11 15:19:27.000000000 -0500
20673 ++++ linux-3.1.4/net/rxrpc/rxkad.c 2011-11-16 18:40:44.000000000 -0500
20674 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
20675 u16 check;
20676 int nsg;
20677 @@ -74649,9 +75580,9 @@ diff -urNp linux-3.1.3/net/rxrpc/rxkad.c linux-3.1.3/net/rxrpc/rxkad.c
20678 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
20679
20680 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
20681 -diff -urNp linux-3.1.3/net/sctp/proc.c linux-3.1.3/net/sctp/proc.c
20682 ---- linux-3.1.3/net/sctp/proc.c 2011-11-11 15:19:27.000000000 -0500
20683 -+++ linux-3.1.3/net/sctp/proc.c 2011-11-16 18:40:44.000000000 -0500
20684 +diff -urNp linux-3.1.4/net/sctp/proc.c linux-3.1.4/net/sctp/proc.c
20685 +--- linux-3.1.4/net/sctp/proc.c 2011-11-11 15:19:27.000000000 -0500
20686 ++++ linux-3.1.4/net/sctp/proc.c 2011-11-16 18:40:44.000000000 -0500
20687 @@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
20688 seq_printf(seq,
20689 "%8pK %8pK %-3d %-3d %-2d %-4d "
20690 @@ -74662,9 +75593,9 @@ diff -urNp linux-3.1.3/net/sctp/proc.c linux-3.1.3/net/sctp/proc.c
20691 assoc->state, hash,
20692 assoc->assoc_id,
20693 assoc->sndbuf_used,
20694 -diff -urNp linux-3.1.3/net/sctp/socket.c linux-3.1.3/net/sctp/socket.c
20695 ---- linux-3.1.3/net/sctp/socket.c 2011-11-11 15:19:27.000000000 -0500
20696 -+++ linux-3.1.3/net/sctp/socket.c 2011-11-16 18:39:08.000000000 -0500
20697 +diff -urNp linux-3.1.4/net/sctp/socket.c linux-3.1.4/net/sctp/socket.c
20698 +--- linux-3.1.4/net/sctp/socket.c 2011-11-11 15:19:27.000000000 -0500
20699 ++++ linux-3.1.4/net/sctp/socket.c 2011-11-16 18:39:08.000000000 -0500
20700 @@ -4575,7 +4575,7 @@ static int sctp_getsockopt_peer_addrs(st
20701 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
20702 if (space_left < addrlen)
20703 @@ -74674,9 +75605,9 @@ diff -urNp linux-3.1.3/net/sctp/socket.c linux-3.1.3/net/sctp/socket.c
20704 return -EFAULT;
20705 to += addrlen;
20706 cnt++;
20707 -diff -urNp linux-3.1.3/net/socket.c linux-3.1.3/net/socket.c
20708 ---- linux-3.1.3/net/socket.c 2011-11-11 15:19:27.000000000 -0500
20709 -+++ linux-3.1.3/net/socket.c 2011-11-16 18:40:44.000000000 -0500
20710 +diff -urNp linux-3.1.4/net/socket.c linux-3.1.4/net/socket.c
20711 +--- linux-3.1.4/net/socket.c 2011-11-11 15:19:27.000000000 -0500
20712 ++++ linux-3.1.4/net/socket.c 2011-11-16 18:40:44.000000000 -0500
20713 @@ -88,6 +88,7 @@
20714 #include <linux/nsproxy.h>
20715 #include <linux/magic.h>
20716 @@ -74944,9 +75875,9 @@ diff -urNp linux-3.1.3/net/socket.c linux-3.1.3/net/socket.c
20717
20718 set_fs(KERNEL_DS);
20719 if (level == SOL_SOCKET)
20720 -diff -urNp linux-3.1.3/net/sunrpc/sched.c linux-3.1.3/net/sunrpc/sched.c
20721 ---- linux-3.1.3/net/sunrpc/sched.c 2011-11-11 15:19:27.000000000 -0500
20722 -+++ linux-3.1.3/net/sunrpc/sched.c 2011-11-16 18:39:08.000000000 -0500
20723 +diff -urNp linux-3.1.4/net/sunrpc/sched.c linux-3.1.4/net/sunrpc/sched.c
20724 +--- linux-3.1.4/net/sunrpc/sched.c 2011-11-11 15:19:27.000000000 -0500
20725 ++++ linux-3.1.4/net/sunrpc/sched.c 2011-11-16 18:39:08.000000000 -0500
20726 @@ -238,9 +238,9 @@ static int rpc_wait_bit_killable(void *w
20727 #ifdef RPC_DEBUG
20728 static void rpc_task_set_debuginfo(struct rpc_task *task)
20729 @@ -74959,9 +75890,9 @@ diff -urNp linux-3.1.3/net/sunrpc/sched.c linux-3.1.3/net/sunrpc/sched.c
20730 }
20731 #else
20732 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
20733 -diff -urNp linux-3.1.3/net/sunrpc/svcsock.c linux-3.1.3/net/sunrpc/svcsock.c
20734 ---- linux-3.1.3/net/sunrpc/svcsock.c 2011-11-11 15:19:27.000000000 -0500
20735 -+++ linux-3.1.3/net/sunrpc/svcsock.c 2011-11-16 18:39:08.000000000 -0500
20736 +diff -urNp linux-3.1.4/net/sunrpc/svcsock.c linux-3.1.4/net/sunrpc/svcsock.c
20737 +--- linux-3.1.4/net/sunrpc/svcsock.c 2011-11-11 15:19:27.000000000 -0500
20738 ++++ linux-3.1.4/net/sunrpc/svcsock.c 2011-11-16 18:39:08.000000000 -0500
20739 @@ -394,7 +394,7 @@ static int svc_partial_recvfrom(struct s
20740 int buflen, unsigned int base)
20741 {
20742 @@ -74971,9 +75902,9 @@ diff -urNp linux-3.1.3/net/sunrpc/svcsock.c linux-3.1.3/net/sunrpc/svcsock.c
20743 unsigned int i;
20744 int ret;
20745
20746 -diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c
20747 ---- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-11 15:19:27.000000000 -0500
20748 -+++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-16 18:39:08.000000000 -0500
20749 +diff -urNp linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma.c linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma.c
20750 +--- linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-11 15:19:27.000000000 -0500
20751 ++++ linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-16 18:39:08.000000000 -0500
20752 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
20753 static unsigned int min_max_inline = 4096;
20754 static unsigned int max_max_inline = 65536;
20755 @@ -75081,9 +76012,9 @@ diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.1.3/net/sunrpc/xpr
20756 .mode = 0644,
20757 .proc_handler = read_reset_stat,
20758 },
20759 -diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
20760 ---- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-11 15:19:27.000000000 -0500
20761 -+++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-16 18:39:08.000000000 -0500
20762 +diff -urNp linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
20763 +--- linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-11 15:19:27.000000000 -0500
20764 ++++ linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-16 18:39:08.000000000 -0500
20765 @@ -499,7 +499,7 @@ next_sge:
20766 svc_rdma_put_context(ctxt, 0);
20767 goto out;
20768 @@ -75111,9 +76042,9 @@ diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.1.3/net/s
20769
20770 /* Build up the XDR from the receive buffers. */
20771 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
20772 -diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c
20773 ---- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-11 15:19:27.000000000 -0500
20774 -+++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-16 18:39:08.000000000 -0500
20775 +diff -urNp linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
20776 +--- linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-11 15:19:27.000000000 -0500
20777 ++++ linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-16 18:39:08.000000000 -0500
20778 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
20779 write_wr.wr.rdma.remote_addr = to;
20780
20781 @@ -75123,9 +76054,9 @@ diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.1.3/net/sun
20782 if (svc_rdma_send(xprt, &write_wr))
20783 goto err;
20784 return 0;
20785 -diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c
20786 ---- linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-11 15:19:27.000000000 -0500
20787 -+++ linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-16 18:39:08.000000000 -0500
20788 +diff -urNp linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
20789 +--- linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-11 15:19:27.000000000 -0500
20790 ++++ linux-3.1.4/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-16 18:39:08.000000000 -0500
20791 @@ -299,7 +299,7 @@ static void rq_cq_reap(struct svcxprt_rd
20792 return;
20793
20794 @@ -75171,9 +76102,9 @@ diff -urNp linux-3.1.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.1.3/net/
20795
20796 /* See if we can opportunistically reap SQ WR to make room */
20797 sq_cq_reap(xprt);
20798 -diff -urNp linux-3.1.3/net/sysctl_net.c linux-3.1.3/net/sysctl_net.c
20799 ---- linux-3.1.3/net/sysctl_net.c 2011-11-11 15:19:27.000000000 -0500
20800 -+++ linux-3.1.3/net/sysctl_net.c 2011-11-16 18:40:44.000000000 -0500
20801 +diff -urNp linux-3.1.4/net/sysctl_net.c linux-3.1.4/net/sysctl_net.c
20802 +--- linux-3.1.4/net/sysctl_net.c 2011-11-11 15:19:27.000000000 -0500
20803 ++++ linux-3.1.4/net/sysctl_net.c 2011-11-16 18:40:44.000000000 -0500
20804 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
20805 struct ctl_table *table)
20806 {
20807 @@ -75183,9 +76114,9 @@ diff -urNp linux-3.1.3/net/sysctl_net.c linux-3.1.3/net/sysctl_net.c
20808 int mode = (table->mode >> 6) & 7;
20809 return (mode << 6) | (mode << 3) | mode;
20810 }
20811 -diff -urNp linux-3.1.3/net/tipc/link.c linux-3.1.3/net/tipc/link.c
20812 ---- linux-3.1.3/net/tipc/link.c 2011-11-11 15:19:27.000000000 -0500
20813 -+++ linux-3.1.3/net/tipc/link.c 2011-11-16 18:39:08.000000000 -0500
20814 +diff -urNp linux-3.1.4/net/tipc/link.c linux-3.1.4/net/tipc/link.c
20815 +--- linux-3.1.4/net/tipc/link.c 2011-11-11 15:19:27.000000000 -0500
20816 ++++ linux-3.1.4/net/tipc/link.c 2011-11-16 18:39:08.000000000 -0500
20817 @@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc
20818 struct tipc_msg fragm_hdr;
20819 struct sk_buff *buf, *buf_chain, *prev;
20820 @@ -75213,9 +76144,9 @@ diff -urNp linux-3.1.3/net/tipc/link.c linux-3.1.3/net/tipc/link.c
20821 sect_crs += sz;
20822 sect_rest -= sz;
20823 fragm_crs += sz;
20824 -diff -urNp linux-3.1.3/net/tipc/msg.c linux-3.1.3/net/tipc/msg.c
20825 ---- linux-3.1.3/net/tipc/msg.c 2011-11-11 15:19:27.000000000 -0500
20826 -+++ linux-3.1.3/net/tipc/msg.c 2011-11-16 18:39:08.000000000 -0500
20827 +diff -urNp linux-3.1.4/net/tipc/msg.c linux-3.1.4/net/tipc/msg.c
20828 +--- linux-3.1.4/net/tipc/msg.c 2011-11-11 15:19:27.000000000 -0500
20829 ++++ linux-3.1.4/net/tipc/msg.c 2011-11-16 18:39:08.000000000 -0500
20830 @@ -99,7 +99,7 @@ int tipc_msg_build(struct tipc_msg *hdr,
20831 msg_sect[cnt].iov_len);
20832 else
20833 @@ -75225,9 +76156,9 @@ diff -urNp linux-3.1.3/net/tipc/msg.c linux-3.1.3/net/tipc/msg.c
20834 msg_sect[cnt].iov_len);
20835 pos += msg_sect[cnt].iov_len;
20836 }
20837 -diff -urNp linux-3.1.3/net/tipc/subscr.c linux-3.1.3/net/tipc/subscr.c
20838 ---- linux-3.1.3/net/tipc/subscr.c 2011-11-11 15:19:27.000000000 -0500
20839 -+++ linux-3.1.3/net/tipc/subscr.c 2011-11-16 18:39:08.000000000 -0500
20840 +diff -urNp linux-3.1.4/net/tipc/subscr.c linux-3.1.4/net/tipc/subscr.c
20841 +--- linux-3.1.4/net/tipc/subscr.c 2011-11-11 15:19:27.000000000 -0500
20842 ++++ linux-3.1.4/net/tipc/subscr.c 2011-11-16 18:39:08.000000000 -0500
20843 @@ -101,7 +101,7 @@ static void subscr_send_event(struct sub
20844 {
20845 struct iovec msg_sect;
20846 @@ -75237,9 +76168,9 @@ diff -urNp linux-3.1.3/net/tipc/subscr.c linux-3.1.3/net/tipc/subscr.c
20847 msg_sect.iov_len = sizeof(struct tipc_event);
20848
20849 sub->evt.event = htohl(event, sub->swap);
20850 -diff -urNp linux-3.1.3/net/unix/af_unix.c linux-3.1.3/net/unix/af_unix.c
20851 ---- linux-3.1.3/net/unix/af_unix.c 2011-11-11 15:19:27.000000000 -0500
20852 -+++ linux-3.1.3/net/unix/af_unix.c 2011-11-16 19:17:17.000000000 -0500
20853 +diff -urNp linux-3.1.4/net/unix/af_unix.c linux-3.1.4/net/unix/af_unix.c
20854 +--- linux-3.1.4/net/unix/af_unix.c 2011-11-11 15:19:27.000000000 -0500
20855 ++++ linux-3.1.4/net/unix/af_unix.c 2011-11-16 19:17:17.000000000 -0500
20856 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
20857 err = -ECONNREFUSED;
20858 if (!S_ISSOCK(inode->i_mode))
20859 @@ -75286,9 +76217,9 @@ diff -urNp linux-3.1.3/net/unix/af_unix.c linux-3.1.3/net/unix/af_unix.c
20860 mutex_unlock(&path.dentry->d_inode->i_mutex);
20861 dput(path.dentry);
20862 path.dentry = dentry;
20863 -diff -urNp linux-3.1.3/net/wireless/core.h linux-3.1.3/net/wireless/core.h
20864 ---- linux-3.1.3/net/wireless/core.h 2011-11-11 15:19:27.000000000 -0500
20865 -+++ linux-3.1.3/net/wireless/core.h 2011-11-16 18:39:08.000000000 -0500
20866 +diff -urNp linux-3.1.4/net/wireless/core.h linux-3.1.4/net/wireless/core.h
20867 +--- linux-3.1.4/net/wireless/core.h 2011-11-11 15:19:27.000000000 -0500
20868 ++++ linux-3.1.4/net/wireless/core.h 2011-11-16 18:39:08.000000000 -0500
20869 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
20870 struct mutex mtx;
20871
20872 @@ -75298,9 +76229,9 @@ diff -urNp linux-3.1.3/net/wireless/core.h linux-3.1.3/net/wireless/core.h
20873 struct rfkill *rfkill;
20874 struct work_struct rfkill_sync;
20875
20876 -diff -urNp linux-3.1.3/net/wireless/wext-core.c linux-3.1.3/net/wireless/wext-core.c
20877 ---- linux-3.1.3/net/wireless/wext-core.c 2011-11-11 15:19:27.000000000 -0500
20878 -+++ linux-3.1.3/net/wireless/wext-core.c 2011-11-16 18:39:08.000000000 -0500
20879 +diff -urNp linux-3.1.4/net/wireless/wext-core.c linux-3.1.4/net/wireless/wext-core.c
20880 +--- linux-3.1.4/net/wireless/wext-core.c 2011-11-11 15:19:27.000000000 -0500
20881 ++++ linux-3.1.4/net/wireless/wext-core.c 2011-11-16 18:39:08.000000000 -0500
20882 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
20883 */
20884
20885 @@ -75334,9 +76265,9 @@ diff -urNp linux-3.1.3/net/wireless/wext-core.c linux-3.1.3/net/wireless/wext-co
20886 err = handler(dev, info, (union iwreq_data *) iwp, extra);
20887
20888 iwp->length += essid_compat;
20889 -diff -urNp linux-3.1.3/net/xfrm/xfrm_policy.c linux-3.1.3/net/xfrm/xfrm_policy.c
20890 ---- linux-3.1.3/net/xfrm/xfrm_policy.c 2011-11-11 15:19:27.000000000 -0500
20891 -+++ linux-3.1.3/net/xfrm/xfrm_policy.c 2011-11-16 18:39:08.000000000 -0500
20892 +diff -urNp linux-3.1.4/net/xfrm/xfrm_policy.c linux-3.1.4/net/xfrm/xfrm_policy.c
20893 +--- linux-3.1.4/net/xfrm/xfrm_policy.c 2011-11-11 15:19:27.000000000 -0500
20894 ++++ linux-3.1.4/net/xfrm/xfrm_policy.c 2011-11-16 18:39:08.000000000 -0500
20895 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
20896 {
20897 policy->walk.dead = 1;
20898 @@ -75409,9 +76340,9 @@ diff -urNp linux-3.1.3/net/xfrm/xfrm_policy.c linux-3.1.3/net/xfrm/xfrm_policy.c
20899 }
20900 }
20901
20902 -diff -urNp linux-3.1.3/net/xfrm/xfrm_user.c linux-3.1.3/net/xfrm/xfrm_user.c
20903 ---- linux-3.1.3/net/xfrm/xfrm_user.c 2011-11-11 15:19:27.000000000 -0500
20904 -+++ linux-3.1.3/net/xfrm/xfrm_user.c 2011-11-16 18:40:44.000000000 -0500
20905 +diff -urNp linux-3.1.4/net/xfrm/xfrm_user.c linux-3.1.4/net/xfrm/xfrm_user.c
20906 +--- linux-3.1.4/net/xfrm/xfrm_user.c 2011-11-11 15:19:27.000000000 -0500
20907 ++++ linux-3.1.4/net/xfrm/xfrm_user.c 2011-11-16 18:40:44.000000000 -0500
20908 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
20909 struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
20910 int i;
20911 @@ -75430,9 +76361,9 @@ diff -urNp linux-3.1.3/net/xfrm/xfrm_user.c linux-3.1.3/net/xfrm/xfrm_user.c
20912 if (attrs[XFRMA_MIGRATE] == NULL)
20913 return -EINVAL;
20914
20915 -diff -urNp linux-3.1.3/scripts/basic/fixdep.c linux-3.1.3/scripts/basic/fixdep.c
20916 ---- linux-3.1.3/scripts/basic/fixdep.c 2011-11-11 15:19:27.000000000 -0500
20917 -+++ linux-3.1.3/scripts/basic/fixdep.c 2011-11-16 18:39:08.000000000 -0500
20918 +diff -urNp linux-3.1.4/scripts/basic/fixdep.c linux-3.1.4/scripts/basic/fixdep.c
20919 +--- linux-3.1.4/scripts/basic/fixdep.c 2011-11-11 15:19:27.000000000 -0500
20920 ++++ linux-3.1.4/scripts/basic/fixdep.c 2011-11-16 18:39:08.000000000 -0500
20921 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *
20922 /*
20923 * Lookup a value in the configuration string.
20924 @@ -75476,15 +76407,15 @@ diff -urNp linux-3.1.3/scripts/basic/fixdep.c linux-3.1.3/scripts/basic/fixdep.c
20925
20926 if (*p != INT_CONF) {
20927 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
20928 -diff -urNp linux-3.1.3/scripts/gcc-plugin.sh linux-3.1.3/scripts/gcc-plugin.sh
20929 ---- linux-3.1.3/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500
20930 -+++ linux-3.1.3/scripts/gcc-plugin.sh 2011-11-20 19:21:53.000000000 -0500
20931 +diff -urNp linux-3.1.4/scripts/gcc-plugin.sh linux-3.1.4/scripts/gcc-plugin.sh
20932 +--- linux-3.1.4/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500
20933 ++++ linux-3.1.4/scripts/gcc-plugin.sh 2011-11-20 19:21:53.000000000 -0500
20934 @@ -0,0 +1,2 @@
20935 +#!/bin/sh
20936 +echo -e "#include \"gcc-plugin.h\"\n#include \"tree.h\"\n#include \"tm.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
20937 -diff -urNp linux-3.1.3/scripts/Makefile.build linux-3.1.3/scripts/Makefile.build
20938 ---- linux-3.1.3/scripts/Makefile.build 2011-11-11 15:19:27.000000000 -0500
20939 -+++ linux-3.1.3/scripts/Makefile.build 2011-11-16 18:40:44.000000000 -0500
20940 +diff -urNp linux-3.1.4/scripts/Makefile.build linux-3.1.4/scripts/Makefile.build
20941 +--- linux-3.1.4/scripts/Makefile.build 2011-11-11 15:19:27.000000000 -0500
20942 ++++ linux-3.1.4/scripts/Makefile.build 2011-11-16 18:40:44.000000000 -0500
20943 @@ -109,7 +109,7 @@ endif
20944 endif
20945
20946 @@ -75494,9 +76425,9 @@ diff -urNp linux-3.1.3/scripts/Makefile.build linux-3.1.3/scripts/Makefile.build
20947 include scripts/Makefile.host
20948 endif
20949
20950 -diff -urNp linux-3.1.3/scripts/Makefile.clean linux-3.1.3/scripts/Makefile.clean
20951 ---- linux-3.1.3/scripts/Makefile.clean 2011-11-11 15:19:27.000000000 -0500
20952 -+++ linux-3.1.3/scripts/Makefile.clean 2011-11-16 18:39:08.000000000 -0500
20953 +diff -urNp linux-3.1.4/scripts/Makefile.clean linux-3.1.4/scripts/Makefile.clean
20954 +--- linux-3.1.4/scripts/Makefile.clean 2011-11-11 15:19:27.000000000 -0500
20955 ++++ linux-3.1.4/scripts/Makefile.clean 2011-11-16 18:39:08.000000000 -0500
20956 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd
20957 __clean-files := $(extra-y) $(always) \
20958 $(targets) $(clean-files) \
20959 @@ -75507,9 +76438,9 @@ diff -urNp linux-3.1.3/scripts/Makefile.clean linux-3.1.3/scripts/Makefile.clean
20960
20961 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
20962
20963 -diff -urNp linux-3.1.3/scripts/Makefile.host linux-3.1.3/scripts/Makefile.host
20964 ---- linux-3.1.3/scripts/Makefile.host 2011-11-11 15:19:27.000000000 -0500
20965 -+++ linux-3.1.3/scripts/Makefile.host 2011-11-16 18:39:08.000000000 -0500
20966 +diff -urNp linux-3.1.4/scripts/Makefile.host linux-3.1.4/scripts/Makefile.host
20967 +--- linux-3.1.4/scripts/Makefile.host 2011-11-11 15:19:27.000000000 -0500
20968 ++++ linux-3.1.4/scripts/Makefile.host 2011-11-16 18:39:08.000000000 -0500
20969 @@ -31,6 +31,7 @@
20970 # Note: Shared libraries consisting of C++ files are not supported
20971
20972 @@ -75526,9 +76457,9 @@ diff -urNp linux-3.1.3/scripts/Makefile.host linux-3.1.3/scripts/Makefile.host
20973 # Remove .so files from "xxx-objs"
20974 host-cobjs := $(filter-out %.so,$(host-cobjs))
20975
20976 -diff -urNp linux-3.1.3/scripts/mod/file2alias.c linux-3.1.3/scripts/mod/file2alias.c
20977 ---- linux-3.1.3/scripts/mod/file2alias.c 2011-11-11 15:19:27.000000000 -0500
20978 -+++ linux-3.1.3/scripts/mod/file2alias.c 2011-11-16 18:39:08.000000000 -0500
20979 +diff -urNp linux-3.1.4/scripts/mod/file2alias.c linux-3.1.4/scripts/mod/file2alias.c
20980 +--- linux-3.1.4/scripts/mod/file2alias.c 2011-11-11 15:19:27.000000000 -0500
20981 ++++ linux-3.1.4/scripts/mod/file2alias.c 2011-11-16 18:39:08.000000000 -0500
20982 @@ -72,7 +72,7 @@ static void device_id_check(const char *
20983 unsigned long size, unsigned long id_size,
20984 void *symval)
20985 @@ -75592,9 +76523,9 @@ diff -urNp linux-3.1.3/scripts/mod/file2alias.c linux-3.1.3/scripts/mod/file2ali
20986
20987 sprintf(alias, "dmi*");
20988
20989 -diff -urNp linux-3.1.3/scripts/mod/modpost.c linux-3.1.3/scripts/mod/modpost.c
20990 ---- linux-3.1.3/scripts/mod/modpost.c 2011-11-11 15:19:27.000000000 -0500
20991 -+++ linux-3.1.3/scripts/mod/modpost.c 2011-11-16 18:39:08.000000000 -0500
20992 +diff -urNp linux-3.1.4/scripts/mod/modpost.c linux-3.1.4/scripts/mod/modpost.c
20993 +--- linux-3.1.4/scripts/mod/modpost.c 2011-11-11 15:19:27.000000000 -0500
20994 ++++ linux-3.1.4/scripts/mod/modpost.c 2011-11-16 18:39:08.000000000 -0500
20995 @@ -919,6 +919,7 @@ enum mismatch {
20996 ANY_INIT_TO_ANY_EXIT,
20997 ANY_EXIT_TO_ANY_INIT,
20998 @@ -75671,9 +76602,9 @@ diff -urNp linux-3.1.3/scripts/mod/modpost.c linux-3.1.3/scripts/mod/modpost.c
20999 goto close_write;
21000
21001 tmp = NOFAIL(malloc(b->pos));
21002 -diff -urNp linux-3.1.3/scripts/mod/modpost.h linux-3.1.3/scripts/mod/modpost.h
21003 ---- linux-3.1.3/scripts/mod/modpost.h 2011-11-11 15:19:27.000000000 -0500
21004 -+++ linux-3.1.3/scripts/mod/modpost.h 2011-11-16 18:39:08.000000000 -0500
21005 +diff -urNp linux-3.1.4/scripts/mod/modpost.h linux-3.1.4/scripts/mod/modpost.h
21006 +--- linux-3.1.4/scripts/mod/modpost.h 2011-11-11 15:19:27.000000000 -0500
21007 ++++ linux-3.1.4/scripts/mod/modpost.h 2011-11-16 18:39:08.000000000 -0500
21008 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
21009
21010 struct buffer {
21011 @@ -75693,9 +76624,9 @@ diff -urNp linux-3.1.3/scripts/mod/modpost.h linux-3.1.3/scripts/mod/modpost.h
21012
21013 struct module {
21014 struct module *next;
21015 -diff -urNp linux-3.1.3/scripts/mod/sumversion.c linux-3.1.3/scripts/mod/sumversion.c
21016 ---- linux-3.1.3/scripts/mod/sumversion.c 2011-11-11 15:19:27.000000000 -0500
21017 -+++ linux-3.1.3/scripts/mod/sumversion.c 2011-11-16 18:39:08.000000000 -0500
21018 +diff -urNp linux-3.1.4/scripts/mod/sumversion.c linux-3.1.4/scripts/mod/sumversion.c
21019 +--- linux-3.1.4/scripts/mod/sumversion.c 2011-11-11 15:19:27.000000000 -0500
21020 ++++ linux-3.1.4/scripts/mod/sumversion.c 2011-11-16 18:39:08.000000000 -0500
21021 @@ -470,7 +470,7 @@ static void write_version(const char *fi
21022 goto out;
21023 }
21024 @@ -75705,9 +76636,9 @@ diff -urNp linux-3.1.3/scripts/mod/sumversion.c linux-3.1.3/scripts/mod/sumversi
21025 warn("writing sum in %s failed: %s\n",
21026 filename, strerror(errno));
21027 goto out;
21028 -diff -urNp linux-3.1.3/scripts/pnmtologo.c linux-3.1.3/scripts/pnmtologo.c
21029 ---- linux-3.1.3/scripts/pnmtologo.c 2011-11-11 15:19:27.000000000 -0500
21030 -+++ linux-3.1.3/scripts/pnmtologo.c 2011-11-16 18:39:08.000000000 -0500
21031 +diff -urNp linux-3.1.4/scripts/pnmtologo.c linux-3.1.4/scripts/pnmtologo.c
21032 +--- linux-3.1.4/scripts/pnmtologo.c 2011-11-11 15:19:27.000000000 -0500
21033 ++++ linux-3.1.4/scripts/pnmtologo.c 2011-11-16 18:39:08.000000000 -0500
21034 @@ -237,14 +237,14 @@ static void write_header(void)
21035 fprintf(out, " * Linux logo %s\n", logoname);
21036 fputs(" */\n\n", out);
21037 @@ -75734,9 +76665,9 @@ diff -urNp linux-3.1.3/scripts/pnmtologo.c linux-3.1.3/scripts/pnmtologo.c
21038 logoname);
21039 write_hex_cnt = 0;
21040 for (i = 0; i < logo_clutsize; i++) {
21041 -diff -urNp linux-3.1.3/security/apparmor/lsm.c linux-3.1.3/security/apparmor/lsm.c
21042 ---- linux-3.1.3/security/apparmor/lsm.c 2011-11-11 15:19:27.000000000 -0500
21043 -+++ linux-3.1.3/security/apparmor/lsm.c 2011-11-16 18:40:44.000000000 -0500
21044 +diff -urNp linux-3.1.4/security/apparmor/lsm.c linux-3.1.4/security/apparmor/lsm.c
21045 +--- linux-3.1.4/security/apparmor/lsm.c 2011-11-11 15:19:27.000000000 -0500
21046 ++++ linux-3.1.4/security/apparmor/lsm.c 2011-11-16 18:40:44.000000000 -0500
21047 @@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
21048 return error;
21049 }
21050 @@ -75746,9 +76677,9 @@ diff -urNp linux-3.1.3/security/apparmor/lsm.c linux-3.1.3/security/apparmor/lsm
21051 .name = "apparmor",
21052
21053 .ptrace_access_check = apparmor_ptrace_access_check,
21054 -diff -urNp linux-3.1.3/security/commoncap.c linux-3.1.3/security/commoncap.c
21055 ---- linux-3.1.3/security/commoncap.c 2011-11-11 15:19:27.000000000 -0500
21056 -+++ linux-3.1.3/security/commoncap.c 2011-11-16 18:40:44.000000000 -0500
21057 +diff -urNp linux-3.1.4/security/commoncap.c linux-3.1.4/security/commoncap.c
21058 +--- linux-3.1.4/security/commoncap.c 2011-11-11 15:19:27.000000000 -0500
21059 ++++ linux-3.1.4/security/commoncap.c 2011-11-16 18:40:44.000000000 -0500
21060 @@ -28,6 +28,7 @@
21061 #include <linux/prctl.h>
21062 #include <linux/securebits.h>
21063 @@ -75776,9 +76707,9 @@ diff -urNp linux-3.1.3/security/commoncap.c linux-3.1.3/security/commoncap.c
21064 if (cred->uid != 0) {
21065 if (bprm->cap_effective)
21066 return 1;
21067 -diff -urNp linux-3.1.3/security/integrity/ima/ima_api.c linux-3.1.3/security/integrity/ima/ima_api.c
21068 ---- linux-3.1.3/security/integrity/ima/ima_api.c 2011-11-11 15:19:27.000000000 -0500
21069 -+++ linux-3.1.3/security/integrity/ima/ima_api.c 2011-11-16 18:39:08.000000000 -0500
21070 +diff -urNp linux-3.1.4/security/integrity/ima/ima_api.c linux-3.1.4/security/integrity/ima/ima_api.c
21071 +--- linux-3.1.4/security/integrity/ima/ima_api.c 2011-11-11 15:19:27.000000000 -0500
21072 ++++ linux-3.1.4/security/integrity/ima/ima_api.c 2011-11-16 18:39:08.000000000 -0500
21073 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
21074 int result;
21075
21076 @@ -75788,9 +76719,9 @@ diff -urNp linux-3.1.3/security/integrity/ima/ima_api.c linux-3.1.3/security/int
21077
21078 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
21079 if (!entry) {
21080 -diff -urNp linux-3.1.3/security/integrity/ima/ima_fs.c linux-3.1.3/security/integrity/ima/ima_fs.c
21081 ---- linux-3.1.3/security/integrity/ima/ima_fs.c 2011-11-11 15:19:27.000000000 -0500
21082 -+++ linux-3.1.3/security/integrity/ima/ima_fs.c 2011-11-16 18:39:08.000000000 -0500
21083 +diff -urNp linux-3.1.4/security/integrity/ima/ima_fs.c linux-3.1.4/security/integrity/ima/ima_fs.c
21084 +--- linux-3.1.4/security/integrity/ima/ima_fs.c 2011-11-11 15:19:27.000000000 -0500
21085 ++++ linux-3.1.4/security/integrity/ima/ima_fs.c 2011-11-16 18:39:08.000000000 -0500
21086 @@ -28,12 +28,12 @@
21087 static int valid_policy = 1;
21088 #define TMPBUFLEN 12
21089 @@ -75806,9 +76737,9 @@ diff -urNp linux-3.1.3/security/integrity/ima/ima_fs.c linux-3.1.3/security/inte
21090 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
21091 }
21092
21093 -diff -urNp linux-3.1.3/security/integrity/ima/ima.h linux-3.1.3/security/integrity/ima/ima.h
21094 ---- linux-3.1.3/security/integrity/ima/ima.h 2011-11-11 15:19:27.000000000 -0500
21095 -+++ linux-3.1.3/security/integrity/ima/ima.h 2011-11-16 18:39:08.000000000 -0500
21096 +diff -urNp linux-3.1.4/security/integrity/ima/ima.h linux-3.1.4/security/integrity/ima/ima.h
21097 +--- linux-3.1.4/security/integrity/ima/ima.h 2011-11-11 15:19:27.000000000 -0500
21098 ++++ linux-3.1.4/security/integrity/ima/ima.h 2011-11-16 18:39:08.000000000 -0500
21099 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
21100 extern spinlock_t ima_queue_lock;
21101
21102 @@ -75820,9 +76751,9 @@ diff -urNp linux-3.1.3/security/integrity/ima/ima.h linux-3.1.3/security/integri
21103 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
21104 };
21105 extern struct ima_h_table ima_htable;
21106 -diff -urNp linux-3.1.3/security/integrity/ima/ima_queue.c linux-3.1.3/security/integrity/ima/ima_queue.c
21107 ---- linux-3.1.3/security/integrity/ima/ima_queue.c 2011-11-11 15:19:27.000000000 -0500
21108 -+++ linux-3.1.3/security/integrity/ima/ima_queue.c 2011-11-16 18:39:08.000000000 -0500
21109 +diff -urNp linux-3.1.4/security/integrity/ima/ima_queue.c linux-3.1.4/security/integrity/ima/ima_queue.c
21110 +--- linux-3.1.4/security/integrity/ima/ima_queue.c 2011-11-11 15:19:27.000000000 -0500
21111 ++++ linux-3.1.4/security/integrity/ima/ima_queue.c 2011-11-16 18:39:08.000000000 -0500
21112 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
21113 INIT_LIST_HEAD(&qe->later);
21114 list_add_tail_rcu(&qe->later, &ima_measurements);
21115 @@ -75832,10 +76763,10 @@ diff -urNp linux-3.1.3/security/integrity/ima/ima_queue.c linux-3.1.3/security/i
21116 key = ima_hash_key(entry->digest);
21117 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
21118 return 0;
21119 -diff -urNp linux-3.1.3/security/Kconfig linux-3.1.3/security/Kconfig
21120 ---- linux-3.1.3/security/Kconfig 2011-11-11 15:19:27.000000000 -0500
21121 -+++ linux-3.1.3/security/Kconfig 2011-11-16 18:40:44.000000000 -0500
21122 -@@ -4,6 +4,558 @@
21123 +diff -urNp linux-3.1.4/security/Kconfig linux-3.1.4/security/Kconfig
21124 +--- linux-3.1.4/security/Kconfig 2011-11-11 15:19:27.000000000 -0500
21125 ++++ linux-3.1.4/security/Kconfig 2011-12-02 17:38:47.000000000 -0500
21126 +@@ -4,6 +4,586 @@
21127
21128 menu "Security options"
21129
21130 @@ -76168,6 +77099,34 @@ diff -urNp linux-3.1.3/security/Kconfig linux-3.1.3/security/Kconfig
21131 + Note that on x86_64 kernels there is a known regression when
21132 + this feature and KVM/VMX are both enabled in the host kernel.
21133 +
21134 ++choice
21135 ++ prompt "Return Address Instrumentation Method"
21136 ++ default PAX_KERNEXEC_PLUGIN_METHOD_BTS
21137 ++ depends on PAX_KERNEXEC_PLUGIN
21138 ++ help
21139 ++ Select the method used to instrument function pointer dereferences.
21140 ++ Note that binary modules cannot be instrumented by this approach.
21141 ++
21142 ++ config PAX_KERNEXEC_PLUGIN_METHOD_BTS
21143 ++ bool "bts"
21144 ++ help
21145 ++ This method is compatible with binary only modules but has
21146 ++ a higher runtime overhead.
21147 ++
21148 ++ config PAX_KERNEXEC_PLUGIN_METHOD_OR
21149 ++ bool "or"
21150 ++ depends on !PARAVIRT
21151 ++ help
21152 ++ This method is incompatible with binary only modules but has
21153 ++ a lower runtime overhead.
21154 ++endchoice
21155 ++
21156 ++config PAX_KERNEXEC_PLUGIN_METHOD
21157 ++ string
21158 ++ default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
21159 ++ default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
21160 ++ default ""
21161 ++
21162 +config PAX_KERNEXEC_MODULE_TEXT
21163 + int "Minimum amount of memory reserved for module code"
21164 + default "4"
21165 @@ -76394,7 +77353,7 @@ diff -urNp linux-3.1.3/security/Kconfig linux-3.1.3/security/Kconfig
21166 config KEYS
21167 bool "Enable access key retention support"
21168 help
21169 -@@ -167,7 +719,7 @@ config INTEL_TXT
21170 +@@ -167,7 +747,7 @@ config INTEL_TXT
21171 config LSM_MMAP_MIN_ADDR
21172 int "Low address space for LSM to protect from user allocation"
21173 depends on SECURITY && SECURITY_SELINUX
21174 @@ -76403,9 +77362,9 @@ diff -urNp linux-3.1.3/security/Kconfig linux-3.1.3/security/Kconfig
21175 default 65536
21176 help
21177 This is the portion of low virtual memory which should be protected
21178 -diff -urNp linux-3.1.3/security/keys/compat.c linux-3.1.3/security/keys/compat.c
21179 ---- linux-3.1.3/security/keys/compat.c 2011-11-11 15:19:27.000000000 -0500
21180 -+++ linux-3.1.3/security/keys/compat.c 2011-11-16 18:39:08.000000000 -0500
21181 +diff -urNp linux-3.1.4/security/keys/compat.c linux-3.1.4/security/keys/compat.c
21182 +--- linux-3.1.4/security/keys/compat.c 2011-11-11 15:19:27.000000000 -0500
21183 ++++ linux-3.1.4/security/keys/compat.c 2011-11-16 18:39:08.000000000 -0500
21184 @@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
21185 if (ret == 0)
21186 goto no_payload_free;
21187 @@ -76415,9 +77374,9 @@ diff -urNp linux-3.1.3/security/keys/compat.c linux-3.1.3/security/keys/compat.c
21188
21189 if (iov != iovstack)
21190 kfree(iov);
21191 -diff -urNp linux-3.1.3/security/keys/keyctl.c linux-3.1.3/security/keys/keyctl.c
21192 ---- linux-3.1.3/security/keys/keyctl.c 2011-11-11 15:19:27.000000000 -0500
21193 -+++ linux-3.1.3/security/keys/keyctl.c 2011-11-16 18:39:08.000000000 -0500
21194 +diff -urNp linux-3.1.4/security/keys/keyctl.c linux-3.1.4/security/keys/keyctl.c
21195 +--- linux-3.1.4/security/keys/keyctl.c 2011-11-11 15:19:27.000000000 -0500
21196 ++++ linux-3.1.4/security/keys/keyctl.c 2011-11-16 18:39:08.000000000 -0500
21197 @@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str
21198 /*
21199 * Copy the iovec data from userspace
21200 @@ -76454,9 +77413,9 @@ diff -urNp linux-3.1.3/security/keys/keyctl.c linux-3.1.3/security/keys/keyctl.c
21201
21202 if (iov != iovstack)
21203 kfree(iov);
21204 -diff -urNp linux-3.1.3/security/keys/keyring.c linux-3.1.3/security/keys/keyring.c
21205 ---- linux-3.1.3/security/keys/keyring.c 2011-11-11 15:19:27.000000000 -0500
21206 -+++ linux-3.1.3/security/keys/keyring.c 2011-11-16 18:39:08.000000000 -0500
21207 +diff -urNp linux-3.1.4/security/keys/keyring.c linux-3.1.4/security/keys/keyring.c
21208 +--- linux-3.1.4/security/keys/keyring.c 2011-11-11 15:19:27.000000000 -0500
21209 ++++ linux-3.1.4/security/keys/keyring.c 2011-11-16 18:39:08.000000000 -0500
21210 @@ -214,15 +214,15 @@ static long keyring_read(const struct ke
21211 ret = -EFAULT;
21212
21213 @@ -76476,9 +77435,9 @@ diff -urNp linux-3.1.3/security/keys/keyring.c linux-3.1.3/security/keys/keyring
21214 goto error;
21215
21216 buflen -= tmp;
21217 -diff -urNp linux-3.1.3/security/min_addr.c linux-3.1.3/security/min_addr.c
21218 ---- linux-3.1.3/security/min_addr.c 2011-11-11 15:19:27.000000000 -0500
21219 -+++ linux-3.1.3/security/min_addr.c 2011-11-16 18:40:44.000000000 -0500
21220 +diff -urNp linux-3.1.4/security/min_addr.c linux-3.1.4/security/min_addr.c
21221 +--- linux-3.1.4/security/min_addr.c 2011-11-11 15:19:27.000000000 -0500
21222 ++++ linux-3.1.4/security/min_addr.c 2011-11-16 18:40:44.000000000 -0500
21223 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
21224 */
21225 static void update_mmap_min_addr(void)
21226 @@ -76495,9 +77454,9 @@ diff -urNp linux-3.1.3/security/min_addr.c linux-3.1.3/security/min_addr.c
21227 }
21228
21229 /*
21230 -diff -urNp linux-3.1.3/security/security.c linux-3.1.3/security/security.c
21231 ---- linux-3.1.3/security/security.c 2011-11-11 15:19:27.000000000 -0500
21232 -+++ linux-3.1.3/security/security.c 2011-11-16 18:40:44.000000000 -0500
21233 +diff -urNp linux-3.1.4/security/security.c linux-3.1.4/security/security.c
21234 +--- linux-3.1.4/security/security.c 2011-11-11 15:19:27.000000000 -0500
21235 ++++ linux-3.1.4/security/security.c 2011-11-16 18:40:44.000000000 -0500
21236 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
21237 /* things that live in capability.c */
21238 extern void __init security_fixup_ops(struct security_operations *ops);
21239 @@ -76519,9 +77478,9 @@ diff -urNp linux-3.1.3/security/security.c linux-3.1.3/security/security.c
21240 }
21241
21242 /* Save user chosen LSM */
21243 -diff -urNp linux-3.1.3/security/selinux/hooks.c linux-3.1.3/security/selinux/hooks.c
21244 ---- linux-3.1.3/security/selinux/hooks.c 2011-11-11 15:19:27.000000000 -0500
21245 -+++ linux-3.1.3/security/selinux/hooks.c 2011-11-16 18:40:44.000000000 -0500
21246 +diff -urNp linux-3.1.4/security/selinux/hooks.c linux-3.1.4/security/selinux/hooks.c
21247 +--- linux-3.1.4/security/selinux/hooks.c 2011-11-11 15:19:27.000000000 -0500
21248 ++++ linux-3.1.4/security/selinux/hooks.c 2011-11-16 18:40:44.000000000 -0500
21249 @@ -93,7 +93,6 @@
21250 #define NUM_SEL_MNT_OPTS 5
21251
21252 @@ -76539,9 +77498,9 @@ diff -urNp linux-3.1.3/security/selinux/hooks.c linux-3.1.3/security/selinux/hoo
21253 .name = "selinux",
21254
21255 .ptrace_access_check = selinux_ptrace_access_check,
21256 -diff -urNp linux-3.1.3/security/selinux/include/xfrm.h linux-3.1.3/security/selinux/include/xfrm.h
21257 ---- linux-3.1.3/security/selinux/include/xfrm.h 2011-11-11 15:19:27.000000000 -0500
21258 -+++ linux-3.1.3/security/selinux/include/xfrm.h 2011-11-16 18:39:08.000000000 -0500
21259 +diff -urNp linux-3.1.4/security/selinux/include/xfrm.h linux-3.1.4/security/selinux/include/xfrm.h
21260 +--- linux-3.1.4/security/selinux/include/xfrm.h 2011-11-11 15:19:27.000000000 -0500
21261 ++++ linux-3.1.4/security/selinux/include/xfrm.h 2011-11-16 18:39:08.000000000 -0500
21262 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
21263
21264 static inline void selinux_xfrm_notify_policyload(void)
21265 @@ -76551,9 +77510,9 @@ diff -urNp linux-3.1.3/security/selinux/include/xfrm.h linux-3.1.3/security/seli
21266 }
21267 #else
21268 static inline int selinux_xfrm_enabled(void)
21269 -diff -urNp linux-3.1.3/security/selinux/ss/services.c linux-3.1.3/security/selinux/ss/services.c
21270 ---- linux-3.1.3/security/selinux/ss/services.c 2011-11-11 15:19:27.000000000 -0500
21271 -+++ linux-3.1.3/security/selinux/ss/services.c 2011-11-16 18:40:44.000000000 -0500
21272 +diff -urNp linux-3.1.4/security/selinux/ss/services.c linux-3.1.4/security/selinux/ss/services.c
21273 +--- linux-3.1.4/security/selinux/ss/services.c 2011-11-11 15:19:27.000000000 -0500
21274 ++++ linux-3.1.4/security/selinux/ss/services.c 2011-11-16 18:40:44.000000000 -0500
21275 @@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
21276 int rc = 0;
21277 struct policy_file file = { data, len }, *fp = &file;
21278 @@ -76563,9 +77522,9 @@ diff -urNp linux-3.1.3/security/selinux/ss/services.c linux-3.1.3/security/selin
21279 if (!ss_initialized) {
21280 avtab_cache_init();
21281 rc = policydb_read(&policydb, fp);
21282 -diff -urNp linux-3.1.3/security/smack/smack_lsm.c linux-3.1.3/security/smack/smack_lsm.c
21283 ---- linux-3.1.3/security/smack/smack_lsm.c 2011-11-11 15:19:27.000000000 -0500
21284 -+++ linux-3.1.3/security/smack/smack_lsm.c 2011-11-16 18:39:08.000000000 -0500
21285 +diff -urNp linux-3.1.4/security/smack/smack_lsm.c linux-3.1.4/security/smack/smack_lsm.c
21286 +--- linux-3.1.4/security/smack/smack_lsm.c 2011-11-11 15:19:27.000000000 -0500
21287 ++++ linux-3.1.4/security/smack/smack_lsm.c 2011-11-16 18:39:08.000000000 -0500
21288 @@ -3393,7 +3393,7 @@ static int smack_inode_getsecctx(struct
21289 return 0;
21290 }
21291 @@ -76575,9 +77534,9 @@ diff -urNp linux-3.1.3/security/smack/smack_lsm.c linux-3.1.3/security/smack/sma
21292 .name = "smack",
21293
21294 .ptrace_access_check = smack_ptrace_access_check,
21295 -diff -urNp linux-3.1.3/security/tomoyo/tomoyo.c linux-3.1.3/security/tomoyo/tomoyo.c
21296 ---- linux-3.1.3/security/tomoyo/tomoyo.c 2011-11-11 15:19:27.000000000 -0500
21297 -+++ linux-3.1.3/security/tomoyo/tomoyo.c 2011-11-16 18:39:08.000000000 -0500
21298 +diff -urNp linux-3.1.4/security/tomoyo/tomoyo.c linux-3.1.4/security/tomoyo/tomoyo.c
21299 +--- linux-3.1.4/security/tomoyo/tomoyo.c 2011-11-11 15:19:27.000000000 -0500
21300 ++++ linux-3.1.4/security/tomoyo/tomoyo.c 2011-11-16 18:39:08.000000000 -0500
21301 @@ -446,7 +446,7 @@ static int tomoyo_sb_pivotroot(struct pa
21302 * tomoyo_security_ops is a "struct security_operations" which is used for
21303 * registering TOMOYO.
21304 @@ -76587,9 +77546,9 @@ diff -urNp linux-3.1.3/security/tomoyo/tomoyo.c linux-3.1.3/security/tomoyo/tomo
21305 .name = "tomoyo",
21306 .cred_alloc_blank = tomoyo_cred_alloc_blank,
21307 .cred_prepare = tomoyo_cred_prepare,
21308 -diff -urNp linux-3.1.3/sound/aoa/codecs/onyx.c linux-3.1.3/sound/aoa/codecs/onyx.c
21309 ---- linux-3.1.3/sound/aoa/codecs/onyx.c 2011-11-11 15:19:27.000000000 -0500
21310 -+++ linux-3.1.3/sound/aoa/codecs/onyx.c 2011-11-16 18:39:08.000000000 -0500
21311 +diff -urNp linux-3.1.4/sound/aoa/codecs/onyx.c linux-3.1.4/sound/aoa/codecs/onyx.c
21312 +--- linux-3.1.4/sound/aoa/codecs/onyx.c 2011-11-11 15:19:27.000000000 -0500
21313 ++++ linux-3.1.4/sound/aoa/codecs/onyx.c 2011-11-16 18:39:08.000000000 -0500
21314 @@ -54,7 +54,7 @@ struct onyx {
21315 spdif_locked:1,
21316 analog_locked:1,
21317 @@ -76618,9 +77577,9 @@ diff -urNp linux-3.1.3/sound/aoa/codecs/onyx.c linux-3.1.3/sound/aoa/codecs/onyx
21318 onyx->spdif_locked = onyx->analog_locked = 0;
21319 mutex_unlock(&onyx->mutex);
21320
21321 -diff -urNp linux-3.1.3/sound/aoa/codecs/onyx.h linux-3.1.3/sound/aoa/codecs/onyx.h
21322 ---- linux-3.1.3/sound/aoa/codecs/onyx.h 2011-11-11 15:19:27.000000000 -0500
21323 -+++ linux-3.1.3/sound/aoa/codecs/onyx.h 2011-11-16 18:39:08.000000000 -0500
21324 +diff -urNp linux-3.1.4/sound/aoa/codecs/onyx.h linux-3.1.4/sound/aoa/codecs/onyx.h
21325 +--- linux-3.1.4/sound/aoa/codecs/onyx.h 2011-11-11 15:19:27.000000000 -0500
21326 ++++ linux-3.1.4/sound/aoa/codecs/onyx.h 2011-11-16 18:39:08.000000000 -0500
21327 @@ -11,6 +11,7 @@
21328 #include <linux/i2c.h>
21329 #include <asm/pmac_low_i2c.h>
21330 @@ -76629,9 +77588,9 @@ diff -urNp linux-3.1.3/sound/aoa/codecs/onyx.h linux-3.1.3/sound/aoa/codecs/onyx
21331
21332 /* PCM3052 register definitions */
21333
21334 -diff -urNp linux-3.1.3/sound/core/oss/pcm_oss.c linux-3.1.3/sound/core/oss/pcm_oss.c
21335 ---- linux-3.1.3/sound/core/oss/pcm_oss.c 2011-11-11 15:19:27.000000000 -0500
21336 -+++ linux-3.1.3/sound/core/oss/pcm_oss.c 2011-11-16 18:39:08.000000000 -0500
21337 +diff -urNp linux-3.1.4/sound/core/oss/pcm_oss.c linux-3.1.4/sound/core/oss/pcm_oss.c
21338 +--- linux-3.1.4/sound/core/oss/pcm_oss.c 2011-11-11 15:19:27.000000000 -0500
21339 ++++ linux-3.1.4/sound/core/oss/pcm_oss.c 2011-11-16 18:39:08.000000000 -0500
21340 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str
21341 if (in_kernel) {
21342 mm_segment_t fs;
21343 @@ -76703,9 +77662,9 @@ diff -urNp linux-3.1.3/sound/core/oss/pcm_oss.c linux-3.1.3/sound/core/oss/pcm_o
21344 snd_leave_user(fs);
21345 }
21346 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
21347 -diff -urNp linux-3.1.3/sound/core/pcm_compat.c linux-3.1.3/sound/core/pcm_compat.c
21348 ---- linux-3.1.3/sound/core/pcm_compat.c 2011-11-11 15:19:27.000000000 -0500
21349 -+++ linux-3.1.3/sound/core/pcm_compat.c 2011-11-16 18:39:08.000000000 -0500
21350 +diff -urNp linux-3.1.4/sound/core/pcm_compat.c linux-3.1.4/sound/core/pcm_compat.c
21351 +--- linux-3.1.4/sound/core/pcm_compat.c 2011-11-11 15:19:27.000000000 -0500
21352 ++++ linux-3.1.4/sound/core/pcm_compat.c 2011-11-16 18:39:08.000000000 -0500
21353 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st
21354 int err;
21355
21356 @@ -76715,9 +77674,9 @@ diff -urNp linux-3.1.3/sound/core/pcm_compat.c linux-3.1.3/sound/core/pcm_compat
21357 snd_leave_user(fs);
21358 if (err < 0)
21359 return err;
21360 -diff -urNp linux-3.1.3/sound/core/pcm_native.c linux-3.1.3/sound/core/pcm_native.c
21361 ---- linux-3.1.3/sound/core/pcm_native.c 2011-11-11 15:19:27.000000000 -0500
21362 -+++ linux-3.1.3/sound/core/pcm_native.c 2011-11-16 18:39:08.000000000 -0500
21363 +diff -urNp linux-3.1.4/sound/core/pcm_native.c linux-3.1.4/sound/core/pcm_native.c
21364 +--- linux-3.1.4/sound/core/pcm_native.c 2011-11-11 15:19:27.000000000 -0500
21365 ++++ linux-3.1.4/sound/core/pcm_native.c 2011-11-16 18:39:08.000000000 -0500
21366 @@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_
21367 switch (substream->stream) {
21368 case SNDRV_PCM_STREAM_PLAYBACK:
21369 @@ -76732,9 +77691,9 @@ diff -urNp linux-3.1.3/sound/core/pcm_native.c linux-3.1.3/sound/core/pcm_native
21370 break;
21371 default:
21372 result = -EINVAL;
21373 -diff -urNp linux-3.1.3/sound/core/seq/seq_device.c linux-3.1.3/sound/core/seq/seq_device.c
21374 ---- linux-3.1.3/sound/core/seq/seq_device.c 2011-11-11 15:19:27.000000000 -0500
21375 -+++ linux-3.1.3/sound/core/seq/seq_device.c 2011-11-16 18:39:08.000000000 -0500
21376 +diff -urNp linux-3.1.4/sound/core/seq/seq_device.c linux-3.1.4/sound/core/seq/seq_device.c
21377 +--- linux-3.1.4/sound/core/seq/seq_device.c 2011-11-11 15:19:27.000000000 -0500
21378 ++++ linux-3.1.4/sound/core/seq/seq_device.c 2011-11-16 18:39:08.000000000 -0500
21379 @@ -63,7 +63,7 @@ struct ops_list {
21380 int argsize; /* argument size */
21381
21382 @@ -76771,9 +77730,9 @@ diff -urNp linux-3.1.3/sound/core/seq/seq_device.c linux-3.1.3/sound/core/seq/se
21383 dev->status = SNDRV_SEQ_DEVICE_FREE;
21384 dev->driver_data = NULL;
21385 ops->num_init_devices--;
21386 -diff -urNp linux-3.1.3/sound/drivers/mts64.c linux-3.1.3/sound/drivers/mts64.c
21387 ---- linux-3.1.3/sound/drivers/mts64.c 2011-11-11 15:19:27.000000000 -0500
21388 -+++ linux-3.1.3/sound/drivers/mts64.c 2011-11-16 18:39:08.000000000 -0500
21389 +diff -urNp linux-3.1.4/sound/drivers/mts64.c linux-3.1.4/sound/drivers/mts64.c
21390 +--- linux-3.1.4/sound/drivers/mts64.c 2011-11-11 15:19:27.000000000 -0500
21391 ++++ linux-3.1.4/sound/drivers/mts64.c 2011-11-16 18:39:08.000000000 -0500
21392 @@ -28,6 +28,7 @@
21393 #include <sound/initval.h>
21394 #include <sound/rawmidi.h>
21395 @@ -76830,9 +77789,9 @@ diff -urNp linux-3.1.3/sound/drivers/mts64.c linux-3.1.3/sound/drivers/mts64.c
21396
21397 return 0;
21398 }
21399 -diff -urNp linux-3.1.3/sound/drivers/opl4/opl4_lib.c linux-3.1.3/sound/drivers/opl4/opl4_lib.c
21400 ---- linux-3.1.3/sound/drivers/opl4/opl4_lib.c 2011-11-11 15:19:27.000000000 -0500
21401 -+++ linux-3.1.3/sound/drivers/opl4/opl4_lib.c 2011-11-16 18:39:08.000000000 -0500
21402 +diff -urNp linux-3.1.4/sound/drivers/opl4/opl4_lib.c linux-3.1.4/sound/drivers/opl4/opl4_lib.c
21403 +--- linux-3.1.4/sound/drivers/opl4/opl4_lib.c 2011-11-11 15:19:27.000000000 -0500
21404 ++++ linux-3.1.4/sound/drivers/opl4/opl4_lib.c 2011-11-16 18:39:08.000000000 -0500
21405 @@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
21406 MODULE_DESCRIPTION("OPL4 driver");
21407 MODULE_LICENSE("GPL");
21408 @@ -76842,9 +77801,9 @@ diff -urNp linux-3.1.3/sound/drivers/opl4/opl4_lib.c linux-3.1.3/sound/drivers/o
21409 {
21410 int timeout = 10;
21411 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
21412 -diff -urNp linux-3.1.3/sound/drivers/portman2x4.c linux-3.1.3/sound/drivers/portman2x4.c
21413 ---- linux-3.1.3/sound/drivers/portman2x4.c 2011-11-11 15:19:27.000000000 -0500
21414 -+++ linux-3.1.3/sound/drivers/portman2x4.c 2011-11-16 18:39:08.000000000 -0500
21415 +diff -urNp linux-3.1.4/sound/drivers/portman2x4.c linux-3.1.4/sound/drivers/portman2x4.c
21416 +--- linux-3.1.4/sound/drivers/portman2x4.c 2011-11-11 15:19:27.000000000 -0500
21417 ++++ linux-3.1.4/sound/drivers/portman2x4.c 2011-11-16 18:39:08.000000000 -0500
21418 @@ -47,6 +47,7 @@
21419 #include <sound/initval.h>
21420 #include <sound/rawmidi.h>
21421 @@ -76862,9 +77821,9 @@ diff -urNp linux-3.1.3/sound/drivers/portman2x4.c linux-3.1.3/sound/drivers/port
21422 int mode[PORTMAN_NUM_INPUT_PORTS];
21423 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
21424 };
21425 -diff -urNp linux-3.1.3/sound/firewire/amdtp.c linux-3.1.3/sound/firewire/amdtp.c
21426 ---- linux-3.1.3/sound/firewire/amdtp.c 2011-11-11 15:19:27.000000000 -0500
21427 -+++ linux-3.1.3/sound/firewire/amdtp.c 2011-11-16 18:39:08.000000000 -0500
21428 +diff -urNp linux-3.1.4/sound/firewire/amdtp.c linux-3.1.4/sound/firewire/amdtp.c
21429 +--- linux-3.1.4/sound/firewire/amdtp.c 2011-11-11 15:19:27.000000000 -0500
21430 ++++ linux-3.1.4/sound/firewire/amdtp.c 2011-11-16 18:39:08.000000000 -0500
21431 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
21432 ptr = s->pcm_buffer_pointer + data_blocks;
21433 if (ptr >= pcm->runtime->buffer_size)
21434 @@ -76883,9 +77842,9 @@ diff -urNp linux-3.1.3/sound/firewire/amdtp.c linux-3.1.3/sound/firewire/amdtp.c
21435 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
21436 }
21437 EXPORT_SYMBOL(amdtp_out_stream_update);
21438 -diff -urNp linux-3.1.3/sound/firewire/amdtp.h linux-3.1.3/sound/firewire/amdtp.h
21439 ---- linux-3.1.3/sound/firewire/amdtp.h 2011-11-11 15:19:27.000000000 -0500
21440 -+++ linux-3.1.3/sound/firewire/amdtp.h 2011-11-16 18:39:08.000000000 -0500
21441 +diff -urNp linux-3.1.4/sound/firewire/amdtp.h linux-3.1.4/sound/firewire/amdtp.h
21442 +--- linux-3.1.4/sound/firewire/amdtp.h 2011-11-11 15:19:27.000000000 -0500
21443 ++++ linux-3.1.4/sound/firewire/amdtp.h 2011-11-16 18:39:08.000000000 -0500
21444 @@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
21445 static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
21446 struct snd_pcm_substream *pcm)
21447 @@ -76895,9 +77854,9 @@ diff -urNp linux-3.1.3/sound/firewire/amdtp.h linux-3.1.3/sound/firewire/amdtp.h
21448 }
21449
21450 /**
21451 -diff -urNp linux-3.1.3/sound/firewire/isight.c linux-3.1.3/sound/firewire/isight.c
21452 ---- linux-3.1.3/sound/firewire/isight.c 2011-11-11 15:19:27.000000000 -0500
21453 -+++ linux-3.1.3/sound/firewire/isight.c 2011-11-16 18:39:08.000000000 -0500
21454 +diff -urNp linux-3.1.4/sound/firewire/isight.c linux-3.1.4/sound/firewire/isight.c
21455 +--- linux-3.1.4/sound/firewire/isight.c 2011-11-11 15:19:27.000000000 -0500
21456 ++++ linux-3.1.4/sound/firewire/isight.c 2011-11-16 18:39:08.000000000 -0500
21457 @@ -97,7 +97,7 @@ static void isight_update_pointers(struc
21458 ptr += count;
21459 if (ptr >= runtime->buffer_size)
21460 @@ -76938,9 +77897,9 @@ diff -urNp linux-3.1.3/sound/firewire/isight.c linux-3.1.3/sound/firewire/isight
21461 break;
21462 default:
21463 return -EINVAL;
21464 -diff -urNp linux-3.1.3/sound/isa/cmi8330.c linux-3.1.3/sound/isa/cmi8330.c
21465 ---- linux-3.1.3/sound/isa/cmi8330.c 2011-11-11 15:19:27.000000000 -0500
21466 -+++ linux-3.1.3/sound/isa/cmi8330.c 2011-11-16 18:39:08.000000000 -0500
21467 +diff -urNp linux-3.1.4/sound/isa/cmi8330.c linux-3.1.4/sound/isa/cmi8330.c
21468 +--- linux-3.1.4/sound/isa/cmi8330.c 2011-11-11 15:19:27.000000000 -0500
21469 ++++ linux-3.1.4/sound/isa/cmi8330.c 2011-11-16 18:39:08.000000000 -0500
21470 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
21471
21472 struct snd_pcm *pcm;
21473 @@ -76950,9 +77909,9 @@ diff -urNp linux-3.1.3/sound/isa/cmi8330.c linux-3.1.3/sound/isa/cmi8330.c
21474 snd_pcm_open_callback_t open;
21475 void *private_data; /* sb or wss */
21476 } streams[2];
21477 -diff -urNp linux-3.1.3/sound/oss/sb_audio.c linux-3.1.3/sound/oss/sb_audio.c
21478 ---- linux-3.1.3/sound/oss/sb_audio.c 2011-11-11 15:19:27.000000000 -0500
21479 -+++ linux-3.1.3/sound/oss/sb_audio.c 2011-11-16 18:39:08.000000000 -0500
21480 +diff -urNp linux-3.1.4/sound/oss/sb_audio.c linux-3.1.4/sound/oss/sb_audio.c
21481 +--- linux-3.1.4/sound/oss/sb_audio.c 2011-11-11 15:19:27.000000000 -0500
21482 ++++ linux-3.1.4/sound/oss/sb_audio.c 2011-11-16 18:39:08.000000000 -0500
21483 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
21484 buf16 = (signed short *)(localbuf + localoffs);
21485 while (c)
21486 @@ -76962,9 +77921,9 @@ diff -urNp linux-3.1.3/sound/oss/sb_audio.c linux-3.1.3/sound/oss/sb_audio.c
21487 if (copy_from_user(lbuf8,
21488 userbuf+useroffs + p,
21489 locallen))
21490 -diff -urNp linux-3.1.3/sound/oss/swarm_cs4297a.c linux-3.1.3/sound/oss/swarm_cs4297a.c
21491 ---- linux-3.1.3/sound/oss/swarm_cs4297a.c 2011-11-11 15:19:27.000000000 -0500
21492 -+++ linux-3.1.3/sound/oss/swarm_cs4297a.c 2011-11-16 18:39:08.000000000 -0500
21493 +diff -urNp linux-3.1.4/sound/oss/swarm_cs4297a.c linux-3.1.4/sound/oss/swarm_cs4297a.c
21494 +--- linux-3.1.4/sound/oss/swarm_cs4297a.c 2011-11-11 15:19:27.000000000 -0500
21495 ++++ linux-3.1.4/sound/oss/swarm_cs4297a.c 2011-11-16 18:39:08.000000000 -0500
21496 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
21497 {
21498 struct cs4297a_state *s;
21499 @@ -76999,9 +77958,9 @@ diff -urNp linux-3.1.3/sound/oss/swarm_cs4297a.c linux-3.1.3/sound/oss/swarm_cs4
21500
21501 list_add(&s->list, &cs4297a_devs);
21502
21503 -diff -urNp linux-3.1.3/sound/pci/hda/hda_codec.h linux-3.1.3/sound/pci/hda/hda_codec.h
21504 ---- linux-3.1.3/sound/pci/hda/hda_codec.h 2011-11-11 15:19:27.000000000 -0500
21505 -+++ linux-3.1.3/sound/pci/hda/hda_codec.h 2011-11-16 18:39:08.000000000 -0500
21506 +diff -urNp linux-3.1.4/sound/pci/hda/hda_codec.h linux-3.1.4/sound/pci/hda/hda_codec.h
21507 +--- linux-3.1.4/sound/pci/hda/hda_codec.h 2011-11-11 15:19:27.000000000 -0500
21508 ++++ linux-3.1.4/sound/pci/hda/hda_codec.h 2011-11-16 18:39:08.000000000 -0500
21509 @@ -611,7 +611,7 @@ struct hda_bus_ops {
21510 /* notify power-up/down from codec to controller */
21511 void (*pm_notify)(struct hda_bus *bus);
21512 @@ -77037,9 +77996,9 @@ diff -urNp linux-3.1.3/sound/pci/hda/hda_codec.h linux-3.1.3/sound/pci/hda/hda_c
21513
21514 /* PCM to create, set by patch_ops.build_pcms callback */
21515 unsigned int num_pcms;
21516 -diff -urNp linux-3.1.3/sound/pci/ice1712/ice1712.h linux-3.1.3/sound/pci/ice1712/ice1712.h
21517 ---- linux-3.1.3/sound/pci/ice1712/ice1712.h 2011-11-11 15:19:27.000000000 -0500
21518 -+++ linux-3.1.3/sound/pci/ice1712/ice1712.h 2011-11-16 18:39:08.000000000 -0500
21519 +diff -urNp linux-3.1.4/sound/pci/ice1712/ice1712.h linux-3.1.4/sound/pci/ice1712/ice1712.h
21520 +--- linux-3.1.4/sound/pci/ice1712/ice1712.h 2011-11-11 15:19:27.000000000 -0500
21521 ++++ linux-3.1.4/sound/pci/ice1712/ice1712.h 2011-11-16 18:39:08.000000000 -0500
21522 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
21523 unsigned int mask_flags; /* total mask bits */
21524 struct snd_akm4xxx_ops {
21525 @@ -77058,9 +78017,9 @@ diff -urNp linux-3.1.3/sound/pci/ice1712/ice1712.h linux-3.1.3/sound/pci/ice1712
21526 };
21527
21528
21529 -diff -urNp linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c
21530 ---- linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c 2011-11-11 15:19:27.000000000 -0500
21531 -+++ linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c 2011-11-16 18:39:08.000000000 -0500
21532 +diff -urNp linux-3.1.4/sound/pci/ymfpci/ymfpci_main.c linux-3.1.4/sound/pci/ymfpci/ymfpci_main.c
21533 +--- linux-3.1.4/sound/pci/ymfpci/ymfpci_main.c 2011-11-11 15:19:27.000000000 -0500
21534 ++++ linux-3.1.4/sound/pci/ymfpci/ymfpci_main.c 2011-11-16 18:39:08.000000000 -0500
21535 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
21536 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
21537 break;
21538 @@ -77101,9 +78060,9 @@ diff -urNp linux-3.1.3/sound/pci/ymfpci/ymfpci_main.c linux-3.1.3/sound/pci/ymfp
21539 chip->card = card;
21540 chip->pci = pci;
21541 chip->irq = -1;
21542 -diff -urNp linux-3.1.3/sound/soc/soc-pcm.c linux-3.1.3/sound/soc/soc-pcm.c
21543 ---- linux-3.1.3/sound/soc/soc-pcm.c 2011-11-11 15:19:27.000000000 -0500
21544 -+++ linux-3.1.3/sound/soc/soc-pcm.c 2011-11-16 18:39:08.000000000 -0500
21545 +diff -urNp linux-3.1.4/sound/soc/soc-pcm.c linux-3.1.4/sound/soc/soc-pcm.c
21546 +--- linux-3.1.4/sound/soc/soc-pcm.c 2011-11-11 15:19:27.000000000 -0500
21547 ++++ linux-3.1.4/sound/soc/soc-pcm.c 2011-11-16 18:39:08.000000000 -0500
21548 @@ -568,7 +568,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
21549 }
21550
21551 @@ -77113,9 +78072,9 @@ diff -urNp linux-3.1.3/sound/soc/soc-pcm.c linux-3.1.3/sound/soc/soc-pcm.c
21552 .open = soc_pcm_open,
21553 .close = soc_pcm_close,
21554 .hw_params = soc_pcm_hw_params,
21555 -diff -urNp linux-3.1.3/sound/usb/card.h linux-3.1.3/sound/usb/card.h
21556 ---- linux-3.1.3/sound/usb/card.h 2011-11-11 15:19:27.000000000 -0500
21557 -+++ linux-3.1.3/sound/usb/card.h 2011-11-16 18:39:08.000000000 -0500
21558 +diff -urNp linux-3.1.4/sound/usb/card.h linux-3.1.4/sound/usb/card.h
21559 +--- linux-3.1.4/sound/usb/card.h 2011-11-11 15:19:27.000000000 -0500
21560 ++++ linux-3.1.4/sound/usb/card.h 2011-11-16 18:39:08.000000000 -0500
21561 @@ -44,6 +44,7 @@ struct snd_urb_ops {
21562 int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
21563 int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
21564 @@ -77133,9 +78092,9 @@ diff -urNp linux-3.1.3/sound/usb/card.h linux-3.1.3/sound/usb/card.h
21565 };
21566
21567 struct snd_usb_stream {
21568 -diff -urNp linux-3.1.3/tools/gcc/checker_plugin.c linux-3.1.3/tools/gcc/checker_plugin.c
21569 ---- linux-3.1.3/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500
21570 -+++ linux-3.1.3/tools/gcc/checker_plugin.c 2011-11-16 18:39:08.000000000 -0500
21571 +diff -urNp linux-3.1.4/tools/gcc/checker_plugin.c linux-3.1.4/tools/gcc/checker_plugin.c
21572 +--- linux-3.1.4/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500
21573 ++++ linux-3.1.4/tools/gcc/checker_plugin.c 2011-12-02 17:38:47.000000000 -0500
21574 @@ -0,0 +1,171 @@
21575 +/*
21576 + * Copyright 2011 by the PaX Team <pageexec@××××××××.hu>
21577 @@ -77304,13 +78263,13 @@ diff -urNp linux-3.1.3/tools/gcc/checker_plugin.c linux-3.1.3/tools/gcc/checker_
21578 + if (TARGET_64BIT == 0)
21579 + return 0;
21580 +
21581 -+ register_callback (plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
21582 ++ register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
21583 +
21584 + return 0;
21585 +}
21586 -diff -urNp linux-3.1.3/tools/gcc/constify_plugin.c linux-3.1.3/tools/gcc/constify_plugin.c
21587 ---- linux-3.1.3/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
21588 -+++ linux-3.1.3/tools/gcc/constify_plugin.c 2011-11-16 18:39:08.000000000 -0500
21589 +diff -urNp linux-3.1.4/tools/gcc/constify_plugin.c linux-3.1.4/tools/gcc/constify_plugin.c
21590 +--- linux-3.1.4/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500
21591 ++++ linux-3.1.4/tools/gcc/constify_plugin.c 2011-11-16 18:39:08.000000000 -0500
21592 @@ -0,0 +1,303 @@
21593 +/*
21594 + * Copyright 2011 by Emese Revfy <re.emese@×××××.com>
21595 @@ -77615,9 +78574,9 @@ diff -urNp linux-3.1.3/tools/gcc/constify_plugin.c linux-3.1.3/tools/gcc/constif
21596 +
21597 + return 0;
21598 +}
21599 -diff -urNp linux-3.1.3/tools/gcc/kallocstat_plugin.c linux-3.1.3/tools/gcc/kallocstat_plugin.c
21600 ---- linux-3.1.3/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500
21601 -+++ linux-3.1.3/tools/gcc/kallocstat_plugin.c 2011-11-16 18:39:08.000000000 -0500
21602 +diff -urNp linux-3.1.4/tools/gcc/kallocstat_plugin.c linux-3.1.4/tools/gcc/kallocstat_plugin.c
21603 +--- linux-3.1.4/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500
21604 ++++ linux-3.1.4/tools/gcc/kallocstat_plugin.c 2011-11-16 18:39:08.000000000 -0500
21605 @@ -0,0 +1,167 @@
21606 +/*
21607 + * Copyright 2011 by the PaX Team <pageexec@××××××××.hu>
21608 @@ -77786,10 +78745,10 @@ diff -urNp linux-3.1.3/tools/gcc/kallocstat_plugin.c linux-3.1.3/tools/gcc/kallo
21609 +
21610 + return 0;
21611 +}
21612 -diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexec_plugin.c
21613 ---- linux-3.1.3/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500
21614 -+++ linux-3.1.3/tools/gcc/kernexec_plugin.c 2011-11-18 17:57:07.000000000 -0500
21615 -@@ -0,0 +1,275 @@
21616 +diff -urNp linux-3.1.4/tools/gcc/kernexec_plugin.c linux-3.1.4/tools/gcc/kernexec_plugin.c
21617 +--- linux-3.1.4/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500
21618 ++++ linux-3.1.4/tools/gcc/kernexec_plugin.c 2011-12-02 17:38:47.000000000 -0500
21619 +@@ -0,0 +1,348 @@
21620 +/*
21621 + * Copyright 2011 by the PaX Team <pageexec@××××××××.hu>
21622 + * Licensed under the GPL v2
21623 @@ -77833,13 +78792,17 @@ diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexe
21624 +int plugin_is_GPL_compatible;
21625 +
21626 +static struct plugin_info kernexec_plugin_info = {
21627 -+ .version = "201111150100",
21628 ++ .version = "201111291120",
21629 ++ .help = "method=[bts|or]\tinstrumentation method\n"
21630 +};
21631 +
21632 +static unsigned int execute_kernexec_fptr(void);
21633 +static unsigned int execute_kernexec_retaddr(void);
21634 +static bool kernexec_cmodel_check(void);
21635 +
21636 ++static void (*kernexec_instrument_fptr)(gimple_stmt_iterator);
21637 ++static void (*kernexec_instrument_retaddr)(rtx);
21638 ++
21639 +static struct gimple_opt_pass kernexec_fptr_pass = {
21640 + .pass = {
21641 + .type = GIMPLE_PASS,
21642 @@ -77898,7 +78861,7 @@ diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexe
21643 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
21644 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
21645 + */
21646 -+static void kernexec_instrument_fptr(gimple_stmt_iterator gsi)
21647 ++static void kernexec_instrument_fptr_bts(gimple_stmt_iterator gsi)
21648 +{
21649 + gimple assign_intptr, assign_new_fptr, call_stmt;
21650 + tree intptr, old_fptr, new_fptr, kernexec_mask;
21651 @@ -77907,27 +78870,59 @@ diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexe
21652 + old_fptr = gimple_call_fn(call_stmt);
21653 +
21654 + // create temporary unsigned long variable used for bitops and cast fptr to it
21655 -+ intptr = create_tmp_var(long_unsigned_type_node, NULL);
21656 ++ intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
21657 + add_referenced_var(intptr);
21658 + mark_sym_for_renaming(intptr);
21659 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
21660 -+ update_stmt(assign_intptr);
21661 + gsi_insert_before(&gsi, assign_intptr, GSI_SAME_STMT);
21662 ++ update_stmt(assign_intptr);
21663 +
21664 + // apply logical or to temporary unsigned long and bitmask
21665 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
21666 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
21667 + assign_intptr = gimple_build_assign(intptr, fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask));
21668 -+ update_stmt(assign_intptr);
21669 + gsi_insert_before(&gsi, assign_intptr, GSI_SAME_STMT);
21670 ++ update_stmt(assign_intptr);
21671 +
21672 + // cast temporary unsigned long back to a temporary fptr variable
21673 -+ new_fptr = create_tmp_var(TREE_TYPE(old_fptr), NULL);
21674 ++ new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec");
21675 + add_referenced_var(new_fptr);
21676 + mark_sym_for_renaming(new_fptr);
21677 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
21678 -+ update_stmt(assign_new_fptr);
21679 + gsi_insert_before(&gsi, assign_new_fptr, GSI_SAME_STMT);
21680 ++ update_stmt(assign_new_fptr);
21681 ++
21682 ++ // replace call stmt fn with the new fptr
21683 ++ gimple_call_set_fn(call_stmt, new_fptr);
21684 ++ update_stmt(call_stmt);
21685 ++}
21686 ++
21687 ++static void kernexec_instrument_fptr_or(gimple_stmt_iterator gsi)
21688 ++{
21689 ++ gimple asm_or_stmt, call_stmt;
21690 ++ tree old_fptr, new_fptr, input, output;
21691 ++ VEC(tree, gc) *inputs = NULL;
21692 ++ VEC(tree, gc) *outputs = NULL;
21693 ++
21694 ++ call_stmt = gsi_stmt(gsi);
21695 ++ old_fptr = gimple_call_fn(call_stmt);
21696 ++
21697 ++ // create temporary fptr variable
21698 ++ new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
21699 ++ add_referenced_var(new_fptr);
21700 ++ mark_sym_for_renaming(new_fptr);
21701 ++
21702 ++ // build asm volatile("orq %%r10, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
21703 ++ input = build_tree_list(NULL_TREE, build_string(2, "0"));
21704 ++ input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
21705 ++ output = build_tree_list(NULL_TREE, build_string(3, "=r"));
21706 ++ output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
21707 ++ VEC_safe_push(tree, gc, inputs, input);
21708 ++ VEC_safe_push(tree, gc, outputs, output);
21709 ++ asm_or_stmt = gimple_build_asm_vec("orq %%r10, %0\n\t", inputs, outputs, NULL, NULL);
21710 ++ gimple_asm_set_volatile(asm_or_stmt, true);
21711 ++ gsi_insert_before(&gsi, asm_or_stmt, GSI_SAME_STMT);
21712 ++ update_stmt(asm_or_stmt);
21713 +
21714 + // replace call stmt fn with the new fptr
21715 + gimple_call_set_fn(call_stmt, new_fptr);
21716 @@ -77981,7 +78976,7 @@ diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexe
21717 +}
21718 +
21719 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
21720 -+static void kernexec_instrument_retaddr(rtx insn)
21721 ++static void kernexec_instrument_retaddr_bts(rtx insn)
21722 +{
21723 + rtx btsq;
21724 + rtvec argvec, constraintvec, labelvec;
21725 @@ -77998,6 +78993,24 @@ diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexe
21726 + emit_insn_before(btsq, insn);
21727 +}
21728 +
21729 ++// add special KERNEXEC instrumentation: orq %r10,(%rsp) just before retn
21730 ++static void kernexec_instrument_retaddr_or(rtx insn)
21731 ++{
21732 ++ rtx orq;
21733 ++ rtvec argvec, constraintvec, labelvec;
21734 ++ int line;
21735 ++
21736 ++ // create asm volatile("orq %%r10,(%%rsp)":::)
21737 ++ argvec = rtvec_alloc(0);
21738 ++ constraintvec = rtvec_alloc(0);
21739 ++ labelvec = rtvec_alloc(0);
21740 ++ line = expand_location(RTL_LOCATION(insn)).line;
21741 ++ orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r10,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
21742 ++ MEM_VOLATILE_P(orq) = 1;
21743 ++// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
21744 ++ emit_insn_before(orq, insn);
21745 ++}
21746 ++
21747 +/*
21748 + * find all asm level function returns and forcibly set the highest bit of the return address
21749 + */
21750 @@ -78054,20 +79067,39 @@ diff -urNp linux-3.1.3/tools/gcc/kernexec_plugin.c linux-3.1.3/tools/gcc/kernexe
21751 +
21752 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
21753 +
21754 -+ for (i = 0; i < argc; ++i)
21755 -+ error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
21756 -+
21757 + if (TARGET_64BIT == 0)
21758 + return 0;
21759 +
21760 ++ for (i = 0; i < argc; ++i) {
21761 ++ if (!strcmp(argv[i].key, "method")) {
21762 ++ if (!argv[i].value) {
21763 ++ error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
21764 ++ continue;
21765 ++ }
21766 ++ if (!strcmp(argv[i].value, "bts")) {
21767 ++ kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
21768 ++ kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
21769 ++ } else if (!strcmp(argv[i].value, "or")) {
21770 ++ kernexec_instrument_fptr = kernexec_instrument_fptr_or;
21771 ++ kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
21772 ++ fix_register("r10", 1, 1);
21773 ++ } else
21774 ++ error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
21775 ++ continue;
21776 ++ }
21777 ++ error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
21778 ++ }
21779 ++ if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
21780 ++ error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
21781 ++
21782 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
21783 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
21784 +
21785 + return 0;
21786 +}
21787 -diff -urNp linux-3.1.3/tools/gcc/Makefile linux-3.1.3/tools/gcc/Makefile
21788 ---- linux-3.1.3/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500
21789 -+++ linux-3.1.3/tools/gcc/Makefile 2011-11-16 20:37:08.000000000 -0500
21790 +diff -urNp linux-3.1.4/tools/gcc/Makefile linux-3.1.4/tools/gcc/Makefile
21791 +--- linux-3.1.4/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500
21792 ++++ linux-3.1.4/tools/gcc/Makefile 2011-11-16 20:37:08.000000000 -0500
21793 @@ -0,0 +1,21 @@
21794 +#CC := gcc
21795 +#PLUGIN_SOURCE_FILES := pax_plugin.c
21796 @@ -78090,9 +79122,9 @@ diff -urNp linux-3.1.3/tools/gcc/Makefile linux-3.1.3/tools/gcc/Makefile
21797 +kallocstat_plugin-objs := kallocstat_plugin.o
21798 +kernexec_plugin-objs := kernexec_plugin.o
21799 +checker_plugin-objs := checker_plugin.o
21800 -diff -urNp linux-3.1.3/tools/gcc/stackleak_plugin.c linux-3.1.3/tools/gcc/stackleak_plugin.c
21801 ---- linux-3.1.3/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500
21802 -+++ linux-3.1.3/tools/gcc/stackleak_plugin.c 2011-11-16 18:39:08.000000000 -0500
21803 +diff -urNp linux-3.1.4/tools/gcc/stackleak_plugin.c linux-3.1.4/tools/gcc/stackleak_plugin.c
21804 +--- linux-3.1.4/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500
21805 ++++ linux-3.1.4/tools/gcc/stackleak_plugin.c 2011-11-16 18:39:08.000000000 -0500
21806 @@ -0,0 +1,291 @@
21807 +/*
21808 + * Copyright 2011 by the PaX Team <pageexec@××××××××.hu>
21809 @@ -78385,20 +79417,20 @@ diff -urNp linux-3.1.3/tools/gcc/stackleak_plugin.c linux-3.1.3/tools/gcc/stackl
21810 +
21811 + return 0;
21812 +}
21813 -diff -urNp linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h
21814 ---- linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
21815 -+++ linux-3.1.3/tools/perf/util/include/asm/alternative-asm.h 2011-11-16 18:39:08.000000000 -0500
21816 +diff -urNp linux-3.1.4/tools/perf/util/include/asm/alternative-asm.h linux-3.1.4/tools/perf/util/include/asm/alternative-asm.h
21817 +--- linux-3.1.4/tools/perf/util/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
21818 ++++ linux-3.1.4/tools/perf/util/include/asm/alternative-asm.h 2011-12-02 17:38:47.000000000 -0500
21819 @@ -5,4 +5,7 @@
21820
21821 #define altinstruction_entry #
21822
21823 -+ .macro pax_force_retaddr rip=0
21824 ++ .macro pax_force_retaddr rip=0, reload=0
21825 + .endm
21826 +
21827 #endif
21828 -diff -urNp linux-3.1.3/usr/gen_init_cpio.c linux-3.1.3/usr/gen_init_cpio.c
21829 ---- linux-3.1.3/usr/gen_init_cpio.c 2011-11-11 15:19:27.000000000 -0500
21830 -+++ linux-3.1.3/usr/gen_init_cpio.c 2011-11-16 18:39:08.000000000 -0500
21831 +diff -urNp linux-3.1.4/usr/gen_init_cpio.c linux-3.1.4/usr/gen_init_cpio.c
21832 +--- linux-3.1.4/usr/gen_init_cpio.c 2011-11-11 15:19:27.000000000 -0500
21833 ++++ linux-3.1.4/usr/gen_init_cpio.c 2011-11-16 18:39:08.000000000 -0500
21834 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
21835 int retval;
21836 int rc = -1;
21837 @@ -78421,9 +79453,9 @@ diff -urNp linux-3.1.3/usr/gen_init_cpio.c linux-3.1.3/usr/gen_init_cpio.c
21838 } else
21839 break;
21840 }
21841 -diff -urNp linux-3.1.3/virt/kvm/kvm_main.c linux-3.1.3/virt/kvm/kvm_main.c
21842 ---- linux-3.1.3/virt/kvm/kvm_main.c 2011-11-11 15:19:27.000000000 -0500
21843 -+++ linux-3.1.3/virt/kvm/kvm_main.c 2011-11-16 18:39:08.000000000 -0500
21844 +diff -urNp linux-3.1.4/virt/kvm/kvm_main.c linux-3.1.4/virt/kvm/kvm_main.c
21845 +--- linux-3.1.4/virt/kvm/kvm_main.c 2011-11-11 15:19:27.000000000 -0500
21846 ++++ linux-3.1.4/virt/kvm/kvm_main.c 2011-11-16 18:39:08.000000000 -0500
21847 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
21848
21849 static cpumask_var_t cpus_hardware_enabled;
21850
21851 diff --git a/3.1.3/4421_grsec-remove-localversion-grsec.patch b/3.1.4/4421_grsec-remove-localversion-grsec.patch
21852 similarity index 100%
21853 rename from 3.1.3/4421_grsec-remove-localversion-grsec.patch
21854 rename to 3.1.4/4421_grsec-remove-localversion-grsec.patch
21855
21856 diff --git a/3.1.3/4422_grsec-mute-warnings.patch b/3.1.4/4422_grsec-mute-warnings.patch
21857 similarity index 100%
21858 rename from 3.1.3/4422_grsec-mute-warnings.patch
21859 rename to 3.1.4/4422_grsec-mute-warnings.patch
21860
21861 diff --git a/3.1.3/4423_grsec-remove-protected-paths.patch b/3.1.4/4423_grsec-remove-protected-paths.patch
21862 similarity index 100%
21863 rename from 3.1.3/4423_grsec-remove-protected-paths.patch
21864 rename to 3.1.4/4423_grsec-remove-protected-paths.patch
21865
21866 diff --git a/3.1.3/4425_grsec-pax-without-grsec.patch b/3.1.4/4425_grsec-pax-without-grsec.patch
21867 similarity index 100%
21868 rename from 3.1.3/4425_grsec-pax-without-grsec.patch
21869 rename to 3.1.4/4425_grsec-pax-without-grsec.patch
21870
21871 diff --git a/3.1.3/4430_grsec-kconfig-default-gids.patch b/3.1.4/4430_grsec-kconfig-default-gids.patch
21872 similarity index 100%
21873 rename from 3.1.3/4430_grsec-kconfig-default-gids.patch
21874 rename to 3.1.4/4430_grsec-kconfig-default-gids.patch
21875
21876 diff --git a/3.1.3/4435_grsec-kconfig-gentoo.patch b/3.1.4/4435_grsec-kconfig-gentoo.patch
21877 similarity index 100%
21878 rename from 3.1.3/4435_grsec-kconfig-gentoo.patch
21879 rename to 3.1.4/4435_grsec-kconfig-gentoo.patch
21880
21881 diff --git a/3.1.3/4437-grsec-kconfig-proc-user.patch b/3.1.4/4437-grsec-kconfig-proc-user.patch
21882 similarity index 100%
21883 rename from 3.1.3/4437-grsec-kconfig-proc-user.patch
21884 rename to 3.1.4/4437-grsec-kconfig-proc-user.patch
21885
21886 diff --git a/3.1.3/4440_selinux-avc_audit-log-curr_ip.patch b/3.1.4/4440_selinux-avc_audit-log-curr_ip.patch
21887 similarity index 100%
21888 rename from 3.1.3/4440_selinux-avc_audit-log-curr_ip.patch
21889 rename to 3.1.4/4440_selinux-avc_audit-log-curr_ip.patch
21890
21891 diff --git a/3.1.3/4445_disable-compat_vdso.patch b/3.1.4/4445_disable-compat_vdso.patch
21892 similarity index 100%
21893 rename from 3.1.3/4445_disable-compat_vdso.patch
21894 rename to 3.1.4/4445_disable-compat_vdso.patch
Report Message
Find on MARC Find on Google Groups